Changeset 3135438
- Timestamp:
- 08/14/2024 09:51:04 AM (19 months ago)
- Location:
- shipany
- Files:
-
- 6 edited
- 1 copied
-
tags/1.1.60 (copied) (copied from shipany/trunk)
-
tags/1.1.60/pages/easywidgetSDK/easywidget.js (modified) (3 diffs)
-
tags/1.1.60/readme.txt (modified) (2 diffs)
-
tags/1.1.60/shipany-woocommerce.php (modified) (3 diffs)
-
trunk/pages/easywidgetSDK/easywidget.js (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/shipany-woocommerce.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shipany/tags/1.1.60/pages/easywidgetSDK/easywidget.js
r3116110 r3135438 16 16 let region_idx = scriptParams.region_idx; 17 17 let env = scriptParams.env; 18 let ver = scriptParams.ver; 18 19 19 20 let lang = (document.documentElement.lang.includes('zh')?'zh':'en') ?? (scriptParams.lang.includes('zh')?'zh':'en'); … … 52 53 _withSearchBar = searchBar || false; 53 54 // load courier config 54 const data = await jQuery.getJSON('https://apps.shipany.io/woocommerce/locationList.json')55 window.couriers = data.couriers55 // const data = await jQuery.getJSON('https://apps.shipany.io/woocommerce/locationList.json') 56 // window.couriers = data.couriers 56 57 onLoadComplete(); 57 58 //console.log("hello inside here obj is ", obj); … … 133 134 mapBarWrapper.id = "mapBarWrapper"; 134 135 document.body.appendChild(mapBarWrapper); 136 const oldPointerEvents = document.body.style.pointerEvents; 137 document.body.style.pointerEvents = "none"; 135 138 136 await saLoadScripts( 137 "//unpkg.com/string-similarity/umd/string-similarity.min.js" 138 ); 139 await saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/rxjs/6.6.7/rxjs.umd.min.js"); 140 await saLoadScripts( 141 "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.core.min.js" 142 ); 143 await saLoadScripts("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.js"); 144 await LoadCSS("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"); 145 146 // //internal scripts 147 // await saLoadScripts( 148 // word_press_path + 149 // "pages/easywidgetSDK/lib/constants.js?" + 150 // Date.now().toString() 151 // ); 152 153 await saLoadScripts( 154 word_press_path + 155 "pages/easywidgetSDK/lib/ol_v5.2.0.js?" + 156 Date.now().toString() 157 ); //load first 158 await saLoadScripts( 159 word_press_path + "pages/easywidgetSDK/lib/olms.js?" + Date.now().toString() 160 ); 161 await saLoadScripts( 162 word_press_path + 163 "pages/easywidgetSDK/lib/ol-popup.js?" + 164 Date.now().toString() 165 ); 166 await saLoadScripts( 167 word_press_path + 168 "pages/easywidgetSDK/lib/stringBuilder.js?" + 169 Date.now().toString() 170 ); 171 await saLoadScripts( 172 word_press_path + 173 "pages/easywidgetSDK/lib/createHTMLElement.js?" + 174 Date.now().toString() 175 ); 176 await saLoadScripts( 177 word_press_path + 178 "pages/easywidgetSDK/service/paths.js?" + 179 Date.now().toString() 180 ); 181 await saLoadScripts( 182 word_press_path + 183 "pages/easywidgetSDK/service/apiservice.js?" + 184 Date.now().toString() 185 ); 186 187 //load stylesheet 188 await LoadCSS( 189 word_press_path + 190 "pages/easywidgetSDK/styles/styles.css?" + 191 Date.now().toString() 192 ); 193 194 //_mapType = "osm"; 195 switch (_mapType) { 196 case "osm": 197 await saLoadScripts( 198 word_press_path + 199 "pages/easywidgetSDK/components/osm-map-merge.js?" + 200 Date.now().toString() 201 ); 202 break; 203 case "gmap": 204 console.error("Droped") 205 } 139 Promise.all([ 140 saLoadScripts("//unpkg.com/string-similarity/umd/string-similarity.min.js"), 141 saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/rxjs/6.6.7/rxjs.umd.min.js"), 142 saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.core.min.js"), 143 saLoadScripts("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.js"), 144 LoadCSS("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"), 145 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/ol_v5.2.0.js?" + ver), 146 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/stringBuilder.js?" + ver), 147 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/createHTMLElement.js?" + ver), 148 saLoadScripts(word_press_path + "pages/easywidgetSDK/service/paths.js?" + ver), 149 LoadCSS(word_press_path + "pages/easywidgetSDK/styles/styles.css?" + ver), 150 ]).then(async (values) => { 151 //_mapType = "osm"; 152 Promise.all([ 153 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/olms.js?" + ver), 154 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/ol-popup.js?" + ver), 155 saLoadScripts(word_press_path + "pages/easywidgetSDK/service/apiservice.js?" + ver), 156 ]).then(async (values) => { 157 switch (_mapType) { 158 case "osm": 159 await saLoadScripts(word_press_path + "pages/easywidgetSDK/components/osm-map-merge.js?" + ver); 160 break; 161 case "gmap": 162 console.error("Droped") 163 } 164 }).finally(() => { 165 document.body.style.pointerEvents = oldPointerEvents; 166 }); 167 }).catch(() => { 168 document.body.style.pointerEvents = oldPointerEvents; 169 }); 206 170 } 207 171 -
shipany/tags/1.1.60/readme.txt
r3134792 r3135438 4 4 Requires at least: 4.1 5 5 Tested up to: 6.5.5 6 Stable tag: 1.1. 596 Stable tag: 1.1.60 7 7 Requires PHP: 5.6 8 8 License: GPLv2 or later … … 71 71 == Changelog == 72 72 73 = 1.1.60 = 74 - Enhanced locker listing speed 75 73 76 = 1.1.59 = 74 77 - Bug fix -
shipany/tags/1.1.60/shipany-woocommerce.php
r3134792 r3135438 7 7 Plugin URI: http://wordpress.org/plugins/shipany 8 8 Description: ShipAny one-stop logistics platform interconnects WooCommerce to multiple logistics service providers (including SF Express, Kerry Express, SF Cold-Chain, Alfred Locker, Hongkong Post, SF Locker, Convenience Store, etc.) so merchants can enjoy full-set features of logistics automation which disrupt the manual logistics process and bring E-Commerce to new generation. 9 Version: 1.1. 599 Version: 1.1.60 10 10 Author: ShipAny 11 11 Author URI: https://www.shipany.io … … 646 646 'region_idx' => isset(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_region']) ? get_option('woocommerce_shipany_ecs_asia_settings')['shipany_region'] : "", 647 647 'env' => isset(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_api_key']) ? ShipanyHelper::extractApiKeyEnvironment(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_api_key'])['env'] : "", 648 'lang' => strval(get_locale()) 648 'lang' => strval(get_locale()), 649 'ver' => SHIPANY_VERSION 649 650 ); 650 651 wp_localize_script('easywidgetjs', 'scriptParams', $script_params); … … 676 677 class SHIPANY_WC { 677 678 public static $list; 678 private $version = "1.1. 59";679 private $version = "1.1.60"; 679 680 680 681 protected static $_instance = null; -
shipany/trunk/pages/easywidgetSDK/easywidget.js
r3116110 r3135438 16 16 let region_idx = scriptParams.region_idx; 17 17 let env = scriptParams.env; 18 let ver = scriptParams.ver; 18 19 19 20 let lang = (document.documentElement.lang.includes('zh')?'zh':'en') ?? (scriptParams.lang.includes('zh')?'zh':'en'); … … 52 53 _withSearchBar = searchBar || false; 53 54 // load courier config 54 const data = await jQuery.getJSON('https://apps.shipany.io/woocommerce/locationList.json')55 window.couriers = data.couriers55 // const data = await jQuery.getJSON('https://apps.shipany.io/woocommerce/locationList.json') 56 // window.couriers = data.couriers 56 57 onLoadComplete(); 57 58 //console.log("hello inside here obj is ", obj); … … 133 134 mapBarWrapper.id = "mapBarWrapper"; 134 135 document.body.appendChild(mapBarWrapper); 136 const oldPointerEvents = document.body.style.pointerEvents; 137 document.body.style.pointerEvents = "none"; 135 138 136 await saLoadScripts( 137 "//unpkg.com/string-similarity/umd/string-similarity.min.js" 138 ); 139 await saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/rxjs/6.6.7/rxjs.umd.min.js"); 140 await saLoadScripts( 141 "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.core.min.js" 142 ); 143 await saLoadScripts("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.js"); 144 await LoadCSS("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"); 145 146 // //internal scripts 147 // await saLoadScripts( 148 // word_press_path + 149 // "pages/easywidgetSDK/lib/constants.js?" + 150 // Date.now().toString() 151 // ); 152 153 await saLoadScripts( 154 word_press_path + 155 "pages/easywidgetSDK/lib/ol_v5.2.0.js?" + 156 Date.now().toString() 157 ); //load first 158 await saLoadScripts( 159 word_press_path + "pages/easywidgetSDK/lib/olms.js?" + Date.now().toString() 160 ); 161 await saLoadScripts( 162 word_press_path + 163 "pages/easywidgetSDK/lib/ol-popup.js?" + 164 Date.now().toString() 165 ); 166 await saLoadScripts( 167 word_press_path + 168 "pages/easywidgetSDK/lib/stringBuilder.js?" + 169 Date.now().toString() 170 ); 171 await saLoadScripts( 172 word_press_path + 173 "pages/easywidgetSDK/lib/createHTMLElement.js?" + 174 Date.now().toString() 175 ); 176 await saLoadScripts( 177 word_press_path + 178 "pages/easywidgetSDK/service/paths.js?" + 179 Date.now().toString() 180 ); 181 await saLoadScripts( 182 word_press_path + 183 "pages/easywidgetSDK/service/apiservice.js?" + 184 Date.now().toString() 185 ); 186 187 //load stylesheet 188 await LoadCSS( 189 word_press_path + 190 "pages/easywidgetSDK/styles/styles.css?" + 191 Date.now().toString() 192 ); 193 194 //_mapType = "osm"; 195 switch (_mapType) { 196 case "osm": 197 await saLoadScripts( 198 word_press_path + 199 "pages/easywidgetSDK/components/osm-map-merge.js?" + 200 Date.now().toString() 201 ); 202 break; 203 case "gmap": 204 console.error("Droped") 205 } 139 Promise.all([ 140 saLoadScripts("//unpkg.com/string-similarity/umd/string-similarity.min.js"), 141 saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/rxjs/6.6.7/rxjs.umd.min.js"), 142 saLoadScripts("https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.core.min.js"), 143 saLoadScripts("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.js"), 144 LoadCSS("https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"), 145 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/ol_v5.2.0.js?" + ver), 146 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/stringBuilder.js?" + ver), 147 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/createHTMLElement.js?" + ver), 148 saLoadScripts(word_press_path + "pages/easywidgetSDK/service/paths.js?" + ver), 149 LoadCSS(word_press_path + "pages/easywidgetSDK/styles/styles.css?" + ver), 150 ]).then(async (values) => { 151 //_mapType = "osm"; 152 Promise.all([ 153 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/olms.js?" + ver), 154 saLoadScripts(word_press_path + "pages/easywidgetSDK/lib/ol-popup.js?" + ver), 155 saLoadScripts(word_press_path + "pages/easywidgetSDK/service/apiservice.js?" + ver), 156 ]).then(async (values) => { 157 switch (_mapType) { 158 case "osm": 159 await saLoadScripts(word_press_path + "pages/easywidgetSDK/components/osm-map-merge.js?" + ver); 160 break; 161 case "gmap": 162 console.error("Droped") 163 } 164 }).finally(() => { 165 document.body.style.pointerEvents = oldPointerEvents; 166 }); 167 }).catch(() => { 168 document.body.style.pointerEvents = oldPointerEvents; 169 }); 206 170 } 207 171 -
shipany/trunk/readme.txt
r3134792 r3135438 4 4 Requires at least: 4.1 5 5 Tested up to: 6.5.5 6 Stable tag: 1.1. 596 Stable tag: 1.1.60 7 7 Requires PHP: 5.6 8 8 License: GPLv2 or later … … 71 71 == Changelog == 72 72 73 = 1.1.60 = 74 - Enhanced locker listing speed 75 73 76 = 1.1.59 = 74 77 - Bug fix -
shipany/trunk/shipany-woocommerce.php
r3134792 r3135438 7 7 Plugin URI: http://wordpress.org/plugins/shipany 8 8 Description: ShipAny one-stop logistics platform interconnects WooCommerce to multiple logistics service providers (including SF Express, Kerry Express, SF Cold-Chain, Alfred Locker, Hongkong Post, SF Locker, Convenience Store, etc.) so merchants can enjoy full-set features of logistics automation which disrupt the manual logistics process and bring E-Commerce to new generation. 9 Version: 1.1. 599 Version: 1.1.60 10 10 Author: ShipAny 11 11 Author URI: https://www.shipany.io … … 646 646 'region_idx' => isset(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_region']) ? get_option('woocommerce_shipany_ecs_asia_settings')['shipany_region'] : "", 647 647 'env' => isset(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_api_key']) ? ShipanyHelper::extractApiKeyEnvironment(get_option('woocommerce_shipany_ecs_asia_settings')['shipany_api_key'])['env'] : "", 648 'lang' => strval(get_locale()) 648 'lang' => strval(get_locale()), 649 'ver' => SHIPANY_VERSION 649 650 ); 650 651 wp_localize_script('easywidgetjs', 'scriptParams', $script_params); … … 676 677 class SHIPANY_WC { 677 678 public static $list; 678 private $version = "1.1. 59";679 private $version = "1.1.60"; 679 680 680 681 protected static $_instance = null;
Note: See TracChangeset
for help on using the changeset viewer.