ts-glitter 20.6.8 → 20.6.9

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';
 
 const html = String.raw;
+const css = String.raw;
 
 class OrderDetail {
   subtotal: number;
@@ -258,27 +259,26 @@ export class ShoppingOrderManager {
         </div>
       </div>
       <div class="${query.isShipment ? '' : 'd-none'} mb-3"></div>
-      <div class="${query.isShipment ? 'd-none' : ''}">
-        ${BgWidget.tab(
-          query.isPOS
-            ? [
-                { title: '所有訂單', key: 'all' },
-                { title: 'POS訂單', key: 'pos' },
-                { title: '線上訂單', key: 'normal' },
-              ]
-            : [
-                { title: '所有訂單', key: 'all' },
-                { title: '線上訂單', key: 'normal' },
-                { title: 'POS訂單', key: 'pos' },
-              ],
-          gvc,
-          vm.filter_type,
-          text => {
-            vm.filter_type = text as any;
-            gvc.notifyDataChange(vm.id);
-          }
-        )}
-      </div>
+      ${BgWidget.tab(
+        query.isPOS
+          ? [
+              { title: '所有訂單', key: 'all' },
+              { title: 'POS訂單', key: 'pos' },
+              { title: '線上訂單', key: 'normal' },
+            ]
+          : [
+              { title: '所有訂單', key: 'all' },
+              { title: '線上訂單', key: 'normal' },
+              { title: 'POS訂單', key: 'pos' },
+            ],
+        gvc,
+        vm.filter_type,
+        text => {
+          vm.filter_type = text as any;
+          gvc.notifyDataChange(vm.id);
+        },
+        query.isShipment ? 'display: none;' : ''
+      )}
       ${BgWidget.mainCard(
         [
           gvc.bindView({
@@ -355,7 +355,7 @@ export class ShoppingOrderManager {
                     }),
               ];
 
-              const filterTags = ListComp.getFilterTags(await FilterOptions.getOrderFunnel());
+              const filterTags = ListComp.getFilterTags(orderFunnel);
               return BgListComponent.listBarRWD(filterList, filterTags);
             },
           }),
@@ -958,6 +958,10 @@ export class ShoppingOrderManager {
                                 }
                                 gvc.closeDialog();
                                 orders.forEach(order => {
+                                  if (['wait', 'returns', undefined].includes(progress)) {
+                                    order.orderData.user_info.shipment_number = '';
+                                  }
+
                                   order.orderData.progress = progress;
                                 });
                                 updateOrders(orders);
@@ -1134,7 +1138,6 @@ export class ShoppingOrderManager {
           });
           orderData = structuredClone(orderDataNew.response.data[0]);
           originData = structuredClone(orderData);
-          console.log('orderDataNew.response.data -- ', orderDataNew.response.data);
         }
 
         orderData.orderData.progress = orderData.orderData.progress ?? 'wait';
