release/1.3.9 (#51)

* Fix Invalid Pickup Intervals (#45)
* Fixes how the starting interval is set, especially during the middle of the current open/close pickup time.
* Sets end time 1 interval past it in order to have the end close pickup time be inclusive for pickup.
* Changes field title and help text for Pickup Days Ahead to be clear that the number does now represent the number of open days inclusive of the current day.
* Updates language files to handle some new dashboard labels and help text.
* Fixes incorrect use of pickup time interval instead of time delay. (#48)
* Updates version for 1.3.9 release.
* Changes direct WC_Order id attribute access to use get_id() method. (#49)
* Fixes incorrect time delay handling.
* Updates dependencies.
* Updates changelog and prepares for build.

README.md

@@ -4,7 +4,7 @@
 **Tags:** woocommcerce, shipping, local pickup, checkout fields, ecommerce, e-commerce, wordpress ecommerce  
 **Requires at least:** 4.7  
 **Tested up to:** 5.1.1  
-**Stable tag:** 1.3.8  
+**Stable tag:** 1.3.9  
 **Requires PHP:** 5.6  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
@@ -69,6 +69,15 @@ The location, by default, is hooked to `woocommerce_admin_order_data_after_billi
 
 ## Changelog ##
 
+### 1.3.9 ###
+* Fixes how the starting interval is set, especially during the middle of the current open/close pickup time.
+* Sets end time 1 interval past it in order to have the end close pickup time be inclusive for pickup.
+* Changes field title and help text for Pickup Days Ahead to be clear that the number does now represent the number of open days inclusive of the current day.
+* Updates language files to handle some new dashboard labels and help text.
+* Fixes an incorrect use of the pickup time interval instead of the delay, causing incorrect starting pickup time.
+* Changes direct WC_Order id attribute access to use get_id() method.
+* Fixes additonal issue with how time delay is handled on the first available pickup time.
+
 ### 1.3.8 ###
 * Fixes issue with recognizing the current date/time as the start of the pickup time selection.
 

admin/class-local-pickup-time-admin.php

@@ -295,8 +295,8 @@ public function add_hours_and_closings_options( $settings ) {
 				),
 			),
 			array(
-				'title'       => __( 'Pickup Time Days Ahead', 'woocommerce-local-pickup-time' ),
-				'desc'        => __( 'Choose the number of days ahead for allowing local pickup orders.', 'woocommerce-local-pickup-time' ),
+				'title'       => __( 'Pickup Time Open Days Ahead', 'woocommerce-local-pickup-time' ),
+				'desc'        => __( 'Choose the number of open days ahead for allowing local pickup orders. This is inclusive of the current day, if timeslots are still available.', 'woocommerce-local-pickup-time' ),
 				'id'          => 'local_pickup_days_ahead',
 				'css'         => 'width:100px;',
 				'default'     => '1',
@@ -330,7 +330,7 @@ public function add_hours_and_closings_options( $settings ) {
 	 * @param object $order  The order object.
 	 */
 	public function show_metabox( $order ) {
-		$order_meta = get_post_custom( $order->id );
+		$order_meta = get_post_custom( $order->get_id() );
 
 		echo '<p><strong>' . __( 'Pickup Time:', 'woocommerce-local-pickup-time' ) . '</strong> ' . $this->pickup_time_select_translatable( $order_meta[ $this->order_meta_key ][0] ) . '</p>';
 

languages/woocommerce-local-pickup-time-cs_CZ.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: WooCommerce Local Pickup Time\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-local-"
 "pickup-time\n"
-"POT-Creation-Date: 2019-03-16 02:32:03+00:00\n"
+"POT-Creation-Date: 2019-04-04 11:53:07+00:00\n"
 "PO-Revision-Date: 2019-02-01 14:28:47+0000\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
@@ -272,21 +272,25 @@ msgid "1 week"
 msgstr "1 týden"
 
 #: admin/class-local-pickup-time-admin.php:298
-msgid "Pickup Time Days Ahead"
+#, fuzzy
+msgid "Pickup Time Open Days Ahead"
 msgstr "Objednávka dopředu max."
 
 #: admin/class-local-pickup-time-admin.php:299
-msgid "Choose the number of days ahead for allowing local pickup orders."
+#, fuzzy
+msgid ""
+"Choose the number of open days ahead for allowing local pickup orders. This "
+"is inclusive of the current day, if timeslots are still available."
 msgstr "Vyberte pro kolik dní dopředu je možné vybrat dobu doručení"
 
 #: admin/class-local-pickup-time-admin.php:335
 msgid "Pickup Time:"
 msgstr "Čas vyzvednutí:"
 
 #: admin/class-local-pickup-time-admin.php:356
-#: public/class-local-pickup-time.php:515
-#: public/class-local-pickup-time.php:522
-#: public/class-local-pickup-time.php:574
+#: public/class-local-pickup-time.php:528
+#: public/class-local-pickup-time.php:535
+#: public/class-local-pickup-time.php:587
 msgid "Pickup Time"
 msgstr "Čas vyzvednutí"
 
@@ -318,15 +322,15 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: public/class-local-pickup-time.php:422
+#: public/class-local-pickup-time.php:419
 msgid "Select time"
 msgstr "Vyberte čas"
 
-#: public/class-local-pickup-time.php:542
+#: public/class-local-pickup-time.php:555
 msgid "Please select a pickup time."
 msgstr "vyberte si čas vyzvednutí."
 
-#: public/class-local-pickup-time.php:594
+#: public/class-local-pickup-time.php:607
 msgid "None"
 msgstr "Žádná"
 

languages/woocommerce-local-pickup-time-en_US.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: WooCommerce Local Pickup Time Select\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-local-"
 "pickup-time\n"
-"POT-Creation-Date: 2019-03-16 02:32:03+00:00\n"
+"POT-Creation-Date: 2019-04-04 11:53:07+00:00\n"
 "PO-Revision-Date: 2017-05-11 11:03+0200\n"
 "Last-Translator: Karolína Vyskočilová <[email protected]>\n"
 "Language-Team: Matt Banks <[email protected]>\n"
@@ -247,21 +247,23 @@ msgid "1 week"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:298
-msgid "Pickup Time Days Ahead"
+msgid "Pickup Time Open Days Ahead"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:299
-msgid "Choose the number of days ahead for allowing local pickup orders."
+msgid ""
+"Choose the number of open days ahead for allowing local pickup orders. This "
+"is inclusive of the current day, if timeslots are still available."
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:335
 msgid "Pickup Time:"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:356
-#: public/class-local-pickup-time.php:515
-#: public/class-local-pickup-time.php:522
-#: public/class-local-pickup-time.php:574
+#: public/class-local-pickup-time.php:528
+#: public/class-local-pickup-time.php:535
+#: public/class-local-pickup-time.php:587
 msgid "Pickup Time"
 msgstr ""
 
@@ -293,15 +295,15 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: public/class-local-pickup-time.php:422
+#: public/class-local-pickup-time.php:419
 msgid "Select time"
 msgstr ""
 
-#: public/class-local-pickup-time.php:542
+#: public/class-local-pickup-time.php:555
 msgid "Please select a pickup time."
 msgstr ""
 
-#: public/class-local-pickup-time.php:594
+#: public/class-local-pickup-time.php:607
 msgid "None"
 msgstr ""
 

languages/woocommerce-local-pickup-time.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the GPL-2.0+.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Local Pickup Time Select 1.3.8\n"
+"Project-Id-Version: WooCommerce Local Pickup Time Select 1.3.9\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/woocommerce-local-pickup-time\n"
-"POT-Creation-Date: 2019-03-16 02:32:03+00:00\n"
+"POT-Creation-Date: 2019-04-04 11:53:07+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -252,21 +252,23 @@ msgid "1 week"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:298
-msgid "Pickup Time Days Ahead"
+msgid "Pickup Time Open Days Ahead"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:299
-msgid "Choose the number of days ahead for allowing local pickup orders."
+msgid ""
+"Choose the number of open days ahead for allowing local pickup orders. This "
+"is inclusive of the current day, if timeslots are still available."
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:335
 msgid "Pickup Time:"
 msgstr ""
 
 #: admin/class-local-pickup-time-admin.php:356
-#: public/class-local-pickup-time.php:515
-#: public/class-local-pickup-time.php:522
-#: public/class-local-pickup-time.php:574
+#: public/class-local-pickup-time.php:528
+#: public/class-local-pickup-time.php:535
+#: public/class-local-pickup-time.php:587
 msgid "Pickup Time"
 msgstr ""
 
@@ -298,15 +300,15 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: public/class-local-pickup-time.php:422
+#: public/class-local-pickup-time.php:419
 msgid "Select time"
 msgstr ""
 
-#: public/class-local-pickup-time.php:542
+#: public/class-local-pickup-time.php:555
 msgid "Please select a pickup time."
 msgstr ""
 
-#: public/class-local-pickup-time.php:594
+#: public/class-local-pickup-time.php:607
 msgid "None"
 msgstr ""
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-local-pickup-time",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Add an an option to WooCommerce checkout pages for Local Pickup that allows the user to choose a pickup time.",
   "main": "Gruntfile.js",
   "scripts": {