Changeset 6611

Timestamp:

02/12/2018 10:23:27 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Payments: Replace code with get_wordcamp_dropdown().

Location:

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

Files:

• includes/sponsor-payment-stripe.php (modified) (4 diffs)
• views/sponsor-payment/main.php (modified) (1 diff)

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

@@ -6 +6 @@
 namespace WordCamp\Budgets\Sponsor_Payment_Stripe;
 use WordCamp\Utilities\Stripe_Client;
+use WordCamp_Loader;
 use WordCamp_Budgets;
 use Exception;
@@ -34 +35 @@
                 'keys'       => $keys,
                 'step'       => STEP_SELECT_INVOICE,
-                'wordcamps'  => _get_wordcamps(),
+                'wordcamp_query_options' => get_wordcamp_query_options(),
                 'currencies' => WordCamp_Budgets::get_currencies(),
                 'errors'     => array(),
@@ -64 +65 @@
 
 /**
- * Return a list of valid WordCamp posts.
- *
- * @return array An array or WP_Post objects for all public WordCamps.
- */
-function _get_wordcamps() {
-        static $wordcamps;
-
-        if ( ! isset( $wordcamps ) ) {
-                $wordcamps = get_posts( array(
-                        'post_type'      => 'wordcamp',
-                        'post_status'    => \WordCamp_Loader::get_public_post_statuses(),
-                        'posts_per_page' => - 1,
-                        'orderby'        => 'title',
-                        'order'          => 'asc',
-
-                        'meta_query' => array(
-                                array(
-                                        'key'     => 'Start Date (YYYY-mm-dd)',
-                                        'value'   => strtotime( '-3 months' ),
-                                        'compare' => '>'
-                                )
+ * Returns query options to be used with `get_wordcamps()`.
+ *
+ * This provides a consistent and canonical source for the query options, so that all callers are in sync.
+ *
+ * @return array
+ */
+function get_wordcamp_query_options() {
+        return array(
+                'post_status' => WordCamp_Loader::get_public_post_statuses(),
+                'orderby'     => 'title',
+                'order'       => 'asc',
+
+                'meta_query' => array(
+                        array(
+                                'key'     => 'Start Date (YYYY-mm-dd)',
+                                'value'   => strtotime( '-3 months' ),
+                                'compare' => '>'
                         )
-                ) );
-        }
-
-        return $wordcamps;
+                )
+        );
 }
 
@@ -136 +131 @@
                         // Make sure the selected WordCamp is valid.
                         $wordcamp_id = absint( $_POST['wordcamp_id'] );
-                        $valid_ids   = wp_list_pluck( _get_wordcamps(), 'ID' );
+                        $valid_ids   = wp_list_pluck( get_wordcamps( get_wordcamp_query_options() ), 'ID' );
 
                         if ( ! in_array( $wordcamp_id, $valid_ids ) ) {

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php

@@ -29 +29 @@
                                 <label><?php esc_html_e( 'Event', 'wordcamporg' ); ?></label>
                                 <div class="control">
-                                        <select name="wordcamp_id">
-                                                <option value="" disabled selected><?php esc_html_e( 'Select a WordCamp', 'wordcamporg' ); ?></option>
-                                                <?php foreach ( $data['wordcamps'] as $wordcamp ) : ?>
-                                                <option value="<?php echo esc_attr( $wordcamp->ID ); ?>"><?php echo esc_html( $wordcamp->post_title ); ?></option>
-                                                <?php endforeach; ?>
-                                        </select>
+                                        <?php echo get_wordcamp_dropdown( 'wordcamp_id', $data['wordcamp_query_options'] ); ?>
                                 </div>