Changeset 2272

Timestamp:

01/11/2016 10:15:37 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Reorganize to make room for additional modules.

Soon we'll be adding modules for Budgets and Sponsor Invoices, in addition to the existing one for Payment Requests.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments

Files:

• bootstrap.php (modified) (2 diffs)
• css/wordcamp-budgets.css (moved) (moved from sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-payments.css) (1 diff)
• includes (moved) (moved from sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes)
• includes/payment-request.php (modified) (3 diffs)
• includes/wordcamp-budgets.php (copied) (copied from sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/wordcamp-payments.php) (7 diffs)
• includes/wordcamp-payments.php (deleted)
• javascript/attached-files.js (modified) (8 diffs)
• javascript/wordcamp-budgets.js (moved) (moved from sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js) (8 diffs)
• views/payment-request/input-files.php (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/bootstrap.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: WordCamp Payments
+Plugin Name: WordCamp Budgets
 Plugin URI:  http://wordcamp.org/
-Description: Provides tools for collecting and processing payment requests from WordCamp organizers.
-Author:      tellyworth, iandunn
+Description: Provides tools for managing WordCamp budgets, sponsor invoices, and payment requests.
+Author:      WordCamp.org
+Author URI:  https://wordcamp.org
 Version:     0.1
 */
@@ -13 +14 @@
 
 if ( is_admin() ) {
-    require_once( __DIR__ . '/classes/wordcamp-payments.php' );
-    require_once( __DIR__ . '/classes/payment-request.php' );
-    require_once( __DIR__ . '/classes/encryption.php' );
+    require_once( __DIR__ . '/includes/wordcamp-budgets.php' );
+    require_once( __DIR__ . '/includes/payment-request.php' );
+    require_once( __DIR__ . '/includes/encryption.php' );
 
-    $GLOBALS['wordcamp_payments']   = new WordCamp_Payments();
+    $GLOBALS['wordcamp_budgets']    = new WordCamp_Budgets();
     $GLOBALS['wcp_payment_request'] = new WCP_Payment_Request();
 }

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css

@@ -28 +28 @@
 }
 
+
+/*
+ * Log
+ */
 #wcp_log .inside {
     margin: 0;

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

@@ -941 +941 @@
             $incomplete_text = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
             $incomplete_text = preg_replace( '#\.$#', '', $incomplete_text ); // trailing-undot-it.
