<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1939] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Payments: Attach existing files to payment request.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1939">1939</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1939","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-06 00:11:17 +0000 (Tue, 06 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Payments: Attach existing files to payment request.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclassespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclasseswordcamppaymentsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/wordcamp-payments.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptattachedfilesjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcamppaymentsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxfilesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-files.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclassespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php 2015-10-03 21:14:37 UTC (rev 1938)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php 2015-10-06 00:11:17 UTC (rev 1939)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify nonces
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonces = array( 'status_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce' ); // todo add prefix to all of these
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonces = array( 'status_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce', 'wcp_files_nonce' ); // todo add prefix to all of these
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $nonces as $nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST[ $nonce ] ) || ! wp_verify_nonce( $_POST[ $nonce ], str_replace( '_nonce', '', $nonce ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,9 +853,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_camppayments_' . $field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Attach existing files
+ $this->attach_existing_files( $post_id, $_POST );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Attach unattached files to the payment request post
+ *
+ * Sometimes users will upload the files manually to the Media Library, instead of using the Add Files button,
+ * and we need to attach them to the request so that they show up in the metabox.
+ *
+ * @param int $post_id
+ * @param array $request
+ */
+ protected function attach_existing_files( $post_id, $request ) {
+ if ( empty( $request['wcp_existing_files_to_attach'] ) ) {
+ return;
+ }
+
+ if ( ! $files = json_decode( $request['wcp_existing_files_to_attach'] ) ) {
+ return;
+ }
+
+ remove_action( 'save_post', array( $this, 'save_payment' ), 10, 2 ); // avoid infinite recursion
+
+ foreach( $files as $file_id ) {
+ wp_update_post( array(
+ 'ID' => $file_id,
+ 'post_parent' => $post_id,
+ ) );
+ }
+
+ add_action( 'save_post', array( $this, 'save_payment' ), 10, 2 );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Define columns for the Payment Requests screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $_columns
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclasseswordcamppaymentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/wordcamp-payments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/wordcamp-payments.php 2015-10-03 21:14:37 UTC (rev 1938)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/wordcamp-payments.php 2015-10-06 00:11:17 UTC (rev 1939)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Main class to provide functionality common to all other classes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WordCamp_Payments {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const VERSION = '0.1.0';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '0.1.1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptattachedfilesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js 2015-10-03 21:14:37 UTC (rev 1938)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js 2015-10-06 00:11:17 UTC (rev 1939)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.wordcampPayments.AttachedFile = Backbone.Model.extend( {
</span><span class="cx" style="display: block; padding: 0 10px"> defaults: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID': 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_parent': 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filename': '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url': ''
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // todo realign
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +68,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.wcp_files_list' ).append( attachedFileView.render().el );
</span><span class="cx" style="display: block; padding: 0 10px"> noFilesUploaded.removeClass( 'active' );
</span><span class="cx" style="display: block; padding: 0 10px"> noFilesUploaded.addClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.attachExistingFile( file );
+ },
+
+ /**
+ * Keep track of existing files that should be attached to the request
+ *
+ * Sometimes users add existing files to the request, rather than uploading new ones. We need to keep track
+ * of those so that they can be attached to the request when the form is submitted.
+ *
+ * Files that are already attached to other posts are ignored.
+ *
+ * @param {wordcampPayments.AttachedFile} file
+ */
+ attachExistingFile: function( file ) {
+ var fileIDsToAttach,
+ existingFilesToAttach = $( '#wcp_existing_files_to_attach' );
+
+ try {
+ fileIDsToAttach = JSON.parse( existingFilesToAttach.val() );
+ } catch ( exception ) {
+ fileIDsToAttach = [];
+ }
+
+ if ( 0 === file.get( 'post_parent' ) && -1 === $.inArray( file.get( 'ID' ), fileIDsToAttach ) ) {
+ fileIDsToAttach.push( file.get( 'ID' ) );
+ existingFilesToAttach.val( JSON.stringify( fileIDsToAttach ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo add semicolon
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.wordcampPayments.attachedFilesView = new $.wordcampPayments.AttachedFilesView();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcamppaymentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js 2015-10-03 21:14:37 UTC (rev 1938)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js 2015-10-06 00:11:17 UTC (rev 1939)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,13 +84,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> addSelectedFilesToCollection : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var attachments = $.wordcampPayments.fileUploadFrame.state().get( 'selection' ).toJSON();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( attachments, function( index, attachment ) { // todo if selected an existing file, it isn't attached, so after post is saved it wont be in the list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( attachments, function( index, attachment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var newFile = new $.wordcampPayments.AttachedFile( {
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID': attachment.id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_parent': attachment.uploadedTo,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filename': attachment.filename,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url': attachment.url
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo realign
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $.wordcampPayments.attachedFilesView.collection.add( newFile );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxfilesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-files.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-files.php 2015-10-03 21:14:37 UTC (rev 1938)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-files.php 2015-10-06 00:11:17 UTC (rev 1939)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="wcp_existing_files_to_attach" name="wcp_existing_files_to_attach" type="hidden" value="" />
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_files_input( $post, 'Files', 'files', __( 'Attach supporting documentation including invoices, contracts, or other vendor correspondence. If no supporting documentation is available, please indicate the reason in the notes below.', 'wordcamporg' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_textarea_input( $post, 'Notes', 'file_notes' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>