ts-glitter 22.0.1 → 22.0.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 +2 -2
- package/lowcode/backend-manager/bg-blog.js +19 -5
- package/lowcode/backend-manager/bg-blog.ts +20 -5
- package/lowcode/backend-manager/bg-line.js +2 -2
- package/lowcode/backend-manager/bg-line.ts +2 -2
- package/lowcode/backend-manager/bg-notify.js +10 -3
- package/lowcode/backend-manager/bg-notify.ts +10 -3
- package/lowcode/backend-manager/bg-sns.js +3 -3
- package/lowcode/backend-manager/bg-sns.ts +3 -3
- package/lowcode/backend-manager/bg-widget.js +77 -75
- package/lowcode/backend-manager/bg-widget.ts +121 -97
- package/lowcode/cms-plugin/auto-fcm-advertise.js +2 -2
- package/lowcode/cms-plugin/auto-fcm-advertise.ts +2 -2
- package/lowcode/cms-plugin/auto-fcm-history.js +2 -2
- package/lowcode/cms-plugin/auto-fcm-history.ts +2 -2
- package/lowcode/cms-plugin/menus-setting.js +2 -2
- package/lowcode/cms-plugin/menus-setting.ts +2 -4
- package/lowcode/cms-plugin/pos-pages/payment-page.js +11 -7
- package/lowcode/cms-plugin/pos-pages/payment-page.ts +17 -11
- package/lowcode/cms-plugin/shopping-discount-setting.js +1 -1
- package/lowcode/cms-plugin/shopping-discount-setting.ts +1 -1
- package/lowcode/cms-plugin/shopping-finance-setting.js +23 -10
- package/lowcode/cms-plugin/shopping-finance-setting.ts +282 -269
- package/lowcode/cms-plugin/shopping-order-manager.js +1 -1
- package/lowcode/cms-plugin/shopping-order-manager.ts +1 -1
- package/lowcode/cms-plugin/shopping-rebate.js +1 -1
- package/lowcode/cms-plugin/shopping-rebate.ts +1 -1
- package/lowcode/cms-plugin/shopping-setting-basic.js +36 -8
- package/lowcode/cms-plugin/shopping-setting-basic.ts +36 -8
- package/lowcode/glitter-base/route/shopping.js +16 -9
- package/lowcode/glitter-base/route/shopping.ts +16 -10
- package/lowcode/glitter-base/route/user.js +19 -9
- package/lowcode/glitter-base/route/user.ts +21 -10
- package/lowcode/glitterBundle/plugins/editor-elem.js +1 -5
- package/lowcode/glitterBundle/plugins/editor-elem.ts +1 -5
- package/package.json +1 -1
- package/src/api-public/services/checkout-event.js +17 -7
- package/src/api-public/services/checkout-event.js.map +1 -1
- package/src/api-public/services/line-message.js +122 -138
- package/src/api-public/services/line-message.js.map +1 -1
- package/src/api-public/services/line-message.ts +1134 -1130
- package/src/api-public/services/shopping.js +3 -5
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +4 -6
- package/src/api-public/services/strategies/ecpay-strategy.js +0 -1
- package/src/api-public/services/strategies/ecpay-strategy.js.map +1 -1
- package/src/api-public/services/strategies/ecpay-strategy.ts +3 -4
- package/src/api-public/services/strategies/ezpay-strategy.js +0 -1
- package/src/api-public/services/strategies/ezpay-strategy.js.map +1 -1
- package/src/api-public/services/strategies/ezpay-strategy.ts +4 -7
- package/src/modules/firebase.js +0 -4
- package/src/modules/firebase.js.map +1 -1
- package/src/modules/firebase.ts +5 -12
|
@@ -2991,13 +2991,11 @@ export class Shopping {
|
|
|
2991
2991
|
});
|
|
2992
2992
|
}
|
|
2993
2993
|
|
|
2994
|
-
const
|
|
2995
|
-
|
|
2994
|
+
const hasEamil = [origin.orderData.customer_info, origin.orderData.user_info].some(user =>
|
|
2995
|
+
Boolean(user?.email)
|
|
2996
2996
|
);
|
|
2997
|
-
|
|
2998
|
-
|
|
2999
|
-
await this.sendNotifications(orderData, 'order-cancel-success');
|
|
3000
|
-
}
|
|
2997
|
+
if (hasEamil) {
|
|
2998
|
+
await this.sendNotifications(orderData, 'order-cancel-success');
|
|
3001
2999
|
}
|
|
3002
3000
|
|
|
3003
3001
|
// 購物金取消訂單退回
|
|
@@ -16,7 +16,6 @@ class EcPayStrategy {
|
|
|
16
16
|
MERCHANT_ID: this.keys.MERCHANT_ID,
|
|
17
17
|
TYPE: 'ecPay',
|
|
18
18
|
};
|
|
19
|
-
console.log("ecPayConfig -- ", ecPayConfig);
|
|
20
19
|
const ecpayInstance = new financial_serviceV2_js_1.EcPayV2(config.app, ecPayConfig);
|
|
21
20
|
const formHtml = await ecpayInstance.executePayment(orderData);
|
|
22
21
|
return { form: formHtml };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecpay-strategy.js","sourceRoot":"","sources":["ecpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAG7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"ecpay-strategy.js","sourceRoot":"","sources":["ecpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAG7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAY;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,aAAa;YACpF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,OAAO;SACd,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAG3D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AAvBD,sCAuBC"}
|
|
@@ -11,20 +11,19 @@ export class EcPayStrategy implements IPaymentStrategy {
|
|
|
11
11
|
this.keys = keys;
|
|
12
12
|
}
|
|
13
13
|
async initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult> {
|
|
14
|
-
const ecPayConfig:KeyData = {
|
|
14
|
+
const ecPayConfig: KeyData = {
|
|
15
15
|
HASH_IV: this.keys.HASH_IV,
|
|
16
16
|
HASH_KEY: this.keys.HASH_KEY,
|
|
17
17
|
ActionURL: this.keys.ActionURL,
|
|
18
18
|
NotifyURL: `${config.domain}/api-public/v1/ec/notify?g-app=${config.app}&type=ecPay`,
|
|
19
19
|
ReturnURL: `${config.domain}/api-public/v1/ec/redirect?g-app=${config.app}&return=${config.id}`,
|
|
20
20
|
MERCHANT_ID: this.keys.MERCHANT_ID,
|
|
21
|
-
TYPE: 'ecPay'
|
|
21
|
+
TYPE: 'ecPay',
|
|
22
22
|
};
|
|
23
|
-
console.log("ecPayConfig -- " , ecPayConfig);
|
|
24
23
|
const ecpayInstance = new EcPayV2(config.app, ecPayConfig);
|
|
25
24
|
// 注意:原始的 createOrderPage 可能需要更完整的 orderData,這裡直接傳入
|
|
26
25
|
// 您可能需要根據 EcPay 類別的實際需要調整傳遞給 createOrderPage 的參數
|
|
27
26
|
const formHtml = await ecpayInstance.executePayment(orderData);
|
|
28
27
|
return { form: formHtml };
|
|
29
28
|
}
|
|
30
|
-
}
|
|
29
|
+
}
|
|
@@ -17,7 +17,6 @@ class EzPayStrategy {
|
|
|
17
17
|
TYPE: 'newWebPay',
|
|
18
18
|
};
|
|
19
19
|
const ezpayInstance = new financial_serviceV2_js_1.EzPayV2(config.app, ezPayConfig);
|
|
20
|
-
console.log('ezPayConfig -- ', ezPayConfig);
|
|
21
20
|
const formHtml = await ezpayInstance.executePayment(orderData);
|
|
22
21
|
return { form: formHtml };
|
|
23
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ezpay-strategy.js","sourceRoot":"","sources":["ezpay-strategy.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"ezpay-strategy.js","sourceRoot":"","sources":["ezpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAI7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAY;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,iBAAiB;YACxF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,WAAW;SAClB,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AArBD,sCAqBC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IPaymentStrategy, PaymentConfig, PaymentResult } from '../interface/payment-strategy-interface.js';
|
|
2
2
|
import { Cart } from '../shopping.js';
|
|
3
|
-
import {
|
|
3
|
+
import { EzPayV2, KeyData } from '../financial-serviceV2.js';
|
|
4
4
|
import { EcEzPayKeyData } from '../interface/payment-keys-interface';
|
|
5
5
|
//藍新金流
|
|
6
6
|
//測試信用卡 4000 2211 1111 1111 驗證碼123
|
|
@@ -12,20 +12,17 @@ export class EzPayStrategy implements IPaymentStrategy {
|
|
|
12
12
|
this.keys = keys;
|
|
13
13
|
}
|
|
14
14
|
async initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult> {
|
|
15
|
-
const ezPayConfig:KeyData = {
|
|
15
|
+
const ezPayConfig: KeyData = {
|
|
16
16
|
HASH_IV: this.keys.HASH_IV,
|
|
17
17
|
HASH_KEY: this.keys.HASH_KEY,
|
|
18
18
|
ActionURL: this.keys.ActionURL,
|
|
19
19
|
NotifyURL: `${config.domain}/api-public/v1/ec/notify?g-app=${config.app}&type=newWebPay`,
|
|
20
20
|
ReturnURL: `${config.domain}/api-public/v1/ec/redirect?g-app=${config.app}&return=${config.id}`,
|
|
21
21
|
MERCHANT_ID: this.keys.MERCHANT_ID,
|
|
22
|
-
TYPE: 'newWebPay'
|
|
22
|
+
TYPE: 'newWebPay',
|
|
23
23
|
};
|
|
24
24
|
const ezpayInstance = new EzPayV2(config.app, ezPayConfig);
|
|
25
|
-
console.log(
|
|
26
|
-
'ezPayConfig -- ',
|
|
27
|
-
ezPayConfig,);
|
|
28
25
|
const formHtml = await ezpayInstance.executePayment(orderData);
|
|
29
26
|
return { form: formHtml };
|
|
30
27
|
}
|
|
31
|
-
}
|
|
28
|
+
}
|
package/src/modules/firebase.js
CHANGED
|
@@ -61,7 +61,6 @@ class Firebase {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
async sendMessage(cf) {
|
|
64
|
-
console.log('sendMessage', cf);
|
|
65
64
|
cf.body = cf.body.replace(/<br\s*\/?>/gi, '\n');
|
|
66
65
|
if (cf.userID) {
|
|
67
66
|
web_socket_js_1.WebSocket.noticeChangeMem[cf.userID] &&
|
|
@@ -79,9 +78,6 @@ class Firebase {
|
|
|
79
78
|
where userID = ?;`, [cf.userID])).map((dd) => {
|
|
80
79
|
return dd.deviceToken;
|
|
81
80
|
});
|
|
82
|
-
console.log(`sendMessage:${cf.userID}`, `SELECT deviceToken
|
|
83
|
-
FROM \`${cf.app || this.app}\`.t_fcm
|
|
84
|
-
where userID = ${database_1.default.escape(cf.userID)};`);
|
|
85
81
|
const user_cf = ((_a = (await database_1.default.query(`select \`value\`
|
|
86
82
|
from \`${cf.app || this.app}\`.t_user_public_config
|
|
87
83
|
where \`key\` = 'notify_setting'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["firebase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["firebase.ts"],"names":[],"mappings":"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"}
|
package/src/modules/firebase.ts
CHANGED
|
@@ -74,7 +74,6 @@ export class Firebase {
|
|
|
74
74
|
app?: string;
|
|
75
75
|
pass_store?: boolean;
|
|
76
76
|
}) {
|
|
77
|
-
console.log('sendMessage', cf);
|
|
78
77
|
cf.body = cf.body.replace(/<br\s*\/?>/gi, '\n');
|
|
79
78
|
if (cf.userID) {
|
|
80
79
|
WebSocket.noticeChangeMem[cf.userID] &&
|
|
@@ -96,12 +95,6 @@ export class Firebase {
|
|
|
96
95
|
).map((dd: any) => {
|
|
97
96
|
return dd.deviceToken;
|
|
98
97
|
});
|
|
99
|
-
console.log(
|
|
100
|
-
`sendMessage:${cf.userID}`,
|
|
101
|
-
`SELECT deviceToken
|
|
102
|
-
FROM \`${cf.app || this.app}\`.t_fcm
|
|
103
|
-
where userID = ${db.escape(cf.userID)};`
|
|
104
|
-
);
|
|
105
98
|
const user_cf = (
|
|
106
99
|
(
|
|
107
100
|
await db.query(
|
|
@@ -130,8 +123,8 @@ export class Firebase {
|
|
|
130
123
|
cf.token = [cf.token];
|
|
131
124
|
}
|
|
132
125
|
if (Array.isArray(cf.token)) {
|
|
133
|
-
let error_token:string[]=[]
|
|
134
|
-
await
|
|
126
|
+
let error_token: string[] = [];
|
|
127
|
+
await Promise.all(
|
|
135
128
|
cf.token.map(token => {
|
|
136
129
|
return new Promise(async (resolve, reject) => {
|
|
137
130
|
try {
|
|
@@ -168,7 +161,7 @@ export class Firebase {
|
|
|
168
161
|
})
|
|
169
162
|
.catch((error: any) => {
|
|
170
163
|
if (error.errorInfo.code === 'messaging/registration-token-not-registered') {
|
|
171
|
-
error_token.push(token)
|
|
164
|
+
error_token.push(token);
|
|
172
165
|
}
|
|
173
166
|
resolve(true);
|
|
174
167
|
});
|
|
@@ -179,11 +172,11 @@ export class Firebase {
|
|
|
179
172
|
});
|
|
180
173
|
})
|
|
181
174
|
);
|
|
182
|
-
if(error_token.length>0){
|
|
175
|
+
if (error_token.length > 0) {
|
|
183
176
|
await db.query(
|
|
184
177
|
`delete
|
|
185
178
|
FROM \`${cf.app || this.app}\`.t_fcm
|
|
186
|
-
where userID = ? and deviceToken in (${error_token.map(d=>db.escape(d)).join(',')});`,
|
|
179
|
+
where userID = ? and deviceToken in (${error_token.map(d => db.escape(d)).join(',')});`,
|
|
187
180
|
[cf.userID]
|
|
188
181
|
);
|
|
189
182
|
}
|