ts-glitter 18.6.4 → 18.6.6
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/public-components/checkout/index.js +12 -4
- package/lowcode/public-components/checkout/index.ts +11 -4
- package/package.json +1 -1
- package/src/api-public/services/checkout.d.ts +1 -0
- package/src/api-public/services/checkout.js +7 -5
- package/src/api-public/services/checkout.js.map +1 -1
- package/src/api-public/services/checkout.ts +8 -5
- package/src/api-public/services/updated-table-checked.js +2 -1
- package/src/api-public/services/updated-table-checked.js.map +1 -1
- package/src/api-public/services/updated-table-checked.ts +2 -2
package/lowcode/Entry.js
CHANGED
|
@@ -131,7 +131,7 @@ export class Entry {
|
|
|
131
131
|
}
|
|
132
132
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
|
|
133
133
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
134
|
-
glitter.share.editerVersion = 'V_18.6.
|
|
134
|
+
glitter.share.editerVersion = 'V_18.6.5';
|
|
135
135
|
glitter.share.start = new Date();
|
|
136
136
|
const vm = { appConfig: [] };
|
|
137
137
|
window.saasConfig = {
|
package/lowcode/Entry.ts
CHANGED
|
@@ -131,7 +131,7 @@ export class Entry {
|
|
|
131
131
|
}
|
|
132
132
|
(window as any).renderClock = (window as any).renderClock ?? createClock();
|
|
133
133
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
134
|
-
glitter.share.editerVersion = 'V_18.6.
|
|
134
|
+
glitter.share.editerVersion = 'V_18.6.6';
|
|
135
135
|
glitter.share.start = new Date();
|
|
136
136
|
const vm = { appConfig: [] };
|
|
137
137
|
(window as any).saasConfig = {
|
|
@@ -3304,10 +3304,18 @@ ${log_config.content}
|
|
|
3304
3304
|
localStorage.setItem('give_away', JSON.stringify(cartData.give_away));
|
|
3305
3305
|
}
|
|
3306
3306
|
static initial(cartData) {
|
|
3307
|
-
|
|
3308
|
-
|
|
3309
|
-
|
|
3310
|
-
|
|
3307
|
+
try {
|
|
3308
|
+
cartData.customer_info = JSON.parse(localStorage.getItem('cart_customer_info') || '{}');
|
|
3309
|
+
cartData.custom_form_data = JSON.parse(localStorage.getItem('custom_form_data') || '{}');
|
|
3310
|
+
cartData.user_info = JSON.parse(localStorage.getItem('custom_user_info') || '{}');
|
|
3311
|
+
cartData.give_away = JSON.parse(localStorage.getItem('give_away') || '[]');
|
|
3312
|
+
}
|
|
3313
|
+
catch (e) {
|
|
3314
|
+
cartData.customer_info = {};
|
|
3315
|
+
cartData.custom_form_data = {};
|
|
3316
|
+
cartData.user_info = {};
|
|
3317
|
+
cartData.give_away = {};
|
|
3318
|
+
}
|
|
3311
3319
|
this.getPaymentMethod(cartData);
|
|
3312
3320
|
this.getShipmentMethod(cartData);
|
|
3313
3321
|
}
|
|
@@ -3642,10 +3642,17 @@ ${log_config.content}
|
|
|
3642
3642
|
}
|
|
3643
3643
|
|
|
3644
3644
|
public static initial(cartData: any) {
|
|
3645
|
-
|
|
3646
|
-
|
|
3647
|
-
|
|
3648
|
-
|
|
3645
|
+
try {
|
|
3646
|
+
cartData.customer_info = JSON.parse(localStorage.getItem('cart_customer_info') || '{}');
|
|
3647
|
+
cartData.custom_form_data = JSON.parse(localStorage.getItem('custom_form_data') || '{}');
|
|
3648
|
+
cartData.user_info = JSON.parse(localStorage.getItem('custom_user_info') || '{}');
|
|
3649
|
+
cartData.give_away = JSON.parse(localStorage.getItem('give_away') || '[]');
|
|
3650
|
+
}catch (e) {
|
|
3651
|
+
cartData.customer_info = {};
|
|
3652
|
+
cartData.custom_form_data = {};
|
|
3653
|
+
cartData.user_info = {};
|
|
3654
|
+
cartData.give_away = {};
|
|
3655
|
+
}
|
|
3649
3656
|
this.getPaymentMethod(cartData);
|
|
3650
3657
|
this.getShipmentMethod(cartData);
|
|
3651
3658
|
}
|
package/package.json
CHANGED
|
@@ -33,11 +33,13 @@ class CheckoutService {
|
|
|
33
33
|
update_object.shipment_date = null;
|
|
34
34
|
}
|
|
35
35
|
update_object.total = json.total;
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
if (!obj.no_shipment_number) {
|
|
37
|
+
if (json.user_info.shipment_number) {
|
|
38
|
+
update_object.shipment_number = json.user_info.shipment_number;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
update_object.shipment_number = null;
|
|
42
|
+
}
|
|
41
43
|
}
|
|
42
44
|
await database_js_1.default.query(`update \`${obj.app_name}\`.t_checkout
|
|
43
45
|
set ?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout.js","sourceRoot":"","sources":["checkout.ts"],"names":[],"mappings":";;;;;;AAAA,4EAA2C;AAE3C,MAAa,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,
|
|
1
|
+
{"version":3,"file":"checkout.js","sourceRoot":"","sources":["checkout.ts"],"names":[],"mappings":";;;;;;AAAA,4EAA2C;AAE3C,MAAa,eAAe;IACnB,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,GAAkF;;QAClI,MAAM,aAAa,GAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;QAE3B,IAAI,CAAC,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,MAAM,CAAC;QACxC,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEvC,IAAI,CAAC,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,GAAG,CAAC;QAC3C,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QAE9C,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YAC5D,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACnE,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnF,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;iBACjD,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;gBACjB,OAAO,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC,CAAC;iBACD,IAAI,EAAE;iBACN,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QAED,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QAExD,IAAI,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;YACjC,aAAa,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,aAAa,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,aAAa,CAAC,KAAK,GAAC,IAAI,CAAC,KAAK,CAAC;QAE/B,IAAG,CAAC,GAAG,CAAC,kBAAkB,EAAC,CAAC;YAC1B,IAAG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAC,CAAC;gBACjC,aAAa,CAAC,eAAe,GAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;YAC/D,CAAC;iBAAI,CAAC;gBACJ,aAAa,CAAC,eAAe,GAAC,IAAI,CAAC;YACrC,CAAC;QACH,CAAC;QAED,MAAM,qBAAE,CAAC,KAAK,CACZ,YAAY,GAAG,CAAC,QAAQ;;oBAEV,GAAG,CAAC,EAAE,EAAE,EACtB,CAAC,aAAa,CAAC,CAChB,CAAC;IACJ,CAAC;CACF;AA/CD,0CA+CC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import db from '../../modules/database.js';
|
|
2
2
|
|
|
3
3
|
export class CheckoutService {
|
|
4
|
-
public static async updateAndMigrateToTableColumn(obj: { id?: string; orderData: any; app_name: string }) {
|
|
4
|
+
public static async updateAndMigrateToTableColumn(obj: { id?: string; orderData: any; app_name: string,no_shipment_number?:boolean }) {
|
|
5
5
|
const update_object: any = {};
|
|
6
6
|
const json = obj.orderData;
|
|
7
7
|
//預設是未出貨
|
|
@@ -32,11 +32,14 @@ export class CheckoutService {
|
|
|
32
32
|
}
|
|
33
33
|
update_object.total=json.total;
|
|
34
34
|
//出貨單號碼
|
|
35
|
-
if(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
if(!obj.no_shipment_number){
|
|
36
|
+
if(json.user_info.shipment_number){
|
|
37
|
+
update_object.shipment_number=json.user_info.shipment_number;
|
|
38
|
+
}else{
|
|
39
|
+
update_object.shipment_number=null;
|
|
40
|
+
}
|
|
39
41
|
}
|
|
42
|
+
|
|
40
43
|
await db.query(
|
|
41
44
|
`update \`${obj.app_name}\`.t_checkout
|
|
42
45
|
set ?
|
|
@@ -48,7 +48,8 @@ ADD INDEX \`index5\` (\`store\` ASC) VISIBLE;`
|
|
|
48
48
|
await checkout_js_1.CheckoutService.updateAndMigrateToTableColumn({
|
|
49
49
|
id: b.id,
|
|
50
50
|
orderData: b.orderData,
|
|
51
|
-
app_name: app_name
|
|
51
|
+
app_name: app_name,
|
|
52
|
+
no_shipment_number: true
|
|
52
53
|
});
|
|
53
54
|
}
|
|
54
55
|
resolve(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAwC;AACxC,+CAAgD;AAEhD,MAAa,mBAAmB;IACrB,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,QAAgB;QAE3C,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC7B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,gBAAgB;YAC5B,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,iBAAiB,QAAQ;;8CAEE;SACrC,CAAC,CAAA;QAGF,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC7B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,iBAAiB,QAAQ,sBAAsB;gBACpD,mEAAmE;gBACnE,0EAA0E;gBAC1E,mFAAmF;gBACnF,sFAAsF;gBACtF,kFAAkF;gBAClF,8EAA8E;gBAC9E,6CAA6C;gBAC7C,oDAAoD;gBACpD,sDAAsD;gBACtD,uDAAuD;gBACvD,qDAAqD;gBACrD,iDAAiD;gBACjD,KAAK;SACV,CAAC,CAAA;QAEF,MAAM,mBAAmB,CAAC,MAAM,CAAC;YAC7B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,CAAC,MAAM,EAAC,MAAM,CAAC;YAC7B,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,GAAE,EAAE;gBACP,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;oBACzC,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,kBAAE,CAAC,KAAK,CAAC,mBAAmB,QAAQ,eAAe,EAAC,EAAE,CAAC,CAAC,EAAC,CAAC;wBAE7E,MAAM,6BAAe,CAAC,6BAA6B,CAAC;4BAChD,EAAE,EAAC,CAAC,CAAC,EAAE;4BACP,SAAS,EAAC,CAAC,CAAC,SAAS;4BACrB,QAAQ,EAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,8 @@ ADD INDEX \`index5\` (\`store\` ASC) VISIBLE;`
|
|
|
48
48
|
await CheckoutService.updateAndMigrateToTableColumn({
|
|
49
49
|
id:b.id,
|
|
50
50
|
orderData:b.orderData,
|
|
51
|
-
app_name:app_name
|
|
51
|
+
app_name:app_name,
|
|
52
|
+
no_shipment_number:true
|
|
52
53
|
})
|
|
53
54
|
}
|
|
54
55
|
resolve(true);
|
|
@@ -74,7 +75,6 @@ ADD INDEX \`index11\` (\`shipment_number\` ASC) VISIBLE;`
|
|
|
74
75
|
event: ()=>{
|
|
75
76
|
return new Promise(async (resolve, reject) => {
|
|
76
77
|
for (const b of (await db.query(`select * from \`${app_name}\`.t_checkout`,[]))){
|
|
77
|
-
|
|
78
78
|
await CheckoutService.updateAndMigrateToTableColumn({
|
|
79
79
|
id:b.id,
|
|
80
80
|
orderData:b.orderData,
|