-            WordCamp_Payments::log( $post->ID, sprintf( 'Marked as incomplete by %s: %s.', $user->display_name, $incomplete_text ), array(
+            WordCamp_Budgets::log( $post->ID, sprintf( 'Marked as incomplete by %s: %s.', $user->display_name, $incomplete_text ), array(
                 'user_id' => $user->ID,
                 'action' => 'marked-incomplete',
@@ -947 +947 @@
             ) );
         } elseif ( $new == 'paid' && $old != 'paid' ) {
-            WordCamp_Payments::log( $post->ID, sprintf( 'Marked as paid by %s.', $user->display_name ), array(
+            WordCamp_Budgets::log( $post->ID, sprintf( 'Marked as paid by %s.', $user->display_name ), array(
                 'user_id' => $user->ID,
                 'action' => 'marked-paid',
             ) );
         } elseif ( $old == 'auto-draft' && $new != 'auto-draft' ) {
-            WordCamp_Payments::log( $post->ID, sprintf( 'Request created by %s.', $user->display_name ), array(
+            WordCamp_Budgets::log( $post->ID, sprintf( 'Request created by %s.', $user->display_name ), array(
                 'user_id' => $user->ID,
                 'action' => 'updated',
             ) );
         } else {
-            WordCamp_Payments::log( $post->ID, sprintf( 'Request updated by %s.', $user->display_name ), array(
+            WordCamp_Budgets::log( $post->ID, sprintf( 'Request updated by %s.', $user->display_name ), array(
                 'user_id' => $user->ID,
                 'action' => 'updated',
@@ -982 +982 @@
         }
 
-        remove_action( 'save_post', array( $this, 'save_payment' ), 10, 2 ); // avoid infinite recursion
+        remove_action( 'save_post', array( $this, 'save_payment' ), 10 ); // avoid infinite recursion
 
         foreach( $files as $file_id ) {

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

@@ -4 +4 @@
  * Main class to provide functionality common to all other classes
  */
-class WordCamp_Payments {
+class WordCamp_Budgets {
     const VERSION = '0.1.1';
 
@@ -24 +24 @@
         // Register our assets
         wp_register_script(
-            'wordcamp-payments',
-            plugins_url( 'javascript/wordcamp-payments.js', __DIR__ ),
+            'wordcamp-budgets',
+            plugins_url( 'javascript/wordcamp-budgets.js', __DIR__ ),
             array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
             self::VERSION,
@@ -34 +34 @@
             'wcp-attached-files',
             plugins_url( 'javascript/attached-files.js', __DIR__ ),
-            array( 'wordcamp-payments', 'backbone', 'wp-util' ),
+            array( 'wordcamp-budgets', 'backbone', 'wp-util' ),
             self::VERSION,
             true
@@ -46 +46 @@
 
         wp_register_style(
-            'wordcamp-payments',
-            plugins_url( 'css/wordcamp-payments.css', __DIR__ ),
+            'wordcamp-budgets',
+            plugins_url( 'css/wordcamp-budgets.css', __DIR__ ),
             $soft_deps,
             self::VERSION
@@ -56 +56 @@
 
         if ( in_array( $current_screen->id, array( 'edit-wcp_payment_request', 'wcp_payment_request' ) ) ) {
-            wp_enqueue_script( 'wordcamp-payments' );
-            wp_enqueue_style( 'wordcamp-payments' );
+            wp_enqueue_script( 'wordcamp-budgets' );
+            wp_enqueue_style( 'wordcamp-budgets' );
 
             if ( in_array( $current_screen->id, array( 'wcp_payment_request' ) ) && isset( $post->ID ) ) {
@@ -65 +65 @@
 
             wp_localize_script(
-                'wordcamp-payments',
-                'wcpLocalizedStrings',      // todo merge into wordcampPayments var
+                'wordcamp-budgets',
+                'wcpLocalizedStrings',      // todo merge into wordcampBudgets var
                 array(
                     'uploadModalTitle'  => __( 'Attach Supporting Documentation', 'wordcamporg' ),
@@ -76 +76 @@
 
     /**
-     * Log something with a payment request.
+     * Insert an entry into a log for one of the custom post types
      *
-     * @param int $post_id The payment requset ID.
+     * @param int    $post_id The post ID.
      * @param string $message A log message.
-     * @param array $data Optional data.
+     * @param array  $data    Optional data.
      */
     public static function log( $post_id, $message, $data = array() ) {

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js

@@ -4 +4 @@
      * Model for an attached file
      */
-    $.wordcampPayments.AttachedFile = Backbone.Model.extend( {
+    $.wordcampBudgets.AttachedFile = Backbone.Model.extend( {
         defaults: {
             'ID':          0,
@@ -16 +16 @@
      * Collection of attached files
      */
-    $.wordcampPayments.AttachedFiles = Backbone.Collection.extend( {
-        model: $.wordcampPayments.AttachedFile
+    $.wordcampBudgets.AttachedFiles = Backbone.Collection.extend( {
+        model: $.wordcampBudgets.AttachedFile
     } );
 
@@ -23 +23 @@
      * View for a single attached file
      */
-    $.wordcampPayments.AttachedFileView = Backbone.View.extend( {
+    $.wordcampBudgets.AttachedFileView = Backbone.View.extend( {
         tagName: 'li',
         template: wp.template( 'wcp-attached-file' ),
@@ -40 +40 @@
      * View for a collection of attached files
      */
-    $.wordcampPayments.AttachedFilesView = Backbone.View.extend( {
+    $.wordcampBudgets.AttachedFilesView = Backbone.View.extend( {
         el: $( '#wcp_files' ),
 
@@ -46 +46 @@
             _.bindAll( this, 'render', 'appendFile' );
 
-            this.collection = new $.wordcampPayments.AttachedFiles( wcpAttachedFiles );
+            this.collection = new $.wordcampBudgets.AttachedFiles( wcpAttachedFiles );
             this.collection.bind( 'add', this.appendFile );
 
@@ -62 +62 @@
         appendFile: function( file ) {
             var noFilesUploaded  = $( '.wcp_no_files_uploaded' );
-            var attachedFileView = new $.wordcampPayments.AttachedFileView( { model: file } );
+            var attachedFileView = new $.wordcampBudgets.AttachedFileView( { model: file } );
 
             $( '.wcp_files_list' ).append( attachedFileView.render().el );
@@ -79 +79 @@
          * Files that are already attached to other posts are ignored.
          *
-         * @param {wordcampPayments.AttachedFile} file
+         * @param {wordcampBudgets.AttachedFile} file
          */
         attachExistingFile: function( file ) {
@@ -98 +98 @@
     } );
 
-    $.wordcampPayments.attachedFilesView = new $.wordcampPayments.AttachedFilesView();
+    $.wordcampBudgets.attachedFilesView = new $.wordcampBudgets.AttachedFilesView();
 
 } );

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-budgets.js

@@ -1 +1 @@
 jQuery( document ).ready( function( $ ) {
 
-    $.wordcampPayments = {
+    $.wordcampBudgets = {
 
         /**
@@ -7 +7 @@
          */
         init: function () {
-            $.wordcampPayments.registerEventHandlers();
-            $.wordcampPayments.setupDatePicker();
+            $.wordcampBudgets.registerEventHandlers();
+            $.wordcampBudgets.setupDatePicker();
         },
 
@@ -15 +15 @@
          */
         registerEventHandlers : function() {
-            $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( $.wordcampPayments.togglePaymentMethodFields );
-            $( '#payment_category' ).change( $.wordcampPayments.toggleOtherCategoryDescription );
-            $( '#wcp_files' ).find( 'a.wcp-insert-media' ).click( $.wordcampPayments.showUploadModal );
-            $( '#wcp_mark_incomplete_checkbox' ).click( $.wordcampPayments.requireNotes );
+            $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( $.wordcampBudgets.togglePaymentMethodFields );
+            $( '#payment_category' ).change( $.wordcampBudgets.toggleOtherCategoryDescription );
+            $( '#wcp_files' ).find( 'a.wcp-insert-media' ).click( $.wordcampBudgets.showUploadModal );
+            $( '#wcp_mark_incomplete_checkbox' ).click( $.wordcampBudgets.requireNotes );
         },
 
@@ -61 +61 @@
          */
         showUploadModal : function( event ) {
-            if ( 'undefined' == typeof $.wordcampPayments.fileUploadFrame ) {
+            if ( 'undefined' == typeof $.wordcampBudgets.fileUploadFrame ) {
                 // Create the frame
-                $.wordcampPayments.fileUploadFrame = wp.media( {
+                $.wordcampBudgets.fileUploadFrame = wp.media( {
                     title: wcpLocalizedStrings.uploadModalTitle,
                     multiple: true,
@@ -72 +72 @@
 
                 // Add models to the collection for each selected attachment
-                $.wordcampPayments.fileUploadFrame.on( 'select', $.wordcampPayments.addSelectedFilesToCollection );
+                $.wordcampBudgets.fileUploadFrame.on( 'select', $.wordcampBudgets.addSelectedFilesToCollection );
             }
 
-            $.wordcampPayments.fileUploadFrame.open();
+            $.wordcampBudgets.fileUploadFrame.open();
             return false;
         },
@@ -83 +83 @@
          */
         addSelectedFilesToCollection : function() {
-            var attachments = $.wordcampPayments.fileUploadFrame.state().get( 'selection' ).toJSON();
+            var attachments = $.wordcampBudgets.fileUploadFrame.state().get( 'selection' ).toJSON();
 
             $.each( attachments, function( index, attachment ) {
-                var newFile = new $.wordcampPayments.AttachedFile( {
+                var newFile = new $.wordcampBudgets.AttachedFile( {
                     'ID':          attachment.id,
                     'post_parent': attachment.uploadedTo,
@@ -93 +93 @@
                 } );
 
-                $.wordcampPayments.attachedFilesView.collection.add( newFile );
+                $.wordcampBudgets.attachedFilesView.collection.add( newFile );
             } );
         },
@@ -127 +127 @@
     };
 
-    $.wordcampPayments.init();
+    $.wordcampBudgets.init();
 } );

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-files.php

@@ -27 +27 @@
         </script>
 
-        <?php wp_localize_script( 'wcp-attached-files', 'wcpAttachedFiles', $files ); // todo merge into wordcampPayments var ?>
+        <?php wp_localize_script( 'wcp-attached-files', 'wcpAttachedFiles', $files ); // todo merge into wordcampBudgets var ?>
     </td>
 </tr>