ts-glitter 18.3.1 → 18.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/shopping-finance-setting.js +17 -3
- package/lowcode/cms-plugin/shopping-finance-setting.ts +276 -262
- package/lowcode/public-components/checkout/index.js +7 -7
- package/lowcode/public-components/checkout/index.ts +8 -7
- package/package.json +1 -1
- package/src/api-public/services/shopping.js +1 -0
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +3 -1
|
@@ -1525,7 +1525,7 @@ export class CheckoutIndex {
|
|
|
1525
1525
|
return this.getPaymentMethod(vm.cartData)
|
|
1526
1526
|
.map((dd) => {
|
|
1527
1527
|
return html ` <option value="${dd.value}" ${localStorage.getItem('checkout-payment') === dd.value ? `selected` : ``}>
|
|
1528
|
-
${Language.
|
|
1528
|
+
${Language.getLanguageCustomText(dd.name) || Language.text(dd.value)}
|
|
1529
1529
|
</option>`;
|
|
1530
1530
|
})
|
|
1531
1531
|
.join('');
|
|
@@ -2806,37 +2806,37 @@ export class CheckoutIndex {
|
|
|
2806
2806
|
switch (dd.key) {
|
|
2807
2807
|
case 'newWebPay':
|
|
2808
2808
|
array.push({
|
|
2809
|
-
name: '藍新金流',
|
|
2809
|
+
name: dd.custome_name || '藍新金流',
|
|
2810
2810
|
value: 'newWebPay',
|
|
2811
2811
|
});
|
|
2812
2812
|
break;
|
|
2813
2813
|
case 'ecPay':
|
|
2814
2814
|
array.push({
|
|
2815
|
-
name: '綠界金流',
|
|
2815
|
+
name: dd.custome_name || '綠界金流',
|
|
2816
2816
|
value: 'ecPay',
|
|
2817
2817
|
});
|
|
2818
2818
|
break;
|
|
2819
2819
|
case 'paypal':
|
|
2820
2820
|
array.push({
|
|
2821
|
-
name: 'PayPal',
|
|
2821
|
+
name: dd.custome_name || 'PayPal',
|
|
2822
2822
|
value: 'paypal',
|
|
2823
2823
|
});
|
|
2824
2824
|
break;
|
|
2825
2825
|
case 'line_pay':
|
|
2826
2826
|
array.push({
|
|
2827
|
-
name: 'Line Pay',
|
|
2827
|
+
name: dd.custome_name || 'Line Pay',
|
|
2828
2828
|
value: 'line_pay',
|
|
2829
2829
|
});
|
|
2830
2830
|
break;
|
|
2831
2831
|
case 'jkopay':
|
|
2832
2832
|
array.push({
|
|
2833
|
-
name: '街口支付',
|
|
2833
|
+
name: dd.custome_name || '街口支付',
|
|
2834
2834
|
value: 'jkopay',
|
|
2835
2835
|
});
|
|
2836
2836
|
break;
|
|
2837
2837
|
case 'paynow':
|
|
2838
2838
|
array.push({
|
|
2839
|
-
name: 'PayNow 立吉富',
|
|
2839
|
+
name: dd.custome_name || 'PayNow 立吉富',
|
|
2840
2840
|
value: 'paynow',
|
|
2841
2841
|
});
|
|
2842
2842
|
break;
|
|
@@ -1628,7 +1628,7 @@ export class CheckoutIndex {
|
|
|
1628
1628
|
return this.getPaymentMethod(vm.cartData)
|
|
1629
1629
|
.map((dd: { name: string; value: string }) => {
|
|
1630
1630
|
return html` <option value="${dd.value}" ${localStorage.getItem('checkout-payment') === dd.value ? `selected` : ``}>
|
|
1631
|
-
${Language.
|
|
1631
|
+
${ Language.getLanguageCustomText(dd.name) || Language.text(dd.value)}
|
|
1632
1632
|
</option>`;
|
|
1633
1633
|
})
|
|
1634
1634
|
.join('');
|
|
@@ -2981,41 +2981,42 @@ export class CheckoutIndex {
|
|
|
2981
2981
|
//取得付款方式
|
|
2982
2982
|
public static getPaymentMethod(cartData: any) {
|
|
2983
2983
|
let array = [];
|
|
2984
|
+
|
|
2984
2985
|
cartData.payment_setting.map((dd: any) => {
|
|
2985
2986
|
switch (dd.key) {
|
|
2986
2987
|
case 'newWebPay':
|
|
2987
2988
|
array.push({
|
|
2988
|
-
name: '藍新金流',
|
|
2989
|
+
name: dd.custome_name || '藍新金流',
|
|
2989
2990
|
value: 'newWebPay',
|
|
2990
2991
|
});
|
|
2991
2992
|
break;
|
|
2992
2993
|
case 'ecPay':
|
|
2993
2994
|
array.push({
|
|
2994
|
-
name: '綠界金流',
|
|
2995
|
+
name: dd.custome_name || '綠界金流',
|
|
2995
2996
|
value: 'ecPay',
|
|
2996
2997
|
});
|
|
2997
2998
|
break;
|
|
2998
2999
|
case 'paypal':
|
|
2999
3000
|
array.push({
|
|
3000
|
-
name: 'PayPal',
|
|
3001
|
+
name: dd.custome_name || 'PayPal',
|
|
3001
3002
|
value: 'paypal',
|
|
3002
3003
|
});
|
|
3003
3004
|
break;
|
|
3004
3005
|
case 'line_pay':
|
|
3005
3006
|
array.push({
|
|
3006
|
-
name: 'Line Pay',
|
|
3007
|
+
name: dd.custome_name || 'Line Pay',
|
|
3007
3008
|
value: 'line_pay',
|
|
3008
3009
|
});
|
|
3009
3010
|
break;
|
|
3010
3011
|
case 'jkopay':
|
|
3011
3012
|
array.push({
|
|
3012
|
-
name: '街口支付',
|
|
3013
|
+
name: dd.custome_name || '街口支付',
|
|
3013
3014
|
value: 'jkopay',
|
|
3014
3015
|
});
|
|
3015
3016
|
break;
|
|
3016
3017
|
case 'paynow':
|
|
3017
3018
|
array.push({
|
|
3018
|
-
name: 'PayNow 立吉富',
|
|
3019
|
+
name: dd.custome_name || 'PayNow 立吉富',
|
|
3019
3020
|
value: 'paynow',
|
|
3020
3021
|
});
|
|
3021
3022
|
break;
|
package/package.json
CHANGED
|
@@ -1477,6 +1477,7 @@ class Shopping {
|
|
|
1477
1477
|
return keyData[dd.key] && keyData[dd.key].toggle;
|
|
1478
1478
|
})
|
|
1479
1479
|
.filter((dd) => {
|
|
1480
|
+
dd.custome_name = keyData[dd.key].custome_name;
|
|
1480
1481
|
if (carData.orderSource === 'POS') {
|
|
1481
1482
|
if (dd.key === 'ut_credit_card') {
|
|
1482
1483
|
dd.pwd = keyData[dd.key]['pwd'];
|