ts-glitter 21.0.4 → 21.0.5
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/backend-manager/bg-blog.js +22 -37
- package/lowcode/backend-manager/bg-blog.ts +45 -34
- package/lowcode/backend-manager/bg-list-component.js +2 -2
- package/lowcode/backend-manager/bg-list-component.ts +2 -2
- package/lowcode/backend-manager/bg-widget.js +21 -0
- package/lowcode/backend-manager/bg-widget.ts +21 -0
- package/lowcode/cms-plugin/filter-options.js +3 -3
- package/lowcode/cms-plugin/filter-options.ts +1 -1
- package/lowcode/cms-plugin/shopping-finance-setting.js +251 -6
- package/lowcode/cms-plugin/shopping-finance-setting.ts +291 -6
- package/lowcode/cms-plugin/shopping-order-manager.js +56 -46
- package/lowcode/cms-plugin/shopping-order-manager.ts +59 -47
- package/lowcode/cms-plugin/shopping-product-setting.js +10 -5
- package/lowcode/cms-plugin/shopping-product-setting.ts +14 -6
- package/lowcode/cms-plugin/shopping-setting-advance.js +21 -72
- package/lowcode/cms-plugin/shopping-setting-advance.ts +31 -98
- package/lowcode/css/editor.css +48 -16
- package/lowcode/css/front-end.css +16 -17
- package/lowcode/glitter-base/global/language.js +2 -0
- package/lowcode/glitter-base/global/language.ts +3 -0
- package/lowcode/glitter-base/global/shipment-config.js +4 -4
- package/lowcode/glitter-base/global/shipment-config.ts +1 -1
- package/lowcode/glitter-base/route/shopping.js +11 -0
- package/lowcode/glitter-base/route/shopping.ts +12 -0
- package/lowcode/official_view_component/form-widget/input-custom.js +0 -1
- package/lowcode/official_view_component/form-widget/input-custom.ts +0 -1
- package/lowcode/public-components/checkout/index.js +578 -780
- package/lowcode/public-components/checkout/index.ts +2457 -2652
- package/lowcode/public-components/headers/header-class.js +252 -324
- package/lowcode/public-components/headers/header-class.ts +389 -480
- package/lowcode/public-components/modules/cart-module.js +433 -0
- package/lowcode/public-components/modules/cart-module.ts +491 -0
- package/lowcode/public-components/modules/product-module.js +45 -0
- package/lowcode/public-components/modules/product-module.ts +58 -0
- package/lowcode/public-components/product/product-detail.js +178 -184
- package/lowcode/public-components/product/product-detail.ts +564 -579
- package/lowcode/public-components/user-manager/um-order.js +162 -32
- package/lowcode/public-components/user-manager/um-order.ts +181 -46
- package/lowcode/public-models/product.ts +1 -0
- package/package.json +1 -1
- package/src/Language.js +1 -0
- package/src/Language.js.map +1 -1
- package/src/Language.ts +3 -0
- package/src/api-public/controllers/article.js +33 -29
- package/src/api-public/controllers/article.js.map +1 -1
- package/src/api-public/controllers/article.ts +152 -146
- package/src/api-public/controllers/index.js +2 -0
- package/src/api-public/controllers/index.js.map +1 -1
- package/src/api-public/controllers/index.ts +2 -0
- package/src/api-public/controllers/shop.js +125 -47
- package/src/api-public/controllers/shop.js.map +1 -1
- package/src/api-public/controllers/shop.ts +148 -61
- package/src/api-public/controllers/user.js +51 -52
- package/src/api-public/controllers/user.js.map +1 -1
- package/src/api-public/controllers/user.ts +63 -52
- package/src/api-public/models/glitter-finance.js +2 -1
- package/src/api-public/models/glitter-finance.js.map +5 -1
- package/src/api-public/services/checkout-event.d.ts +1 -0
- package/src/api-public/services/checkout-event.js +18 -10
- package/src/api-public/services/checkout-event.js.map +1 -1
- package/src/api-public/services/checkout-event.ts +18 -7
- package/src/api-public/services/factories/payment-strategy-factory.d.ts +6 -0
- package/src/api-public/services/factories/payment-strategy-factory.js +49 -0
- package/src/api-public/services/factories/payment-strategy-factory.js.map +1 -0
- package/src/api-public/services/factories/payment-strategy-factory.ts +71 -0
- package/src/api-public/services/fb-service.js +4 -4
- package/src/api-public/services/fb-service.js.map +1 -1
- package/src/api-public/services/financial-service.d.ts +2 -1
- package/src/api-public/services/financial-service.js +48 -53
- package/src/api-public/services/financial-service.js.map +1 -1
- package/src/api-public/services/financial-service.ts +29 -38
- package/src/api-public/services/financial-serviceV2.d.ts +298 -0
- package/src/api-public/services/financial-serviceV2.js +1158 -0
- package/src/api-public/services/financial-serviceV2.js.map +1 -0
- package/src/api-public/services/financial-serviceV2.ts +1518 -0
- package/src/api-public/services/interface/payment-keys-interface.d.ts +37 -0
- package/src/api-public/services/interface/payment-keys-interface.js +3 -0
- package/src/api-public/services/interface/payment-keys-interface.js.map +1 -0
- package/src/api-public/services/interface/payment-keys-interface.ts +46 -0
- package/src/api-public/services/interface/payment-strategy-interface.d.ts +17 -0
- package/src/api-public/services/interface/payment-strategy-interface.js +3 -0
- package/src/api-public/services/interface/payment-strategy-interface.js.map +1 -0
- package/src/api-public/services/interface/payment-strategy-interface.ts +48 -0
- package/src/api-public/services/migrate-event/public-user-config.d.ts +5 -0
- package/src/api-public/services/migrate-event/public-user-config.js +81 -0
- package/src/api-public/services/migrate-event/public-user-config.js.map +1 -0
- package/src/api-public/services/migrate-event/public-user-config.ts +106 -0
- package/src/api-public/services/model/handlePaymentTransaction.js +0 -68
- package/src/api-public/services/model/handlePaymentTransaction.js.map +1 -1
- package/src/api-public/services/model/handlePaymentTransaction.ts +62 -54
- package/src/api-public/services/monitor.d.ts +1 -0
- package/src/api-public/services/payment-service.d.ts +12 -0
- package/src/api-public/services/payment-service.js +83 -0
- package/src/api-public/services/payment-service.js.map +1 -0
- package/src/api-public/services/payment-service.ts +112 -0
- package/src/api-public/services/shopping.d.ts +2 -1
- package/src/api-public/services/shopping.js +60 -23
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +88 -16
- package/src/api-public/services/strategies/ecpay-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/ecpay-strategy.js +26 -0
- package/src/api-public/services/strategies/ecpay-strategy.js.map +1 -0
- package/src/api-public/services/strategies/ecpay-strategy.ts +30 -0
- package/src/api-public/services/strategies/ezpay-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/ezpay-strategy.js +26 -0
- package/src/api-public/services/strategies/ezpay-strategy.js.map +1 -0
- package/src/api-public/services/strategies/ezpay-strategy.ts +31 -0
- package/src/api-public/services/strategies/jkopay-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/jkopay-strategy.js +32 -0
- package/src/api-public/services/strategies/jkopay-strategy.js.map +1 -0
- package/src/api-public/services/strategies/jkopay-strategy.ts +36 -0
- package/src/api-public/services/strategies/linepay-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/linepay-strategy.js +32 -0
- package/src/api-public/services/strategies/linepay-strategy.js.map +1 -0
- package/src/api-public/services/strategies/linepay-strategy.ts +35 -0
- package/src/api-public/services/strategies/paynow-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/paynow-strategy.js +26 -0
- package/src/api-public/services/strategies/paynow-strategy.js.map +1 -0
- package/src/api-public/services/strategies/paynow-strategy.ts +29 -0
- package/src/api-public/services/strategies/paypal-strategy.d.ts +8 -0
- package/src/api-public/services/strategies/paypal-strategy.js +28 -0
- package/src/api-public/services/strategies/paypal-strategy.js.map +1 -0
- package/src/api-public/services/strategies/paypal-strategy.ts +31 -0
- package/src/api-public/services/updated-table-checked.d.ts +1 -0
- package/src/api-public/services/updated-table-checked.js +37 -15
- package/src/api-public/services/updated-table-checked.js.map +1 -1
- package/src/api-public/services/updated-table-checked.ts +56 -36
- package/src/api-public/utils/ut-permission.d.ts +1 -0
- package/src/app-project/serverless/src/index.js +17 -7
- package/src/app-project/serverless/src/index.js.map +1 -1
- package/src/app-project/serverless/src/modules/CryptoJS.js +17 -7
- package/src/app-project/serverless/src/modules/CryptoJS.js.map +1 -1
- package/src/app-project/serverless/src/modules/ssh.js +17 -7
- package/src/app-project/serverless/src/modules/ssh.js.map +1 -1
- package/src/config.d.ts +1 -1
- package/src/modules/AWSLib.js +3 -2
- package/src/modules/AWSLib.js.map +1 -1
- package/src/modules/CryptoJS.js +17 -7
- package/src/modules/CryptoJS.js.map +1 -1
- package/src/modules/database.d.ts +1 -1
- package/src/modules/redis.d.ts +1 -1
- package/src/modules/ssh.js +17 -7
- package/src/modules/ssh.js.map +1 -1
- package/src/modules/tool.d.ts +4 -4
- package/src/modules/tool.js +2 -1
- package/src/modules/tool.js.map +1 -1
- package/src/run.js +2 -1
- package/src/run.js.map +1 -1
- package/src/services/create-instance.js +4 -3
- package/src/services/create-instance.js.map +1 -1
- package/src/services/saas-table-check.js +2 -2
- package/src/services/saas-table-check.js.map +5 -1
- package/src/services/tool.js +3 -2
- package/src/services/tool.js.map +1 -1
- package/vp00rqhw1r.json +1 -0
- package/src/api-public/services/product-migrate.d.ts +0 -8
- package/src/api-public/services/product-migrate.js.map +0 -1
|
@@ -12,6 +12,7 @@ import { ApiCart } from '../../glitter-base/route/api-cart.js';
|
|
|
12
12
|
import { Language } from '../../glitter-base/global/language.js';
|
|
13
13
|
import { Currency } from '../../glitter-base/global/currency.js';
|
|
14
14
|
import { PdClass } from '../product/pd-class.js';
|
|
15
|
+
import { CartModule } from '../modules/cart-module.js';
|
|
15
16
|
const html = String.raw;
|
|
16
17
|
export class HeaderClass {
|
|
17
18
|
static hideShopperBtn() {
|
|
@@ -35,25 +36,19 @@ export class HeaderClass {
|
|
|
35
36
|
visible: ((_l = obj === null || obj === void 0 ? void 0 : obj.text) === null || _l === void 0 ? void 0 : _l.visible) === false ? false : true,
|
|
36
37
|
fontSize: (_o = (_m = obj === null || obj === void 0 ? void 0 : obj.text) === null || _m === void 0 ? void 0 : _m.fontSize) !== null && _o !== void 0 ? _o : 16,
|
|
37
38
|
};
|
|
38
|
-
return html `
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return new Promise((resolve) => {
|
|
52
|
-
const img = new Image();
|
|
53
|
-
img.onload = () => resolve(true);
|
|
54
|
-
img.onerror = () => resolve(false);
|
|
55
|
-
img.src = url;
|
|
56
|
-
});
|
|
39
|
+
return html ` <div
|
|
40
|
+
class="d-flex align-items-center justify-content-center flex-column w-100 mx-auto ${container.class}"
|
|
41
|
+
style="${container.style}"
|
|
42
|
+
>
|
|
43
|
+
<div
|
|
44
|
+
class="spinner-border ${circleAttr.visible ? '' : 'd-none'}"
|
|
45
|
+
style="font-size: ${circleAttr.borderSize}px; width: ${circleAttr.width}px; height: ${circleAttr.width}px;"
|
|
46
|
+
role="status"
|
|
47
|
+
></div>
|
|
48
|
+
<span class="mt-3 ${textAttr.visible ? '' : 'd-none'}" style="font-size: ${textAttr.fontSize}px;"
|
|
49
|
+
>${textAttr.value}</span
|
|
50
|
+
>
|
|
51
|
+
</div>`;
|
|
57
52
|
}
|
|
58
53
|
static rightCartMenu(gvc, widget) {
|
|
59
54
|
gvc.glitter.setDrawer(gvc.bindView((() => {
|
|
@@ -61,97 +56,98 @@ export class HeaderClass {
|
|
|
61
56
|
const vm = {
|
|
62
57
|
id: gvc.glitter.getUUID(),
|
|
63
58
|
imageId: gvc.glitter.getUUID(),
|
|
64
|
-
shippings: [],
|
|
65
59
|
dataList: [],
|
|
60
|
+
shippings: [],
|
|
66
61
|
loading: true,
|
|
67
62
|
};
|
|
68
63
|
const classPrefix = `header-checkout`;
|
|
69
64
|
gvc.addStyle(`
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
65
|
+
.${classPrefix}-wh {
|
|
66
|
+
display: flex;
|
|
67
|
+
min-width: 70px;
|
|
68
|
+
min-height: 70px;
|
|
69
|
+
max-width: 70px;
|
|
70
|
+
max-height: 70px;
|
|
71
|
+
width: 100%;
|
|
72
|
+
height: 100%;
|
|
73
|
+
object-fit: cover;
|
|
74
|
+
object-position: center;
|
|
75
|
+
}
|
|
81
76
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
77
|
+
.${classPrefix}-select {
|
|
78
|
+
display: flex;
|
|
79
|
+
padding: 7px 30px 7px 18px;
|
|
80
|
+
max-height: 40px;
|
|
81
|
+
align-items: center;
|
|
82
|
+
gap: 6px;
|
|
83
|
+
border-radius: 10px;
|
|
84
|
+
border: 1px solid #ddd;
|
|
85
|
+
background: transparent
|
|
86
|
+
url('https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1718100926212-Vector 89.png') no-repeat;
|
|
87
|
+
background-position-x: calc(100% - 12px);
|
|
88
|
+
background-position-y: 16px;
|
|
89
|
+
appearance: none;
|
|
90
|
+
-webkit-appearance: none;
|
|
91
|
+
-moz-appearance: none;
|
|
92
|
+
color: #393939;
|
|
93
|
+
}
|
|
98
94
|
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
.${classPrefix}-select:focus {
|
|
96
|
+
outline: 0;
|
|
97
|
+
}
|
|
102
98
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
99
|
+
.${classPrefix}-cart-container {
|
|
100
|
+
display: flex;
|
|
101
|
+
width: 100%;
|
|
102
|
+
align-items: center;
|
|
103
|
+
padding: 0;
|
|
104
|
+
margin-bottom: 18px;
|
|
105
|
+
padding: 12px;
|
|
106
|
+
border-bottom: 1px solid #dddddd;
|
|
107
|
+
}
|
|
112
108
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
109
|
+
.${classPrefix}-cart-title {
|
|
110
|
+
letter-spacing: 4px;
|
|
111
|
+
font-size: 22px;
|
|
112
|
+
font-weight: 700;
|
|
113
|
+
}
|
|
118
114
|
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
115
|
+
.${classPrefix}-shipping-title {
|
|
116
|
+
font-size: 18px;
|
|
117
|
+
font-weight: 600;
|
|
118
|
+
}
|
|
123
119
|
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
120
|
+
.${classPrefix}-title {
|
|
121
|
+
font-size: 16px;
|
|
122
|
+
}
|
|
127
123
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
124
|
+
.${classPrefix}-spec {
|
|
125
|
+
font-size: 14px;
|
|
126
|
+
color: #8d8d8d;
|
|
127
|
+
}
|
|
132
128
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
129
|
+
.${classPrefix}-card {
|
|
130
|
+
border-radius: 10px;
|
|
131
|
+
padding: 20px 8px;
|
|
132
|
+
background: #fff;
|
|
133
|
+
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.12);
|
|
134
|
+
margin: 0 12px;
|
|
135
|
+
}
|
|
140
136
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
137
|
+
.${classPrefix}-button {
|
|
138
|
+
display: flex;
|
|
139
|
+
padding: 6px 14px;
|
|
140
|
+
max-height: 30px;
|
|
141
|
+
justify-content: center;
|
|
142
|
+
align-items: center;
|
|
143
|
+
gap: 8px;
|
|
144
|
+
border: 1px solid ${(_a = widget.formData.theme_color['solid-button-text']) !== null && _a !== void 0 ? _a : '#fff'};
|
|
145
|
+
border-radius: 10px;
|
|
146
|
+
background: ${(_b = widget.formData.theme_color['solid-button-bg']) !== null && _b !== void 0 ? _b : '#000'};
|
|
147
|
+
cursor: pointer;
|
|
148
|
+
color: ${(_c = widget.formData.theme_color['solid-button-text']) !== null && _c !== void 0 ? _c : '#fff'};
|
|
149
|
+
}
|
|
150
|
+
`);
|
|
155
151
|
function refreshView() {
|
|
156
152
|
setTimeout(() => {
|
|
157
153
|
vm.loading = true;
|
|
@@ -161,214 +157,170 @@ export class HeaderClass {
|
|
|
161
157
|
}, 200);
|
|
162
158
|
}
|
|
163
159
|
function goToCheckoutButton(id) {
|
|
164
|
-
return html `
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
onclick="${gvc.event(() => {
|
|
160
|
+
return html ` <button
|
|
161
|
+
class="${classPrefix}-button"
|
|
162
|
+
type="button"
|
|
163
|
+
onclick="${gvc.event(() => {
|
|
169
164
|
window.drawer.close();
|
|
170
165
|
ApiCart.toCheckOutPage(id);
|
|
171
166
|
})}"
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
167
|
+
>
|
|
168
|
+
${Language.text('proceed_to_checkout')}
|
|
169
|
+
</button>`;
|
|
175
170
|
}
|
|
176
171
|
return {
|
|
177
172
|
bind: vm.id,
|
|
178
173
|
view: () => {
|
|
179
174
|
try {
|
|
180
175
|
if (vm.loading) {
|
|
181
|
-
return html `
|
|
182
|
-
<div class="w-100 vh-100 bg-white">${this.spinner()}</div>`;
|
|
176
|
+
return html ` <div class="w-100 vh-100 bg-white">${this.spinner()}</div>`;
|
|
183
177
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
.
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
style="width: 10%">
|
|
260
|
-
<i
|
|
261
|
-
class="fa-solid fa-xmark-large"
|
|
262
|
-
style="cursor: pointer;"
|
|
263
|
-
onclick="${gvc.event(() => {
|
|
264
|
-
new ApiCart().setCart((cartItem) => {
|
|
265
|
-
cartItem.line_items = cartItem.line_items.filter((dd) => {
|
|
266
|
-
return !(dd.id === item.id && item.spec.join('') === dd.spec.join(''));
|
|
267
|
-
});
|
|
268
|
-
refreshView();
|
|
269
|
-
});
|
|
270
|
-
})}"
|
|
271
|
-
></i>
|
|
272
|
-
</div>
|
|
273
|
-
<div class="d-flex"
|
|
274
|
-
style="">
|
|
275
|
-
<img src="${item.image}"
|
|
276
|
-
class="${classPrefix}-wh rounded-3"/>
|
|
277
|
-
</div>
|
|
278
|
-
<div class="d-flex flex-column gap-1 flex-fill">
|
|
279
|
-
<div class="${classPrefix}-title pe-3"
|
|
280
|
-
style="">
|
|
281
|
-
${item.title}
|
|
282
|
-
</div>
|
|
283
|
-
<div class="${classPrefix}-spec ">
|
|
284
|
-
${(() => {
|
|
285
|
-
const spec = (() => {
|
|
286
|
-
if (item.spec) {
|
|
287
|
-
return item.spec.map((dd, index) => {
|
|
288
|
-
try {
|
|
289
|
-
return (item.specs[index].option.find((d1) => {
|
|
290
|
-
return d1.title === dd;
|
|
291
|
-
}).language_title[Language.getLanguage()] || dd);
|
|
292
|
-
}
|
|
293
|
-
catch (e) {
|
|
294
|
-
return dd;
|
|
295
|
-
}
|
|
296
|
-
});
|
|
178
|
+
return html ` <div class="" style="position: relative;">
|
|
179
|
+
<div class="${classPrefix}-cart-container align-items-center">
|
|
180
|
+
<div
|
|
181
|
+
class="d-flex align-items-center justify-content-center fs-5 py-3 px-2"
|
|
182
|
+
style="cursor:pointer;"
|
|
183
|
+
onclick="${gvc.event(() => {
|
|
184
|
+
gvc.glitter.closeDrawer();
|
|
185
|
+
})}"
|
|
186
|
+
>
|
|
187
|
+
<i class="fa-sharp fa-solid fa-angle-left"></i>
|
|
188
|
+
</div>
|
|
189
|
+
<div class="${classPrefix}-cart-title">${Language.text('cart')}</div>
|
|
190
|
+
<div class="flex-fill"></div>
|
|
191
|
+
${goToCheckoutButton(ApiCart.globalCart)}
|
|
192
|
+
</div>
|
|
193
|
+
${(() => {
|
|
194
|
+
if (vm.dataList.length === 0) {
|
|
195
|
+
return html ` <div class="container d-flex align-items-center justify-content-center flex-column">
|
|
196
|
+
<lottie-player
|
|
197
|
+
style="max-width: 100%; width: 300px; height: 300px;"
|
|
198
|
+
src="https://lottie.host/38ba8340-3414-41b8-b068-bba18d240bb3/h7e1Q29IQJ.json"
|
|
199
|
+
speed="1"
|
|
200
|
+
loop=""
|
|
201
|
+
autoplay=""
|
|
202
|
+
background="transparent"
|
|
203
|
+
></lottie-player>
|
|
204
|
+
<div class="mt-3 fw-bold">${Language.text('empty_cart_message')}</div>
|
|
205
|
+
</div>`;
|
|
206
|
+
}
|
|
207
|
+
else {
|
|
208
|
+
return vm.dataList
|
|
209
|
+
.map(item => {
|
|
210
|
+
return html ` <div class="d-flex align-items-center px-3 position-relative" style="gap: 12px;">
|
|
211
|
+
<div
|
|
212
|
+
class="position-absolute"
|
|
213
|
+
style="right:13px;top:0px;cursor:pointer;"
|
|
214
|
+
onclick="${gvc.event(() => {
|
|
215
|
+
new ApiCart().setCart(cartItem => {
|
|
216
|
+
cartItem.line_items = cartItem.line_items.filter(dd => {
|
|
217
|
+
return !(dd.id === item.id && item.spec.join('') === dd.spec.join(''));
|
|
218
|
+
});
|
|
219
|
+
refreshView();
|
|
220
|
+
});
|
|
221
|
+
})}"
|
|
222
|
+
>
|
|
223
|
+
<i class="fa-regular fa-trash-can"></i>
|
|
224
|
+
</div>
|
|
225
|
+
<div class="d-none" style="width: 10%">
|
|
226
|
+
<i
|
|
227
|
+
class="fa-solid fa-xmark-large"
|
|
228
|
+
style="cursor: pointer;"
|
|
229
|
+
onclick="${gvc.event(() => {
|
|
230
|
+
new ApiCart().setCart(cartItem => {
|
|
231
|
+
cartItem.line_items = cartItem.line_items.filter(dd => {
|
|
232
|
+
return !(dd.id === item.id && item.spec.join('') === dd.spec.join(''));
|
|
233
|
+
});
|
|
234
|
+
refreshView();
|
|
235
|
+
});
|
|
236
|
+
})}"
|
|
237
|
+
></i>
|
|
238
|
+
</div>
|
|
239
|
+
<div class="d-flex" style="">
|
|
240
|
+
<img src="${item.image}" class="${classPrefix}-wh rounded-3" />
|
|
241
|
+
</div>
|
|
242
|
+
<div class="d-flex flex-column gap-1 flex-fill">
|
|
243
|
+
<div class="${classPrefix}-title pe-3" style="">${item.title}</div>
|
|
244
|
+
<div class="${classPrefix}-spec ">
|
|
245
|
+
${(() => {
|
|
246
|
+
const spec = (() => {
|
|
247
|
+
if (item.spec) {
|
|
248
|
+
return item.spec.map((dd, index) => {
|
|
249
|
+
try {
|
|
250
|
+
return (item.specs[index].option.find((d1) => {
|
|
251
|
+
return d1.title === dd;
|
|
252
|
+
}).language_title[Language.getLanguage()] || dd);
|
|
297
253
|
}
|
|
298
|
-
|
|
299
|
-
return
|
|
254
|
+
catch (e) {
|
|
255
|
+
return dd;
|
|
300
256
|
}
|
|
301
|
-
})();
|
|
302
|
-
return spec.join(' / ');
|
|
303
|
-
})()}
|
|
304
|
-
</div>
|
|
305
|
-
<div class="d-flex align-items-center justify-content-between">
|
|
306
|
-
<div class="d-flex align-items-center gap-1"
|
|
307
|
-
style="font-size:14px;">
|
|
308
|
-
${Language.text('quantity')}
|
|
309
|
-
:<select
|
|
310
|
-
class="${classPrefix}-select"
|
|
311
|
-
style="width: 100px;"
|
|
312
|
-
onchange="${gvc.event((e) => {
|
|
313
|
-
new ApiCart().setCart((cartItem) => {
|
|
314
|
-
cartItem.line_items.find((dd) => {
|
|
315
|
-
return `${dd.id}` === `${item.id}` && item.spec.join('') === dd.spec.join('');
|
|
316
|
-
}).count = parseInt(e.value, 10);
|
|
317
|
-
refreshView();
|
|
318
257
|
});
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
258
|
+
}
|
|
259
|
+
else {
|
|
260
|
+
return [];
|
|
261
|
+
}
|
|
262
|
+
})();
|
|
263
|
+
return spec.join(' / ');
|
|
264
|
+
})()}
|
|
265
|
+
</div>
|
|
266
|
+
<div class="d-flex align-items-center justify-content-between">
|
|
267
|
+
<div class="d-flex align-items-center gap-1" style="font-size:14px;">
|
|
268
|
+
${Language.text('quantity')} :<select
|
|
269
|
+
class="${classPrefix}-select"
|
|
270
|
+
style="width: 100px;"
|
|
271
|
+
onchange="${gvc.event(e => {
|
|
272
|
+
new ApiCart().setCart(cartItem => {
|
|
273
|
+
cartItem.line_items.find(dd => {
|
|
274
|
+
return `${dd.id}` === `${item.id}` && item.spec.join('') === dd.spec.join('');
|
|
275
|
+
}).count = parseInt(e.value, 10);
|
|
276
|
+
refreshView();
|
|
277
|
+
});
|
|
278
|
+
})}"
|
|
279
|
+
>
|
|
280
|
+
${[...new Array(99)]
|
|
281
|
+
.map((_, index) => {
|
|
282
|
+
return html ` <option
|
|
283
|
+
value="${index + 1}"
|
|
284
|
+
${index + 1 === item.count ? `selected` : ``}
|
|
285
|
+
>
|
|
286
|
+
${index + 1}
|
|
287
|
+
</option>`;
|
|
341
288
|
})
|
|
342
|
-
.join(
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
289
|
+
.join('')}
|
|
290
|
+
</select>
|
|
291
|
+
</div>
|
|
292
|
+
${Currency.convertCurrencyText(item.price * item.count)}
|
|
293
|
+
</div>
|
|
294
|
+
</div>
|
|
295
|
+
</div>`;
|
|
296
|
+
})
|
|
297
|
+
.join(html ` <div class="w-100 border-top my-3"></div>`);
|
|
298
|
+
}
|
|
299
|
+
})()}
|
|
300
|
+
</div>`;
|
|
348
301
|
}
|
|
349
302
|
catch (e) {
|
|
350
303
|
console.error(e);
|
|
351
304
|
return `${e}`;
|
|
352
305
|
}
|
|
353
306
|
},
|
|
354
|
-
divCreate: {},
|
|
355
307
|
onCreate: () => {
|
|
356
308
|
if (vm.loading) {
|
|
357
309
|
const cart = new ApiCart().cart;
|
|
358
310
|
Promise.all([
|
|
359
|
-
new Promise(
|
|
360
|
-
ApiShop.getShippingMethod().then(
|
|
311
|
+
new Promise(resolve => {
|
|
312
|
+
ApiShop.getShippingMethod().then(d => {
|
|
361
313
|
resolve(d);
|
|
362
314
|
});
|
|
363
315
|
}),
|
|
364
|
-
new Promise(
|
|
316
|
+
new Promise(resolve => {
|
|
365
317
|
ApiShop.getProduct({
|
|
366
318
|
page: 0,
|
|
367
319
|
limit: 10000,
|
|
368
320
|
status: 'inRange',
|
|
369
321
|
show_hidden: true,
|
|
370
|
-
id_list: [...new Set(cart.line_items.map(
|
|
371
|
-
}).then(
|
|
322
|
+
id_list: [...new Set(cart.line_items.map(item => item.id))].join(','),
|
|
323
|
+
}).then(d => {
|
|
372
324
|
resolve(d);
|
|
373
325
|
});
|
|
374
326
|
}),
|
|
@@ -378,61 +330,38 @@ export class HeaderClass {
|
|
|
378
330
|
if (shippings.result && shippings.response) {
|
|
379
331
|
vm.shippings = shippings.response;
|
|
380
332
|
}
|
|
381
|
-
vm.dataList = [
|
|
382
|
-
...vm.shippings.map((item) => {
|
|
383
|
-
return {
|
|
384
|
-
logistic: item.value,
|
|
385
|
-
cart: [],
|
|
386
|
-
};
|
|
387
|
-
}),
|
|
388
|
-
];
|
|
389
|
-
console.log(`vm.shippings=>`, vm.shippings);
|
|
390
|
-
console.log(`vm.dataList=>`, vm.dataList);
|
|
391
333
|
const data = dataArray[1];
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
if (
|
|
409
|
-
|
|
410
|
-
return product.content.preview_image[0];
|
|
411
|
-
}
|
|
412
|
-
return this.noImageURL;
|
|
334
|
+
const products = data.response.data;
|
|
335
|
+
for (const item of cart.line_items) {
|
|
336
|
+
const product = products.find((p) => `${p.id}` === `${item.id}`);
|
|
337
|
+
if (product) {
|
|
338
|
+
const variant = PdClass.getVariant(product.content, {
|
|
339
|
+
specs: item.spec,
|
|
340
|
+
});
|
|
341
|
+
const lineItem = {
|
|
342
|
+
id: item.id,
|
|
343
|
+
title: product.content.title,
|
|
344
|
+
count: item.count,
|
|
345
|
+
spec: item.spec,
|
|
346
|
+
specs: product.content.specs,
|
|
347
|
+
price: variant ? variant.sale_price : 0,
|
|
348
|
+
image: yield (() => __awaiter(this, void 0, void 0, function* () {
|
|
349
|
+
if (!variant) {
|
|
350
|
+
if (product.content && product.content.preview_image) {
|
|
351
|
+
return product.content.preview_image[0];
|
|
413
352
|
}
|
|
414
|
-
|
|
415
|
-
return isValid ? variant.preview_image : product.content.preview_image[0] || this.noImageURL;
|
|
416
|
-
});
|
|
417
|
-
return img;
|
|
418
|
-
}))(),
|
|
419
|
-
};
|
|
420
|
-
const logistics = product.content.designated_logistics;
|
|
421
|
-
for (const data of vm.dataList) {
|
|
422
|
-
if (!logistics || logistics.type === 'all' || logistics.list.includes(data.logistic)) {
|
|
423
|
-
data.cart.push(lineItem);
|
|
353
|
+
return CartModule.noImageURL;
|
|
424
354
|
}
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
vm.dataList
|
|
355
|
+
const img = yield CartModule.isImageUrlValid(variant.preview_image).then(isValid => {
|
|
356
|
+
return isValid
|
|
357
|
+
? variant.preview_image
|
|
358
|
+
: product.content.preview_image[0] || CartModule.noImageURL;
|
|
359
|
+
});
|
|
360
|
+
return img;
|
|
361
|
+
}))(),
|
|
362
|
+
};
|
|
363
|
+
vm.dataList.push(lineItem);
|
|
434
364
|
}
|
|
435
|
-
console.log(`vm.dataList ==>`, vm.dataList);
|
|
436
365
|
}
|
|
437
366
|
}))
|
|
438
367
|
.then(() => {
|
|
@@ -456,4 +385,3 @@ export class HeaderClass {
|
|
|
456
385
|
});
|
|
457
386
|
}
|
|
458
387
|
}
|
|
459
|
-
HeaderClass.noImageURL = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
|