Changeset 2366

Timestamp:

01/25/2016 09:17:54 PM (5 years ago)

Author:

iandunn

Message:

WordCamp Payments: Centralize payment category fields.

Location:

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

Files:

• wordcamp-payments-network/includes/payment-requests-dashboard.php (modified) (1 diff)
• wordcamp-payments-network/includes/payment-requests-list-table.php (modified) (1 diff)
• wordcamp-payments/includes/payment-request.php (modified) (2 diffs)
• wordcamp-payments/includes/wordcamp-budgets.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php

@@ -117 +117 @@
     public static function prepare_for_index( $request ) {
         $request = get_post( $request );
-        $categories = WCP_Payment_Request::get_payment_categories();
+        $categories = WordCamp_Budgets::get_payment_categories();
 
         // All things search.

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php

@@ -160 +160 @@
     public function column_category( $request ) {
         require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/payment-request.php' );
-        $categories        = WCP_Payment_Request::get_payment_categories();
+        $categories        = WordCamp_Budgets::get_payment_categories();
         $selected_category = get_post_meta( $request->ID, '_camppayments_payment_category', true );
 

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

@@ -239 +239 @@
         wp_nonce_field( 'general_info', 'general_info_nonce' );
 
-        $categories        = self::get_payment_categories();
+        $categories        = WordCamp_Budgets::get_payment_categories();
         $assigned_category = get_post_meta( $post->ID, '_camppayments_payment_category', true );
 
@@ -447 +447 @@
 
         return $value;
-    }
-
-    /**
-     * Define the payment categories
-     *
-     * The slugs are explicitly registered in English so they will match across sites that use different locales,
-     * which facilitates aggregating the data into reports.
-     *
-     * This is public so that WordCamp Payments Network Dashboard can access it, in order to aggregate posts by their slug.
-     *
-     * @return array
-     */
-    public static function get_payment_categories() {
-        return array(
-            'after-party'     => __( 'After Party',                    'wordcamporg' ),
-            'audio-visual'    => __( 'Audio Visual',                   'wordcamporg' ),
-            'food-beverages'  => __( 'Food & Beverage',                'wordcamporg' ),
-            'office-supplies' => __( 'Office Supplies',                'wordcamporg' ),
-            'signage-badges'  => __( 'Signage & Badges',               'wordcamporg' ),
-            'speaker-event'   => __( 'Speaker Event',                  'wordcamporg' ),
-            'swag'            => __( 'Swag (t-shirts, stickers, etc)', 'wordcamporg' ),
-            'venue'           => __( 'Venue',                          'wordcamporg' ),
-            'other'           => __( 'Other',                          'wordcamporg' ), // This one is intentionally last, regardless of alphabetical order
-        );
     }
 

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

@@ -160 +160 @@
     /**
      * Get the names of all the fields that should be encrypted
-     * 
+     *
      * @return array
      */
@@ -308 +308 @@
 
     /**
+     * Define the payment categories
+     *
+     * The slugs are explicitly registered in English so they will match across sites that use different locales,
+     * which facilitates aggregating the data into reports.
+     *
+     * @return array
+     */
+    public static function get_payment_categories() {
+        return array(
+            'after-party'     => __( 'After Party',                    'wordcamporg' ),
+            'audio-visual'    => __( 'Audio Visual',                   'wordcamporg' ),
+            'food-beverages'  => __( 'Food & Beverage',                'wordcamporg' ),
+            'office-supplies' => __( 'Office Supplies',                'wordcamporg' ),
+            'signage-badges'  => __( 'Signage & Badges',               'wordcamporg' ),
+            'speaker-event'   => __( 'Speaker Event',                  'wordcamporg' ),
+            'swag'            => __( 'Swag (t-shirts, stickers, etc)', 'wordcamporg' ),
+            'venue'           => __( 'Venue',                          'wordcamporg' ),
+            'other'           => __( 'Other',                          'wordcamporg' ), // This one is intentionally last, regardless of alphabetical order
+        );
+    }
+
+    /**
      * Determines whether we want to perform actions on the given post based on the current context.
      *