Changeset 1028129

Timestamp:

11/18/2014 05:59:44 PM (11 years ago)

Author:

mjbanks

Message:

add delay and days ahead options

Location:

woocommerce-local-pickup-time-select/trunk

Files:

• admin/class-local-pickup-time-admin.php (modified) (1 diff)
• public/class-local-pickup-time.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• woocommerce-local-pickup-time.php (modified) (1 diff)

woocommerce-local-pickup-time-select/trunk/admin/class-local-pickup-time-admin.php

@@ -240 +240 @@
                 'desc_tip' =>  true,
                 'options' => array(
+                    '5'      => __( '5 minutes', $this->plugin_slug ),
+                    '10'      => __( '10 minutes', $this->plugin_slug ),
                     '15'      => __( '15 minutes', $this->plugin_slug ),
+                    '20'      => __( '20 minutes', $this->plugin_slug ),
                     '30'      => __( '30 minutes', $this->plugin_slug ),
+                    '45'      => __( '45 minutes', $this->plugin_slug ),
                     '60'      => __( '1 hour', $this->plugin_slug ),
+                    '120'     => __( '2 hours', $this->plugin_slug ),
+                )
+            ),
+            array(
+                'title'     => __( 'Pickup Time Delay', $this->plugin_slug ),
+                'desc'     => __( 'Choose the time delay from the time of ordering for allowing local pickup orders.', $this->plugin_slug ),
+                'id'       => 'local_pickup_delay_minutes',
+                'css'      => 'width:100px;',
+                'default'  => '60',
+                'type'     => 'select',
+                'class'     => 'chosen_select',
+                'desc_tip' =>  true,
+                'options' => array(
+                    '5'      => __( '5 minutes', $this->plugin_slug ),
+                    '10'      => __( '10 minutes', $this->plugin_slug ),
+                    '15'      => __( '15 minutes', $this->plugin_slug ),
+                    '20'      => __( '20 minutes', $this->plugin_slug ),
+                    '30'      => __( '30 minutes', $this->plugin_slug ),
+                    '45'      => __( '45 minutes', $this->plugin_slug ),
+                    '60'      => __( '1 hour', $this->plugin_slug ),
+                    '120'     => __( '2 hours', $this->plugin_slug ),
+                )
+            ),
+            array(
+                'title'     => __( 'Pickup Time Days Ahead', $this->plugin_slug ),
+                'desc'     => __( 'Choose the number of days ahead for allowing local pickup orders.', $this->plugin_slug ),
+                'id'       => 'local_pickup_days_ahead',
+                'css'      => 'width:100px;',
+                'default'  => '1',
+                'type'     => 'select',
+                'class'     => 'chosen_select',
+                'desc_tip' =>  true,
+                'options' => array(
+                    '1'      => __( '1 day', $this->plugin_slug ),
+                    '2'      => __( '2 days', $this->plugin_slug ),
+                    '3'      => __( '3 days', $this->plugin_slug ),
+                    '4'      => __( '4 days', $this->plugin_slug ),
+                    '5'      => __( '5 days', $this->plugin_slug ),
+                    '6'      => __( '6 days', $this->plugin_slug ),
+                    '7'      => __( '7 days', $this->plugin_slug ),
+                    '8'      => __( '8 days', $this->plugin_slug ),
+                    '9'      => __( '9 days', $this->plugin_slug ),
+                    '10'     => __( '10 days', $this->plugin_slug ),
                 )
             ),

woocommerce-local-pickup-time-select/trunk/public/class-local-pickup-time.php

@@ -26 +26 @@
      * @var     string
      */
