ts-glitter 21.2.7 → 21.2.9

package/lowcode/cms-plugin/shopping-invoice-manager.js

@@ -431,10 +431,10 @@ export class ShoppingInvoiceManager {
     }
     static replaceOrder(gvc, vm, searchOrder) {
         const glitter = gvc.glitter;
-        const invoiceData = searchOrder !== null && searchOrder !== void 0 ? searchOrder : vm.data;
         let orderData_;
         const mainViewID = gvc.glitter.getUUID();
         let dataLoading = true;
+        const invoiceData = vm.invoiceData;
         ApiShop.getOrder({
             page: 0,
             limit: 100,
@@ -443,6 +443,8 @@ export class ShoppingInvoiceManager {
             returnSearch: 'true',
         }).then((response) => {
             orderData_ = response.response;
+            orderData_.orderData.user_info = invoiceData.invoice_data.original_data;
+            orderData_.orderData.user_info.print_invoice = (invoiceData.invoice_data.original_data.Print);
             dataLoading = false;
             gvc.notifyDataChange([mainViewID, 'invoiceContent']);
         });
@@ -502,7 +504,10 @@ export class ShoppingInvoiceManager {
                             if (orderData_) {
                                 const orderData = invoiceData.invoice_data.orderData || orderData_.orderData;
                                 console.log(`orderData_.orderData===>`, orderData_.orderData);
-                                console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data.orderData);
+                                console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data);
+                                orderData.user_info.invoice_type = invoiceData.invoice_data.original_data.CustomerIdentifier ? `company` : `customer`;
+                                orderData.user_info.company = invoiceData.invoice_data.original_data.CustomerName;
+                                orderData.user_info.print_invoice = invoiceData.invoice_data.original_data.Print;
                                 let tax_total = (() => {
                                     let total = 0;
                                     orderData.lineItems
@@ -519,6 +524,7 @@ export class ShoppingInvoiceManager {
                                 let sale = orderData.total - tax_total;
                                 let allowanceLoading = true;
                                 let allowanceData = [];
+                                console.log('orderData.user_info===>', orderData);
                                 try {
                                     return [
                                         BgWidget.mainCard(html `

package/lowcode/cms-plugin/shopping-invoice-manager.ts

@@ -494,14 +494,6 @@ export class ShoppingInvoiceManager {
   public static replaceOrder(gvc: GVC, vm: any, searchOrder?: any) {
     const glitter = gvc.glitter;
 
-    const invoiceData: {
-      id: number;
-      invoice_no: string;
-      status: number;
-      order_id: string;
-      invoice_data: any;
-      create_date: string;
-    } = searchOrder ?? vm.data;
 
     let orderData_: {
       id: number;
@@ -545,6 +537,7 @@ export class ShoppingInvoiceManager {
           MerchantTradeNo: string;
           CVSAddress: string;
           note?: string;
+          print_invoice?:string;
           code_note?: string;
           gui_number?: string;
         };
@@ -590,7 +583,7 @@ export class ShoppingInvoiceManager {
     };
     const mainViewID = gvc.glitter.getUUID();
     let dataLoading = true;
-
+const invoiceData=vm.invoiceData;
     ApiShop.getOrder({
       page: 0,
       limit: 100,
@@ -599,6 +592,9 @@ export class ShoppingInvoiceManager {
       returnSearch: 'true',
     }).then((response: any) => {
       orderData_ = response.response;
+
+      orderData_.orderData.user_info=invoiceData.invoice_data.original_data;
+      orderData_.orderData.user_info.print_invoice=(invoiceData.invoice_data.original_data.Print)
       dataLoading = false;
       gvc.notifyDataChange([mainViewID, 'invoiceContent']);
     });
@@ -666,7 +662,10 @@ export class ShoppingInvoiceManager {
                 if (orderData_) {
                   const orderData = invoiceData.invoice_data.orderData || orderData_.orderData;
                   console.log(`orderData_.orderData===>`, orderData_.orderData);
-                  console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data.orderData);
+                  console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data);
+                  orderData.user_info.invoice_type=invoiceData.invoice_data.original_data.CustomerIdentifier ? `company`:`customer`
+                  orderData.user_info.company=invoiceData.invoice_data.original_data.CustomerName
+                  orderData.user_info.print_invoice=invoiceData.invoice_data.original_data.Print;
                   let tax_total = (() => {
                     let total = 0;
                     orderData.lineItems
@@ -684,6 +683,7 @@ export class ShoppingInvoiceManager {
                   let allowanceLoading = true;
                   let allowanceData: any[] = [];
 
+                  console.log('orderData.user_info===>', orderData);
                   // CustomerIdentifier
                   try {
                     return [
@@ -1588,6 +1588,7 @@ ${reason}</textarea
                             ),
                           ];
 
+                          
                           if (
                             invoiceData.invoice_data.original_data.Print === '1' &&
                             (window.parent as any).glitter.share.PayConfig.posType === 'SUNMI'

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -121,38 +121,45 @@ export class ShoppingOrderManager {
                 }
             });
         }
+        const thathis = this;
         return gvc.bindView({
             bind: vm.id,
             dataList: [{ obj: vm, key: 'type' }],
             view: () => {
-                var _a, _b;
+                var _a;
                 if (vm.loading) {
                     return '';
                 }
-                const viewMap = {
-                    list: () => this.tableOrder(gvc, vm, query, ListComp),
-                    replace: () => this.replaceOrder(gvc, vm, vm.data.cart_token),
-                    add: () => this.createOrder(gvc, vm),
-                    createInvoice: () => {
-                        vm.return_order = true;
-                        return ShoppingInvoiceManager.createOrder(gvc, vm, vm.tempOrder);
-                    },
-                    recommend: () => {
-                        return BgRecommend.editorLink({
-                            gvc: gvc,
-                            data: vm.distributionData.data[0],
-                            callback: () => {
-                                vm.type = 'replace';
-                            },
-                            vm,
-                        });
-                    },
-                    viewInvoice: () => {
-                        vm.return_order = true;
-                        return ShoppingInvoiceManager.replaceOrder(gvc, vm, vm.invoiceData);
-                    },
-                };
-                return (_b = (_a = viewMap[vm.type]) === null || _a === void 0 ? void 0 : _a.call(viewMap)) !== null && _b !== void 0 ? _b : '';
+                try {
+                    const viewMap = {
+                        list: () => thathis.tableOrder(gvc, vm, query, ListComp),
+                        replace: () => thathis.replaceOrder(gvc, vm, vm.data.cart_token),
+                        add: () => thathis.createOrder(gvc, vm),
+                        createInvoice: () => {
+                            vm.return_order = true;
+                            return ShoppingInvoiceManager.createOrder(gvc, vm, vm.tempOrder);
+                        },
+                        recommend: () => {
+                            return BgRecommend.editorLink({
+                                gvc: gvc,
+                                data: vm.distributionData.data[0],
+                                callback: () => {
+                                    vm.type = 'replace';
+                                },
+                                vm,
+                            });
+                        },
+                        viewInvoice: () => {
+                            vm.return_order = true;
+                            return ShoppingInvoiceManager.replaceOrder(gvc, vm, vm.invoiceData);
+                        },
+                    };
+                    return (_a = viewMap[vm.type]()) !== null && _a !== void 0 ? _a : '';
+                }
+                catch (e) {
+                    console.error(e);
+                    return `${e}`;
+                }
             },
             onCreate: () => {
                 if (vm.loading) {
@@ -943,6 +950,7 @@ export class ShoppingOrderManager {
                     let userData = {};
                     let invoiceDataList = [];
                     let storeList = [];
+                    let mainViewId = gvc.glitter.getUUID();
                     let productData = [];
                     let is_shipment = ['shipment_list_archive', 'shipment_list'].includes(window.glitter.getUrlParameter('page'));
                     const dialog = new ShareDialog(gvc.glitter);
@@ -979,7 +987,7 @@ export class ShoppingOrderManager {
                     ApiUser.getUsersDataWithEmailOrPhone(orderData.email).then(res => {
                         userData = res.response;
                         userDataLoading = false;
-                        gvc.notifyDataChange('mainView');
+                        gvc.notifyDataChange(mainViewId);
                     });
                     ApiShop.getInvoice({
                         page: 0,
@@ -1000,7 +1008,7 @@ export class ShoppingOrderManager {
                     }).then(r => {
                         productData = r.response.data;
                         productLoading = false;
-                        gvc.notifyDataChange('mainView');
+                        gvc.notifyDataChange(mainViewId);
                     });
                     function saveEvent() {
                         dialog.dataLoading({ text: '上傳中', visible: true });
@@ -1089,7 +1097,7 @@ export class ShoppingOrderManager {
                         });
                     }
                     return gvc.bindView({
-                        bind: 'mainView',
+                        bind: mainViewId,
                         dataList: [{ obj: child_vm, key: 'type' }],
                         view: () => {
                             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -2176,7 +2184,7 @@ export class ShoppingOrderManager {
                                                                         }
                                                                     }
                                                                     else {
-                                                                        gvc.notifyDataChange('mainView');
+                                                                        gvc.notifyDataChange(mainViewId);
                                                                     }
                                                                 },
                                                             });
@@ -2915,7 +2923,7 @@ export class ShoppingOrderManager {
                       </div>`,
                                     ratio: 25,
                                 })}
-                  ${BgWidget.mbContainer(240)}
+                <div style="height:240px;"></div>
                   <div class="update-bar-container">
                     <div>
                       ${gvc.bindView(() => {

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -28,6 +28,7 @@ import { LineItem } from './module/data.js';
 import { OrderModule } from './order/order-module.js';
 import { TableStorage } from './module/table-storage.js';
 
+
 const html = String.raw;
 const css = String.raw;
 
@@ -159,6 +160,8 @@ export class ShoppingOrderManager {
         }
       });
     }
+    const thathis = this;
+
     return gvc.bindView({
       bind: vm.id,
       dataList: [{ obj: vm, key: 'type' }],
@@ -167,31 +170,37 @@ export class ShoppingOrderManager {
           return '';
         }
 
-        const viewMap: Record<string, () => string> = {
-          list: () => this.tableOrder(gvc, vm, query, ListComp),
-          replace: () => this.replaceOrder(gvc, vm, vm.data.cart_token),
-          add: () => this.createOrder(gvc, vm),
-          createInvoice: () => {
-            vm.return_order = true;
-            return ShoppingInvoiceManager.createOrder(gvc, vm, (vm as any).tempOrder);
-          },
-          recommend: () => {
-            return BgRecommend.editorLink({
-              gvc: gvc,
-              data: vm.distributionData.data[0],
-              callback: () => {
-                vm.type = 'replace';
-              },
-              vm,
-            });
-          },
-          viewInvoice: () => {
-            vm.return_order = true;
-            return ShoppingInvoiceManager.replaceOrder(gvc, vm, vm.invoiceData);
-          },
-        };
+        try {
+          const viewMap: Record<string, () => string> = {
+            list: () => thathis.tableOrder(gvc, vm, query, ListComp),
+            replace: () => thathis.replaceOrder(gvc, vm, vm.data.cart_token),
+            add: () => thathis.createOrder(gvc, vm),
+            createInvoice: () => {
+              vm.return_order = true;
+              return ShoppingInvoiceManager.createOrder(gvc, vm, (vm as any).tempOrder);
+            },
+            recommend: () => {
+              return BgRecommend.editorLink({
+                gvc: gvc,
+                data: vm.distributionData.data[0],
+                callback: () => {
+                  vm.type = 'replace';
+                },
+                vm,
+              });
+            },
+            viewInvoice: () => {
+              vm.return_order = true;
+              return ShoppingInvoiceManager.replaceOrder(gvc, vm, vm.invoiceData);
+            },
+          };
+
+          return viewMap[vm.type]() ?? '';
+        }catch (e) {
+          console.error(e)
+          return `${e}`
+        }
 
-        return viewMap[vm.type]?.() ?? '';
       },
       onCreate: () => {
         if (vm.loading) {
@@ -1057,6 +1066,7 @@ export class ShoppingOrderManager {
         let userData: any = {};
         let invoiceDataList: any = [];
         let storeList: any = [];
+        let mainViewId=gvc.glitter.getUUID();
         let productData: any = [];
         let is_shipment = ['shipment_list_archive', 'shipment_list'].includes(
           (window as any).glitter.getUrlParameter('page')
@@ -1107,7 +1117,7 @@ export class ShoppingOrderManager {
         ApiUser.getUsersDataWithEmailOrPhone(orderData.email).then(res => {
           userData = res.response;
           userDataLoading = false;
-          gvc.notifyDataChange('mainView');
+          gvc.notifyDataChange(mainViewId);
         });
 
         ApiShop.getInvoice({
@@ -1130,7 +1140,7 @@ export class ShoppingOrderManager {
         }).then(r => {
           productData = r.response.data;
           productLoading = false;
-          gvc.notifyDataChange('mainView');
+          gvc.notifyDataChange(mainViewId);
         });
 
         function saveEvent() {
@@ -1227,7 +1237,7 @@ export class ShoppingOrderManager {
         }
 
         return gvc.bindView({
-          bind: 'mainView',
+          bind: mainViewId,
           dataList: [{ obj: child_vm, key: 'type' }],
           view: () => {
             try {
@@ -1955,6 +1965,7 @@ export class ShoppingOrderManager {
                           return;
                         }
                         (window.parent as any).glitter.setUrlParameter('orderID', undefined);
+                        
                         if (backCallback) {
                           backCallback();
                         } else {
@@ -2406,7 +2417,7 @@ export class ShoppingOrderManager {
                                                     saveEvent();
                                                   }
                                                 } else {
-                                                  gvc.notifyDataChange('mainView');
+                                                  gvc.notifyDataChange(mainViewId);
                                                 }
                                               },
                                             });
@@ -3208,7 +3219,7 @@ export class ShoppingOrderManager {
                       ratio: 25,
                     }
                   )}
-                  ${BgWidget.mbContainer(240)}
+                <div style="height:240px;"></div>
                   <div class="update-bar-container">
                     <div>
                       ${gvc.bindView(() => {

package/lowcode/index.html

@@ -2664,6 +2664,7 @@
         font-size: 1rem;
         font-weight: normal;
         color: #9397ad;
+
     }
 
     .dark-mode .page-loading-inner > span {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "21.2.7",
+  "version": "21.2.9",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/controllers/shop.js

@@ -582,7 +582,7 @@ router.delete('/voucher', async (req, resp) => {
     }
 });
 async function redirect_link(req, resp) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     function setQueryParameter(originalUrl, paramName, newValue) {
         try {
             const url = new URL(originalUrl);
@@ -626,18 +626,18 @@ async function redirect_link(req, resp) {
         </html> `);
     }
     try {
-        const order_id = (_b = (_a = req.query) === null || _a === void 0 ? void 0 : _a.orderID) !== null && _b !== void 0 ? _b : '';
         req.query.appName = req.query.appName || req.get('g-app') || req.query['g-app'];
         let return_url = new URL((await redis_js_1.default.getValue(req.query.return)));
+        const order_id = ((_a = req.query) === null || _a === void 0 ? void 0 : _a.orderID) || (return_url.searchParams.get('cart_token')) || '';
         const old_order_id = await redis_js_1.default.getValue(order_id);
-        const idToQuery = old_order_id ? old_order_id : ((_c = order_id) !== null && _c !== void 0 ? _c : '');
+        const idToQuery = old_order_id ? old_order_id : ((_b = order_id) !== null && _b !== void 0 ? _b : '');
         if (req.query.LinePay && req.query.LinePay === 'true') {
             let order_data = {};
             try {
                 const queryResult = await database_js_1.default.query(`SELECT *
            FROM \`${req.query.appName}\`.t_checkout
            WHERE cart_token = ?`, [idToQuery]);
-                order_data = (_d = queryResult === null || queryResult === void 0 ? void 0 : queryResult[0]) !== null && _d !== void 0 ? _d : undefined;
+                order_data = (_c = queryResult === null || queryResult === void 0 ? void 0 : queryResult[0]) !== null && _c !== void 0 ? _c : undefined;
                 if (!order_data) {
                     console.log(`找不到 cart_token 為 ${idToQuery} 的訂單資料。`);
                 }