ts-glitter 20.5.1 → 20.5.3
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/member-setting.js +2 -4
- package/lowcode/cms-plugin/member-setting.ts +2 -4
- package/lowcode/cms-plugin/module/user-excel.js +25 -21
- package/lowcode/cms-plugin/module/user-excel.ts +9 -6
- package/lowcode/cms-plugin/stock-history.ts +0 -1
- package/lowcode/cms-plugin/user-list.js +98 -97
- package/lowcode/cms-plugin/user-list.ts +111 -103
- package/lowcode/modules/checkInput.js +2 -2
- package/lowcode/modules/checkInput.ts +58 -61
- package/lowcode/public-components/checkout/index.js +0 -1
- package/lowcode/public-components/checkout/index.ts +0 -1
- package/lowcode/public-components/user-manager/um-info.js +49 -48
- package/lowcode/public-components/user-manager/um-info.ts +219 -204
- package/lowcode/public-components/user-manager/um-order.js +25 -22
- package/lowcode/public-components/user-manager/um-order.ts +32 -23
- package/lowcode/src/glitterBundle/module/Animation.js +7 -13
- package/lowcode/src/glitterBundle/module/Enum.js +2 -6
- package/lowcode/src/glitterBundle/module/Html_generate.js +50 -42
- package/lowcode/src/glitterBundle/module/PageManager.js +23 -30
- package/lowcode/src/glitterBundle/plugins/click-event.js +25 -19
- package/lowcode/src/glitterBundle/plugins/dialog-style-editor.js +13 -16
- package/lowcode/src/glitterBundle/plugins/editor-elem.js +1 -6
- package/lowcode/src/glitterBundle/plugins/editor.js +1 -5
- package/lowcode/src/glitterBundle/plugins/html-render.js +2 -5
- package/lowcode/src/glitterBundle/plugins/plugin-creater.js +28 -22
- package/lowcode/src/glitterBundle/plugins/seo-manager.js +1 -5
- package/lowcode/src/glitterBundle/plugins/style-attr.js +1 -5
- package/lowcode/src/glitterBundle/plugins/style-editor.js +1 -3
- package/package.json +1 -1
- package/src/api-public/services/financial-service.js +7 -6
- package/src/api-public/services/financial-service.js.map +1 -1
- package/src/api-public/services/financial-service.ts +11 -8
- package/src/api-public/services/model/handlePaymentTransaction.js +29 -2
- package/src/api-public/services/model/handlePaymentTransaction.js.map +1 -1
- package/src/api-public/services/model/handlePaymentTransaction.ts +8 -9
- package/src/api-public/services/shopping.d.ts +1 -1
- package/src/api-public/services/shopping.js +12 -9
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +5 -3
- package/src/api-public/services/user.js +48 -61
- package/src/api-public/services/user.js.map +1 -1
- package/src/api-public/services/user.ts +62 -66
|
@@ -2224,7 +2224,7 @@ class Shopping {
|
|
|
2224
2224
|
}
|
|
2225
2225
|
}
|
|
2226
2226
|
async repayOrder(orderID, return_url) {
|
|
2227
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
2227
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
2228
2228
|
const app = this.app;
|
|
2229
2229
|
async function getOrder(orderID) {
|
|
2230
2230
|
try {
|
|
@@ -2273,13 +2273,14 @@ class Shopping {
|
|
|
2273
2273
|
};
|
|
2274
2274
|
const newOrderID = Date.now();
|
|
2275
2275
|
const carData = {
|
|
2276
|
+
discount: (_b = orderData.discount) !== null && _b !== void 0 ? _b : 0,
|
|
2276
2277
|
customer_info: orderData.customer_info || {},
|
|
2277
|
-
lineItems: (
|
|
2278
|
-
total: (
|
|
2279
|
-
email: (
|
|
2278
|
+
lineItems: (_c = orderData.lineItems) !== null && _c !== void 0 ? _c : [],
|
|
2279
|
+
total: (_d = orderData.total) !== null && _d !== void 0 ? _d : 0,
|
|
2280
|
+
email: (_g = (_e = sqlData.email) !== null && _e !== void 0 ? _e : (_f = orderData.user_info) === null || _f === void 0 ? void 0 : _f.email) !== null && _g !== void 0 ? _g : '',
|
|
2280
2281
|
user_info: orderData.user_info,
|
|
2281
|
-
shipment_fee: (
|
|
2282
|
-
rebate: (
|
|
2282
|
+
shipment_fee: (_h = orderData.shipment_fee) !== null && _h !== void 0 ? _h : 0,
|
|
2283
|
+
rebate: (_j = orderData.rebate) !== null && _j !== void 0 ? _j : 0,
|
|
2283
2284
|
goodsWeight: 0,
|
|
2284
2285
|
use_rebate: orderData.use_rebate || 0,
|
|
2285
2286
|
orderID: `${newOrderID}`,
|
|
@@ -2290,7 +2291,7 @@ class Shopping {
|
|
|
2290
2291
|
name: dd.title,
|
|
2291
2292
|
value: dd.value,
|
|
2292
2293
|
})),
|
|
2293
|
-
...((
|
|
2294
|
+
...((_k = shipment_setting.custom_delivery) !== null && _k !== void 0 ? _k : []).map((dd) => ({
|
|
2294
2295
|
form: dd.form,
|
|
2295
2296
|
name: dd.name,
|
|
2296
2297
|
value: dd.id,
|
|
@@ -2298,8 +2299,8 @@ class Shopping {
|
|
|
2298
2299
|
})),
|
|
2299
2300
|
].filter(option => shipment_setting.support.includes(option.value)),
|
|
2300
2301
|
use_wallet: 0,
|
|
2301
|
-
method: (
|
|
2302
|
-
user_email: (
|
|
2302
|
+
method: (_l = sqlData.user_info) === null || _l === void 0 ? void 0 : _l.method,
|
|
2303
|
+
user_email: (_p = (_m = sqlData.email) !== null && _m !== void 0 ? _m : (_o = orderData.user_info) === null || _o === void 0 ? void 0 : _o.email) !== null && _p !== void 0 ? _p : '',
|
|
2303
2304
|
useRebateInfo: sqlData.useRebateInfo,
|
|
2304
2305
|
custom_form_format: sqlData.custom_form_format,
|
|
2305
2306
|
custom_form_data: sqlData.custom_form_data,
|
|
@@ -2315,7 +2316,9 @@ class Shopping {
|
|
|
2315
2316
|
fbp: sqlData.fbp,
|
|
2316
2317
|
editRecord: [],
|
|
2317
2318
|
};
|
|
2319
|
+
console.log("orderData.customer_info.payment_select -- ", orderData.customer_info.payment_select);
|
|
2318
2320
|
const result = await new handlePaymentTransaction_js_1.default(this.app, orderData.customer_info.payment_select).processPayment(carData);
|
|
2321
|
+
return result;
|
|
2319
2322
|
}
|
|
2320
2323
|
}
|
|
2321
2324
|
async getReturnOrder(query) {
|