-    const VERSION = '1.0.3';
+    const VERSION = '1.2.0';
 
     /**
@@ -272 +272 @@
         }
 
-        // Setup time variables for calculations
-        $one_hour_later_hour = date( 'H', strtotime( "+1 hour" ) );
-        $one_hour_later_minute = date( 'i', strtotime( "+1 hour" ) );
-        $two_hour_later_hour = date( 'H', strtotime( "+2 hours" ) );
-        $today_name = strtolower( date( 'l' ) );
-        $today_date = date( 'm/d/Y' );
-
         // Get days closed textarea from settings, explode into an array
         $closing_days_raw = trim( get_option( 'local_pickup_hours_closings' ) );
@@ -284 +277 @@
         $closing_days = array_filter( $closing_days, 'trim' );
 
-        // Get today's opening and closing times
-        $open_time = get_option( 'local_pickup_hours_' . $today_name . '_start', '10:00' );
-        $close_time = get_option( 'local_pickup_hours_' . $today_name . '_end', '19:00' );
-
-        // Get pickup interval
+        // Get delay, interval, and number of days ahead settings
+        $delay_minutes = get_option( 'local_pickup_delay_minutes', 60 );
         $interval = get_option( 'local_pickup_hours_interval', 30 );
-
-        // Setup start and end times for pickup options
-        $pickup_time_begin = ( $one_hour_later_minute < $interval ) ? $one_hour_later_hour . ":$interval" : $two_hour_later_hour . ":00";
-
-        $start_time = ( strtotime( $pickup_time_begin ) < strtotime( $open_time ) ) ? $open_time : $pickup_time_begin;
-
-        // Today
-        $tStart = strtotime( $start_time );
-        $tEnd = strtotime( $close_time );
-        $tNow = $tStart;
-        $current_time = time();
-
-        $pickup_options = '';
-
-        // If Closed today or today's pickup times are over, don't allow a pickup option
-        if ( in_array( $today_date, $closing_days ) || $current_time >= $tEnd  ) {
-            // Set drop down text to let user know store is closed
-            $pickup_options['closed_today'] = __( 'Closed today, please check back tomorrow!', $this->plugin_slug );
-
-            // Hide Order Review so user doesn't order anything today
-            remove_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
-        }
-        else {
-            // Create array of time options to return to woocommerce_form_field
-            while( $tNow <= $tEnd ){
-                $option_key = date( "l_h_i", $tNow );
-                $option_value = 'Today ' . date( "g:i", $tNow );
-
-                $pickup_options[$option_key] = $option_value;
-
-                $tNow = strtotime( "+$interval minutes", $tNow );
+        $num_days_allowed = get_option( 'local_pickup_days_ahead', 1 );
+
+        // Setup time variables for calculations
+        $delay_ahead_hour = date( 'H', strtotime( "+$delay_minutes minutes" ) );
+        $delay_ahead_minute = date( 'i', strtotime( "+$delay_minutes minutes" ) );
+        $double_delay_ahead_hour = date( 'H', strtotime( "+2 hours" ) );
+        $today_name = strtolower( date( 'l' ) );
+        $today_date = date( 'm/d/Y' );
+
+        // Create an empty array for our dates
+        $pickup_options = array();
+
+        // Loop through all days ahead and add the pickup time options to the array
+        for ( $i = 0; $i < $num_days_allowed; $i++ ) {
+
+            // Get the date of current iteration
+            $current_day_name = date( 'l', strtotime( "+$i days" ) );
+            $current_day_name_lower = strtolower( $current_day_name );
+
+            // Get the day's opening and closing times
+            $open_time = get_option( 'local_pickup_hours_' . $current_day_name_lower . '_start', '10:00' );
+            $close_time = get_option( 'local_pickup_hours_' . $current_day_name_lower . '_end', '19:00' );
+
+            // Setup start and end times for pickup options
+            $pickup_time_begin = ( $delay_ahead_minute < $interval ) ? $delay_ahead_hour . ":$interval" : $double_delay_ahead_hour . ":00";
+
+            $start_time = ( strtotime( $pickup_time_begin ) < strtotime( $open_time ) ) ? $open_time : $pickup_time_begin;
+
+            // Today
+            $tStart = strtotime( $start_time );
+            $tEnd = strtotime( $close_time );
+            $tNow = $tStart;
+            $current_time = time();
+
+            // If Closed today or today's pickup times are over, don't allow a pickup option
+            if ( in_array( $today_date, $closing_days ) || $current_time >= $tEnd  ) {
+                // Set drop down text to let user know store is closed
+                $pickup_options['closed_today'] = __( 'Closed today, please check back tomorrow!', $this->plugin_slug );
+
+                // Hide Order Review so user doesn't order anything today
+                remove_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
             }
-        }
+            else {
+                // Create array of time options to return to woocommerce_form_field
+                while ( $tNow <= $tEnd ) {
+
+                    $day_name = ( $i === 0 ) ? 'Today' : $current_day_name;
+
+                    $option_key = $current_day_name . date( "_h_i", $tNow );
+                    $option_value = $day_name . ' ' . date( "g:i", $tNow );
+
+                    $pickup_options[$option_key] = $option_value;
+
+                    $tNow = strtotime( "+$interval minutes", $tNow );
+                }
+            }
+
+        } // end for loop
 
         return $pickup_options;

woocommerce-local-pickup-time-select/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.8
 Tested up to: 4.0
-Stable tag: 1.1.0
+Stable tag: 1.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -71 +71 @@
 == Changelog ==
 
+= 1.2.0 =
+* added option to select the delay from the current time until the order can be picked up
+* added option to select the number of days ahead for allowing orders to be picked up
+
 = 1.1.0 =
 * added `local_pickup_time_select_location` filter to customize location of pickup time select during checkout

woocommerce-local-pickup-time-select/trunk/woocommerce-local-pickup-time.php

@@ -17 +17 @@
  * Plugin URI:        http://mattbanks.me
  * Description:       Add an an option to WooCommerce checkout pages for Local Pickup that allows the user to choose a pickup time.
- * Version:           1.1.0
+ * Version:           1.2.0
  * Author:            Matt Banks
  * Author URI:        http://mattbanks.me