Changeset 2940972
- Timestamp:
- 07/20/2023 04:27:05 PM (2 years ago)
- Location:
- orderable
- Files:
-
- 12 edited
- 1 copied
-
tags/1.8.4 (copied) (copied from orderable/trunk)
-
tags/1.8.4/docs/actions.json (modified) (1 diff)
-
tags/1.8.4/inc/modules/location/admin/class-location-admin.php (modified) (1 diff)
-
tags/1.8.4/inc/modules/location/zones/class-location-zones.php (modified) (1 diff)
-
tags/1.8.4/languages/orderable.pot (modified) (3 diffs)
-
tags/1.8.4/orderable.php (modified) (2 diffs)
-
tags/1.8.4/readme.txt (modified) (2 diffs)
-
trunk/docs/actions.json (modified) (1 diff)
-
trunk/inc/modules/location/admin/class-location-admin.php (modified) (1 diff)
-
trunk/inc/modules/location/zones/class-location-zones.php (modified) (1 diff)
-
trunk/languages/orderable.pot (modified) (3 diffs)
-
trunk/orderable.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orderable/tags/1.8.4/docs/actions.json
r2933929 r2940972 392 392 "doc": { 393 393 "description": "Plugin Name: Orderable - Local Ordering System Author URI: https://orderable.com Description: Take local online ordering to a whole new level with Orderable.", 394 "long_description": "Version: 1.8. 2 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.7",395 "tags": [], 396 "long_description_html": "<p>Version: 1.8. 2 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.7</p>"394 "long_description": "Version: 1.8.3 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.8", 395 "tags": [], 396 "long_description_html": "<p>Version: 1.8.3 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.8</p>" 397 397 }, 398 398 "args": 0 -
orderable/tags/1.8.4/inc/modules/location/admin/class-location-admin.php
r2933929 r2940972 312 312 */ 313 313 do_action( 'orderable_location_save_data', $data ); 314 315 self::clear_location_data_cache( $data ); 316 } 317 318 /** 319 * Clear location cache when updated. 320 * 321 * @param array $data The data saved. 322 * @return void 323 */ 324 protected static function clear_location_data_cache( $data ) { 325 global $post; 326 327 $post_id = ! empty( $post ) ? $post->ID : null; 328 $location_id = Orderable_Location::get_location_id( $post_id ); 329 330 if ( empty( $location_id ) ) { 331 return; 332 } 333 334 $location_data_cache_key = 'orderable_get_location_data_' . $location_id; 335 $time_slots_cache_key = 'orderable_time_slots_' . $location_id; 336 337 wp_cache_delete( $location_data_cache_key ); 338 wp_cache_delete( $time_slots_cache_key . '_delivery' ); 339 wp_cache_delete( $time_slots_cache_key . '_pickup' ); 340 wp_cache_delete( 'orderable_zones' ); 341 342 foreach ( WC_Shipping_Zones::get_zones() as $zone ) { 343 wp_cache_delete( 'orderable_time_slots_for_zone_' . $zone['zone_id'] ); 344 } 345 346 if ( empty( $data['store_general_service_hours_delivery'] ) || ! is_array( $data['store_general_service_hours_delivery'] ) ) { 347 return; 348 } 349 350 foreach ( $data['store_general_service_hours_delivery'] as $time_slot ) { 351 if ( empty( $time_slot['time_slot_id'] ) ) { 352 continue; 353 } 354 355 wp_cache_delete( 'orderable_zones_time_slot_' . $time_slot['time_slot_id'] ); 356 } 314 357 } 315 358 -
orderable/tags/1.8.4/inc/modules/location/zones/class-location-zones.php
r2913809 r2940972 255 255 * Get the selected shipping zone ID. 256 256 * 257 * @return int| bool257 * @return int|false 258 258 */ 259 259 public static function get_selected_shipping_zone_id() { 260 return ! empty( WC()->session ) ? WC()->session->get( 'orderable_chosen_zone_id' ) : false;260 return ! empty( WC()->session ) ? WC()->session->get( 'orderable_chosen_zone_id', false ) : false; 261 261 } 262 262 -
orderable/tags/1.8.4/languages/orderable.pot
r2933929 r2940972 7 7 "Content-Type: text/plain; charset=UTF-8\n" 8 8 "Content-Transfer-Encoding: 8bit\n" 9 "POT-Creation-Date: 2023-0 5-23 07:25+0000\n"9 "POT-Creation-Date: 2023-07-04 11:53+0000\n" 10 10 "X-Poedit-Basepath: ..\n" 11 11 "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n" … … 623 623 msgstr "" 624 624 625 #: inc/modules/location/class-location-single.php:4 59625 #: inc/modules/location/class-location-single.php:469 626 626 msgid "Closed" 627 627 msgstr "" 628 628 629 #: inc/modules/location/class-location-single.php:4 65629 #: inc/modules/location/class-location-single.php:475 630 630 msgid "Holiday" 631 631 msgstr "" 632 632 633 #: inc/modules/location/class-location-single.php:5 27, inc/modules/location/admin/meta-boxes/class-location-store-services-meta-box.php:490633 #: inc/modules/location/class-location-single.php:537, inc/modules/location/admin/meta-boxes/class-location-store-services-meta-box.php:490 634 634 msgid "All Day" 635 635 msgstr "" … … 909 909 msgstr "" 910 910 911 #: inc/modules/location/admin/class-location-admin.php:17 1, inc/modules/location/admin/class-location-admin.php:172, inc/modules/location/admin/class-location-admin.php:190911 #: inc/modules/location/admin/class-location-admin.php:178, inc/modules/location/admin/class-location-admin.php:179, inc/modules/location/admin/class-location-admin.php:197 912 912 msgid "Location" 913 913 msgstr "" 914 914 915 #: inc/modules/location/admin/class-location-admin.php:1 85915 #: inc/modules/location/admin/class-location-admin.php:192 916 916 msgid "You do not have sufficient permissions to access this page." 917 917 msgstr "" 918 918 919 #: inc/modules/location/admin/class-location-admin.php:2 07919 #: inc/modules/location/admin/class-location-admin.php:214 920 920 msgid "Save Changes" 921 921 msgstr "" 922 922 923 #: inc/modules/location/admin/class-location-admin.php:21 2923 #: inc/modules/location/admin/class-location-admin.php:219 924 924 msgid "Unlock Multi-Location Power with Orderable Pro" 925 925 msgstr "" 926 926 927 #: inc/modules/location/admin/class-location-admin.php:2 13927 #: inc/modules/location/admin/class-location-admin.php:220 928 928 msgid "Manage multiple locations effortlessly with Orderable Pro, perfect for businesses with more than one location. Take control of your delivery and pickup services like never before." 929 929 msgstr "" 930 930 931 #: inc/modules/location/admin/class-location-admin.php:2 14931 #: inc/modules/location/admin/class-location-admin.php:221 932 932 msgid "Upgrade Now" 933 933 msgstr "" 934 934 935 #: inc/modules/location/admin/class-location-admin.php:2 15935 #: inc/modules/location/admin/class-location-admin.php:222 936 936 msgid "or" 937 937 msgstr "" 938 938 939 #: inc/modules/location/admin/class-location-admin.php:2 15939 #: inc/modules/location/admin/class-location-admin.php:222 940 940 msgid "learn more" 941 941 msgstr "" -
orderable/tags/1.8.4/orderable.php
r2933929 r2940972 4 4 * Author URI: https://orderable.com 5 5 * Description: Take local online ordering to a whole new level with Orderable. 6 * Version: 1.8. 36 * Version: 1.8.4 7 7 * Author: Orderable 8 8 * Text Domain: orderable 9 9 * WC requires at least: 5.4.0 10 * WC tested up to: 7. 810 * WC tested up to: 7.9 11 11 */ 12 12 … … 20 20 * @var string Plugin version. 21 21 */ 22 public static $version = '1.8. 3';22 public static $version = '1.8.4'; 23 23 24 24 /** -
orderable/tags/1.8.4/readme.txt
r2933929 r2940972 5 5 Tested up to: 6.2 6 6 Requires PHP: 5.6 7 Stable tag: 1.8. 37 Stable tag: 1.8.4 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 145 145 146 146 == Changelog == 147 **v1.8.4** (20 Jul 2023) 148 [fix] Location data not getting updated when cache is activated 149 [fix] Compatibility issue with WooCommerce Payment Gateway Based Fees 150 147 151 **v1.8.3** (04 Jul 2023) 148 152 [new] Filter `orderable_location_get_lead_time` -
orderable/trunk/docs/actions.json
r2933929 r2940972 392 392 "doc": { 393 393 "description": "Plugin Name: Orderable - Local Ordering System Author URI: https://orderable.com Description: Take local online ordering to a whole new level with Orderable.", 394 "long_description": "Version: 1.8. 2 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.7",395 "tags": [], 396 "long_description_html": "<p>Version: 1.8. 2 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.7</p>"394 "long_description": "Version: 1.8.3 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.8", 395 "tags": [], 396 "long_description_html": "<p>Version: 1.8.3 Author: Orderable Text Domain: orderable WC requires at least: 5.4.0 WC tested up to: 7.8</p>" 397 397 }, 398 398 "args": 0 -
orderable/trunk/inc/modules/location/admin/class-location-admin.php
r2933929 r2940972 312 312 */ 313 313 do_action( 'orderable_location_save_data', $data ); 314 315 self::clear_location_data_cache( $data ); 316 } 317 318 /** 319 * Clear location cache when updated. 320 * 321 * @param array $data The data saved. 322 * @return void 323 */ 324 protected static function clear_location_data_cache( $data ) { 325 global $post; 326 327 $post_id = ! empty( $post ) ? $post->ID : null; 328 $location_id = Orderable_Location::get_location_id( $post_id ); 329 330 if ( empty( $location_id ) ) { 331 return; 332 } 333 334 $location_data_cache_key = 'orderable_get_location_data_' . $location_id; 335 $time_slots_cache_key = 'orderable_time_slots_' . $location_id; 336 337 wp_cache_delete( $location_data_cache_key ); 338 wp_cache_delete( $time_slots_cache_key . '_delivery' ); 339 wp_cache_delete( $time_slots_cache_key . '_pickup' ); 340 wp_cache_delete( 'orderable_zones' ); 341 342 foreach ( WC_Shipping_Zones::get_zones() as $zone ) { 343 wp_cache_delete( 'orderable_time_slots_for_zone_' . $zone['zone_id'] ); 344 } 345 346 if ( empty( $data['store_general_service_hours_delivery'] ) || ! is_array( $data['store_general_service_hours_delivery'] ) ) { 347 return; 348 } 349 350 foreach ( $data['store_general_service_hours_delivery'] as $time_slot ) { 351 if ( empty( $time_slot['time_slot_id'] ) ) { 352 continue; 353 } 354 355 wp_cache_delete( 'orderable_zones_time_slot_' . $time_slot['time_slot_id'] ); 356 } 314 357 } 315 358 -
orderable/trunk/inc/modules/location/zones/class-location-zones.php
r2913809 r2940972 255 255 * Get the selected shipping zone ID. 256 256 * 257 * @return int| bool257 * @return int|false 258 258 */ 259 259 public static function get_selected_shipping_zone_id() { 260 return ! empty( WC()->session ) ? WC()->session->get( 'orderable_chosen_zone_id' ) : false;260 return ! empty( WC()->session ) ? WC()->session->get( 'orderable_chosen_zone_id', false ) : false; 261 261 } 262 262 -
orderable/trunk/languages/orderable.pot
r2933929 r2940972 7 7 "Content-Type: text/plain; charset=UTF-8\n" 8 8 "Content-Transfer-Encoding: 8bit\n" 9 "POT-Creation-Date: 2023-0 5-23 07:25+0000\n"9 "POT-Creation-Date: 2023-07-04 11:53+0000\n" 10 10 "X-Poedit-Basepath: ..\n" 11 11 "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n" … … 623 623 msgstr "" 624 624 625 #: inc/modules/location/class-location-single.php:4 59625 #: inc/modules/location/class-location-single.php:469 626 626 msgid "Closed" 627 627 msgstr "" 628 628 629 #: inc/modules/location/class-location-single.php:4 65629 #: inc/modules/location/class-location-single.php:475 630 630 msgid "Holiday" 631 631 msgstr "" 632 632 633 #: inc/modules/location/class-location-single.php:5 27, inc/modules/location/admin/meta-boxes/class-location-store-services-meta-box.php:490633 #: inc/modules/location/class-location-single.php:537, inc/modules/location/admin/meta-boxes/class-location-store-services-meta-box.php:490 634 634 msgid "All Day" 635 635 msgstr "" … … 909 909 msgstr "" 910 910 911 #: inc/modules/location/admin/class-location-admin.php:17 1, inc/modules/location/admin/class-location-admin.php:172, inc/modules/location/admin/class-location-admin.php:190911 #: inc/modules/location/admin/class-location-admin.php:178, inc/modules/location/admin/class-location-admin.php:179, inc/modules/location/admin/class-location-admin.php:197 912 912 msgid "Location" 913 913 msgstr "" 914 914 915 #: inc/modules/location/admin/class-location-admin.php:1 85915 #: inc/modules/location/admin/class-location-admin.php:192 916 916 msgid "You do not have sufficient permissions to access this page." 917 917 msgstr "" 918 918 919 #: inc/modules/location/admin/class-location-admin.php:2 07919 #: inc/modules/location/admin/class-location-admin.php:214 920 920 msgid "Save Changes" 921 921 msgstr "" 922 922 923 #: inc/modules/location/admin/class-location-admin.php:21 2923 #: inc/modules/location/admin/class-location-admin.php:219 924 924 msgid "Unlock Multi-Location Power with Orderable Pro" 925 925 msgstr "" 926 926 927 #: inc/modules/location/admin/class-location-admin.php:2 13927 #: inc/modules/location/admin/class-location-admin.php:220 928 928 msgid "Manage multiple locations effortlessly with Orderable Pro, perfect for businesses with more than one location. Take control of your delivery and pickup services like never before." 929 929 msgstr "" 930 930 931 #: inc/modules/location/admin/class-location-admin.php:2 14931 #: inc/modules/location/admin/class-location-admin.php:221 932 932 msgid "Upgrade Now" 933 933 msgstr "" 934 934 935 #: inc/modules/location/admin/class-location-admin.php:2 15935 #: inc/modules/location/admin/class-location-admin.php:222 936 936 msgid "or" 937 937 msgstr "" 938 938 939 #: inc/modules/location/admin/class-location-admin.php:2 15939 #: inc/modules/location/admin/class-location-admin.php:222 940 940 msgid "learn more" 941 941 msgstr "" -
orderable/trunk/orderable.php
r2933929 r2940972 4 4 * Author URI: https://orderable.com 5 5 * Description: Take local online ordering to a whole new level with Orderable. 6 * Version: 1.8. 36 * Version: 1.8.4 7 7 * Author: Orderable 8 8 * Text Domain: orderable 9 9 * WC requires at least: 5.4.0 10 * WC tested up to: 7. 810 * WC tested up to: 7.9 11 11 */ 12 12 … … 20 20 * @var string Plugin version. 21 21 */ 22 public static $version = '1.8. 3';22 public static $version = '1.8.4'; 23 23 24 24 /** -
orderable/trunk/readme.txt
r2933929 r2940972 5 5 Tested up to: 6.2 6 6 Requires PHP: 5.6 7 Stable tag: 1.8. 37 Stable tag: 1.8.4 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 145 145 146 146 == Changelog == 147 **v1.8.4** (20 Jul 2023) 148 [fix] Location data not getting updated when cache is activated 149 [fix] Compatibility issue with WooCommerce Payment Gateway Based Fees 150 147 151 **v1.8.3** (04 Jul 2023) 148 152 [new] Filter `orderable_location_get_lead_time`
Note: See TracChangeset
for help on using the changeset viewer.