Changeset 8106

Timestamp:

01/18/2019 08:24:01 PM (7 years ago)

Author:

iandunn

Message:

WordCamp Payments: Pull categories from canonical list to make DRY.

Location:

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

Files:

• includes/wordcamp-budgets.php (modified) (1 diff)
• javascript/budget-tool.js (modified) (1 diff)
• views/budget-tool/main.php (modified) (1 diff)

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

@@ -2572 +2572 @@
     public static function get_payment_categories() {
         return array(
+            // Changes here may need to be synchronized with `_get_default_budget()`.
             'after-party'     => esc_html__( 'After Party',                    'wordcamporg' ),
             'audio-visual'    => esc_html__( 'Audio Visual',                   'wordcamporg' ),

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

@@ -364 +364 @@
     });
 
-    wcb.categories = {
-        'venue': 'Venue',
-        'audio-visual': 'Audio Visual',
-        'after-party': 'After Party',
-        'camera-shipping': 'Camera Shipping',
-        'food-beverage': 'Food & Beverage',
-        'office-supplies': 'Office Supplies',
-        'signage-badges': 'Signage & Badges',
-        'speaker-event': 'Speaker Event',
-        'swag': 'Swag',
-        'other': 'Other'
-    };
+    // Decode HTML entities in category names
+    _.each( wcb.categories, function( name, slug, list ) {
+        list[ slug ] = name.replace( '&', '&' );
+    } );
 
     wcb.metaLabels = {

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php

@@ -4 +4 @@
 wcb.urls = <?php echo json_encode( $inspire_urls ); ?>;
 wcb.currencies = <?php echo json_encode( $currencies ); ?>;
+wcb.categories = <?php echo wp_json_encode( WordCamp_Budgets::get_payment_categories() ); ?>;
 wcb.status = <?php echo json_encode( $budget['status'] ); ?>;
 wcb.view = <?php echo json_encode( $view ); ?>;