@@ -1202,9 +1205,19 @@ export class ShoppingOrderManager {
         }
 
         const funBTN = () => {
-          gvc.addStyle(html`
-            .funInsignia{ border-radius: 10px; background: #EAEAEA; display: flex; padding: 6px 18px; justify-content:
-            center; align-items: center; gap: 8px; font-size: 16px; font-weight: 700; cursor: pointer; }
+          gvc.addStyle(css`
+            .funInsignia {
+              border-radius: 10px;
+              background: #eaeaea;
+              display: flex;
+              padding: 6px 18px;
+              justify-content: center;
+              align-items: center;
+              gap: 8px;
+              font-size: 16px;
+              font-weight: 700;
+              cursor: pointer;
+            }
           `);
           return {
             splitOrder: () => {
@@ -1212,8 +1225,9 @@ export class ShoppingOrderManager {
                 class="funInsignia"
                 style=""
                 onclick="${gvc.event(() => {
-                  console.log('orderData -- ', orderData);
-
+                  if (orderData.orderData.orderSource == 'split') {
+                    return;
+                  }
                   OrderSetting.splitOrder(gvc, orderData.orderData, () => gvc.notifyDataChange(vm.id));
                 })}"
               >
@@ -1315,13 +1329,28 @@ export class ShoppingOrderManager {
                           </div>
                           ${BgWidget.mbContainer(12)}
                           <div class="ms-auto w-100">
-                            ${EditorElem.select({
-                              title: '',
-                              gvc: gvc,
-                              def: `${orderData.orderData.progress}`,
-                              array: ApiShop.getProgressArray(orderData.orderData.user_info.shipment_number),
-                              readonly: orderData.orderData.user_info.shipment_refer === 'paynow' || is_archive,
-                              callback: text => {
+                            ${BgWidget.select({
+                              gvc,
+                              default: (() => {
+                                if (!orderData.orderData.progress) {
+                                  return 'wait';
+                                }
+
+                                if (
+                                  orderData.orderData.progress === 'wait' &&
+                                  orderData.orderData.user_info.shipment_number
+                                ) {
+                                  return 'in_stock';
+                                }
+
+                                return orderData.orderData.progress;
+                              })(),
+
+                              options: OrderSetting.getShippmentOpt(),
+                              callback: (text: any) => {
+                                const emptyStatus = ['wait', 'returns', undefined, ''];
+                                const addNumberStatus = ['arrived', 'finish', 'shipping', 'in_stock'];
+
                                 function next() {
                                   if (text && text !== `${orderData.orderData.progress}`) {
                                     orderData.orderData.progress = text;
@@ -1329,16 +1358,24 @@ export class ShoppingOrderManager {
                                 }
 
                                 if (
-                                  ['', 'wait'].includes(orderData.orderData.progress) &&
-                                  !orderData.orderData.user_info.shipment_number &&
-                                  text !== 'pre_order'
+                                  emptyStatus.includes(orderData.orderData.progress) &&
+                                  addNumberStatus.includes(text) &&
+                                  !orderData.orderData.user_info.shipment_number
                                 ) {
                                   dialog.checkYesOrNot({
                                     text: '尚未新增出貨單，是否隨機取號並變更出貨狀態?',
                                     callback: response => {
                                       if (response) {
-                                        (orderData.orderData.user_info.shipment_number as any) = new Date().getTime();
                                         next();
+
+                                        orderData.orderData.user_info.shipment_number = emptyStatus.includes(text)
+                                          ? ''
+                                          : `${new Date().getTime()}`;
+
+                                        if (orderData.orderData.progress === 'in_stock') {
+                                          orderData.orderData.progress = 'wait';
+                                        }
+
                                         saveEvent();
                                       }
                                       gvc.notifyDataChange('Edit');
@@ -1348,6 +1385,7 @@ export class ShoppingOrderManager {
                                   next();
                                 }
                               },
+                              readonly: orderData.orderData.user_info.shipment_refer === 'paynow' || is_archive,
                             })}
                           </div>`,
                         html` <div class="tx_700">配送方式</div>
@@ -1600,8 +1638,9 @@ export class ShoppingOrderManager {
                             'FAMIC2C',
                             'OKMARTC2C',
                             'HILIFEC2C',
-                            'normal',
                             'UNIMARTFREEZE',
+                            'FAMIC2CFREEZE',
+                            'normal',
                             'black_cat',
                             'black_cat_freezing',
                           ].includes(orderData.orderData.user_info.shipment)
@@ -1678,9 +1717,14 @@ export class ShoppingOrderManager {
                                 return dd.value === orderData.orderData.user_info.shipment;
                               });
                               if (
-                                ['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C', 'UNIMARTFREEZE'].includes(
-                                  orderData.orderData.user_info.shipment
-                                )
+                                [
+                                  'UNIMARTC2C',
+                                  'FAMIC2C',
+                                  'OKMARTC2C',
+                                  'HILIFEC2C',
+                                  'UNIMARTFREEZE',
+                                  'FAMIC2CFREEZE',
+                                ].includes(orderData.orderData.user_info.shipment)
                               ) {
                                 return html`
                                   <div class="d-flex flex-wrap">
@@ -1963,7 +2007,7 @@ export class ShoppingOrderManager {
                     ${document.body.clientWidth > 768 ? getBadgeList() : ''}
                   </div>
                   ${document.body.clientWidth > 768 ? '' : html` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
-                  <div class="d-none justify-content-end">${funBTN().splitOrder()}</div>
+                  <div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
                   ${BgWidget.container1x2(
                     {
                       html: [
@@ -1985,16 +2029,23 @@ export class ShoppingOrderManager {
                                     .find(dd => {
                                       return dd.value == (orderData.orderData.orderStatus ?? '0');
                                     })?.title
-                                : EditorElem.select({
+                                : BgWidget.select({
                                     title: '',
                                     gvc: gvc,
-                                    def: orderData.orderData.orderStatus ?? '0',
-                                    array: [
+                                    default: orderData.orderData.orderStatus ?? '0',
+                                    options: [
                                       {
                                         title: '變更訂單狀態',
                                         value: '',
                                       },
-                                    ].concat(ApiShop.getOrderStatusArray()),
+                                    ]
+                                      .concat(ApiShop.getOrderStatusArray())
+                                      .map(item => {
+                                        return {
+                                          key: item.value,
+                                          value: item.title,
+                                        };
+                                      }),
                                     callback: text => {
                                       orderData.orderData.orderStatus = orderData.orderData.orderStatus || '0';
                                       if (text && text !== orderData.orderData.orderStatus) {
@@ -2077,10 +2128,8 @@ export class ShoppingOrderManager {
                                         <div>$${dd.sale_price.toLocaleString()} × ${dd.count}</div>
                                       </div>
                                       <div
-                                        class="tx_normal d-sm-none d-flex flex-column"
-                                        style="display: flex;justify-content: end;${document.body.clientWidth > 800
-                                          ? 'width: 110px'
-                                          : 'width: 140px'}"
+                                        class="tx_normal d-sm-none d-flex flex-column align-items-end justify-content-end"
+                                        style="min-width: 110px"
                                       >
                                         ${dd.origin_price && dd.origin_price > dd.sale_price
                                           ? html` <div style="margin-right: 6px; text-decoration: line-through;">
@@ -2089,7 +2138,6 @@ export class ShoppingOrderManager {
                                           : ''}
                                         <div>$${dd.sale_price.toLocaleString()} × ${dd.count}</div>
                                       </div>
-
                                       <div
                                         class="tx_normal d-none d-sm-flex"
                                         style="display: flex;justify-content: end;${document.body.clientWidth > 800
@@ -2352,16 +2400,23 @@ export class ShoppingOrderManager {
                                           .find(dd => {
                                             return dd.value === `${orderData.status}`;
                                           })?.title
-                                      : EditorElem.select({
+                                      : BgWidget.select({
                                           title: '',
                                           gvc: gvc,
-                                          def: `${orderData.status}`,
-                                          array: [
+                                          default: `${orderData.status}`,
+                                          options: [
                                             {
                                               title: '變更付款狀態',
                                               value: '',
                                             },
-                                          ].concat(ApiShop.getStatusArray(orderData.orderData.proof_purchase)),
+                                          ]
+                                            .concat(ApiShop.getStatusArray(orderData.orderData.proof_purchase))
+                                            .map(item => {
+                                              return {
+                                                key: item.value,
+                                                value: item.title,
+                                              };
+                                            }),
                                           callback: text => {
                                             dialog.checkYesOrNot({
                                               text: '是否確認變更付款狀態?',
@@ -2523,6 +2578,51 @@ export class ShoppingOrderManager {
                                 .join(BgWidget.mbContainer(18))
                             ),
                         is_shipment ? '' : shipment_card,
+                        BgWidget.mainCard(
+                          gvc.bindView(
+                            (() => {
+                              const id = gvc.glitter.getUUID();
+                              return {
+                                bind: id,
+                                view: () => {
+                                  return html`
+                                    <div class="d-flex align-items-center justify-content-between">
+                                      <div>
+                                        <div style="color: #393939; font-weight: 700;">訂單標籤</div>
+                                        ${BgWidget.grayNote('操作後台人員登記與分類用，不會顯示於前台')}
+                                        ${BgWidget.mbContainer(4)}
+                                      </div>
+                                      ${BgWidget.blueNote(
+                                        '使用現有標籤',
+                                        gvc.event(() => {
+                                          OrderModule.useOrderTags({
+                                            gvc,
+                                            config_key: 'order_manager_tags',
+                                            def: orderData.orderData.tags ?? [],
+                                            callback: tags => {
+                                              orderData.orderData.tags = tags;
+                                              gvc.notifyDataChange(id);
+                                            },
+                                          });
+                                        })
+                                      )}
+                                    </div>
+                                    ${BgWidget.multipleInput(
+                                      gvc,
+                                      orderData.orderData.tags ?? [],
+                                      {
+                                        save: def => {
+                                          orderData.orderData.tags = [...new Set(def)];
+                                        },
+                                      },
+                                      true
+                                    )}
+                                  `;
+                                },
+                              };
+                            })()
+                          )
+                        ),
                         BgWidget.mainCard(
                           gvc.bindView(() => {
                             const vm = {
@@ -2888,7 +2988,7 @@ export class ShoppingOrderManager {
                                                   return viewModel
                                                     .map(item => {
                                                       return html`
-                                                        <div>
+                                                        <div style="word-break: break-all;">
                                                           ${item[0]} :
                                                           ${(orderData.orderData.user_info as any)[item[1]] || '未填寫'}
                                                         </div>
@@ -2925,6 +3025,7 @@ export class ShoppingOrderManager {
                                             case 'OKMARTC2C':
                                             case 'UNIMARTC2C':
                                             case 'UNIMARTFREEZE':
+                                            case 'FAMIC2CFREEZE':
                                               return [
                                                 html` <div class="d-flex flex-wrap w-100">
                                                   <span class="me-2 fw-normal fs-6">門市名稱:</span>
@@ -3640,6 +3741,7 @@ export class ShoppingOrderManager {
               count: variant.qty ?? '1',
               sale_price: variant.sale_price,
               sku: variant.sku,
+              deduction_log: {},
             });
             orderDetail.subtotal +=
               Number(orderDetail.lineItems[index].count) * orderDetail.lineItems[index].sale_price;