Changeset 3764498
- Timestamp:
- 10/25/2026 12:11:12 PM (70 minutes ago)
- Location:
- sideup-shipping-ksa
- Files:
-
- 6 edited
- 1 copied
-
tags/2.3.7 (copied) (copied from sideup-shipping-ksa/trunk )
-
tags/2.3.7/js/sideup-1.9.js (modified) (2 diffs)
-
tags/2.3.7/readme.txt (modified) (2 diffs)
-
tags/2.3.7/sideup-shipping-ksa.php (modified) (2 diffs)
-
trunk/js/sideup-1.9.js (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/sideup-shipping-ksa.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sideup-shipping-ksa/tags/2.3.7/js/sideup-1.9.js
r3596940 r3764498 52 52 fromZone: SIDEUP_ZONE_NAME_TO_ID[String(d.zone || '').toLowerCase()] || null, 53 53 zoneName: d.zone || '', 54 sideupCredit: (d.wallet && d.wallet.sideup_credit != null) ? Number(d.wallet.sideup_credit) : null 54 sideupCredit: (d.wallet && d.wallet.sideup_credit != null) ? Number(d.wallet.sideup_credit) : null, 55 // null => merchant is not on a bundle (no_bundle) and ships without a credit check. 56 bundleId: d.bundle_id != null ? d.bundle_id : null 55 57 }; 56 58 }); … … 257 259 } 258 260 259 // Block the shipment when the merchant's SIDEUP credit cannot cover the 260 // selected courier's price; prompt them to subscribe to a package. 261 // Bundle merchants only: block the shipment when the merchant's SIDEUP 262 // credit cannot cover the selected courier's price. No-bundle merchants 263 // (bundle_id null) ship normally. 261 264 var courierPrice = parseFloat($checked.attr('data-value')); 262 if (merchant. sideupCredit != null && !isNaN(courierPrice) && merchant.sideupCredit < courierPrice) {265 if (merchant.bundleId != null && merchant.sideupCredit != null && !isNaN(courierPrice) && merchant.sideupCredit < courierPrice) { 263 266 Swal.fire({ 264 267 icon: 'warning', -
sideup-shipping-ksa/tags/2.3.7/readme.txt
r3596940 r3764498 7 7 Requires PHP: 7.4 8 8 Tested up to: 7.0 9 Stable tag: 2.3. 69 Stable tag: 2.3.7 10 10 WC requires at least: 2.6 11 11 WC tested up to: 9.6.0 … … 93 93 = 2.1.2 = 94 94 * fix pricing issues 95 96 = 2.3.7 = 97 * Wallet balance check now applies only to merchants subscribed to a bundle -
sideup-shipping-ksa/tags/2.3.7/sideup-shipping-ksa.php
r3596940 r3764498 7 7 * Author: SIDEUP 8 8 * Author URI: https://sa.sideup.co/ 9 * Version: 2.3. 69 * Version: 2.3.7 10 10 * Requires at least: 5.0 11 11 * Tested up to: 7.0 … … 820 820 821 821 // Enqueue the main JavaScript file 822 wp_enqueue_script('sideup-js', plugin_dir_url(__FILE__) . 'js/sideup-1.9.js', array('jquery'), '2.3. 6', true);822 wp_enqueue_script('sideup-js', plugin_dir_url(__FILE__) . 'js/sideup-1.9.js', array('jquery'), '2.3.7', true); 823 823 // wp_enqueue_script('areaMap-json', plugin_dir_url(__FILE__) . 'js/areaMap.json', '1.0', true); 824 824 -
sideup-shipping-ksa/trunk/js/sideup-1.9.js
r3596940 r3764498 52 52 fromZone: SIDEUP_ZONE_NAME_TO_ID[String(d.zone || '').toLowerCase()] || null, 53 53 zoneName: d.zone || '', 54 sideupCredit: (d.wallet && d.wallet.sideup_credit != null) ? Number(d.wallet.sideup_credit) : null 54 sideupCredit: (d.wallet && d.wallet.sideup_credit != null) ? Number(d.wallet.sideup_credit) : null, 55 // null => merchant is not on a bundle (no_bundle) and ships without a credit check. 56 bundleId: d.bundle_id != null ? d.bundle_id : null 55 57 }; 56 58 }); … … 257 259 } 258 260 259 // Block the shipment when the merchant's SIDEUP credit cannot cover the 260 // selected courier's price; prompt them to subscribe to a package. 261 // Bundle merchants only: block the shipment when the merchant's SIDEUP 262 // credit cannot cover the selected courier's price. No-bundle merchants 263 // (bundle_id null) ship normally. 261 264 var courierPrice = parseFloat($checked.attr('data-value')); 262 if (merchant. sideupCredit != null && !isNaN(courierPrice) && merchant.sideupCredit < courierPrice) {265 if (merchant.bundleId != null && merchant.sideupCredit != null && !isNaN(courierPrice) && merchant.sideupCredit < courierPrice) { 263 266 Swal.fire({ 264 267 icon: 'warning', -
sideup-shipping-ksa/trunk/readme.txt
r3596940 r3764498 7 7 Requires PHP: 7.4 8 8 Tested up to: 7.0 9 Stable tag: 2.3. 69 Stable tag: 2.3.7 10 10 WC requires at least: 2.6 11 11 WC tested up to: 9.6.0 … … 93 93 = 2.1.2 = 94 94 * fix pricing issues 95 96 = 2.3.7 = 97 * Wallet balance check now applies only to merchants subscribed to a bundle -
sideup-shipping-ksa/trunk/sideup-shipping-ksa.php
r3596940 r3764498 7 7 * Author: SIDEUP 8 8 * Author URI: https://sa.sideup.co/ 9 * Version: 2.3. 69 * Version: 2.3.7 10 10 * Requires at least: 5.0 11 11 * Tested up to: 7.0 … … 820 820 821 821 // Enqueue the main JavaScript file 822 wp_enqueue_script('sideup-js', plugin_dir_url(__FILE__) . 'js/sideup-1.9.js', array('jquery'), '2.3. 6', true);822 wp_enqueue_script('sideup-js', plugin_dir_url(__FILE__) . 'js/sideup-1.9.js', array('jquery'), '2.3.7', true); 823 823 // wp_enqueue_script('areaMap-json', plugin_dir_url(__FILE__) . 'js/areaMap.json', '1.0', true); 824 824
Note:
See TracChangeset
for help on using the changeset viewer.
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)