@things-factory/operato-mms 4.0.0-alpha.7 → 4.0.0-beta.1

package/client/pages/order/order-by-store.js

@@ -1,21 +1,25 @@
-import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, PageView, CustomAlert } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { openPopup } from '@things-factory/layout-base'
-import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { PLATFORM } from '../constants'
-
 import './select-datetime-popup'
 import './logistics/order-init-popup'
 import './logistics/shopee-order-init-batch-popup'
 import './logistics/lazada-order-init-batch-popup'
+import './logistics/batch-init-popup'
 import './logistics/request-ro-popup'
 
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { GhostPrint } from '@operato/ghost-print'
+import { getCodeByName } from '@things-factory/code-base'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
+import { client, CustomAlert, PageView } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { isMobileDevice } from '@things-factory/utils'
+
+import { PLATFORM } from '../constants'
+
 class OrderByStore extends localize(i18next)(PageView) {
   static get properties() {
     return {
@@ -61,6 +65,11 @@ class OrderByStore extends localize(i18next)(PageView) {
         title: i18next.t('button.sync_order'),
         action: this._syncOrder.bind(this),
         ...CommonButtonStyles.sync
+      },
+      {
+        title: i18next.t('button.airway_bill'),
+        action: this._openAirwayBillPopup.bind(this),
+        ...CommonButtonStyles.label
       }
     ]
 
@@ -68,11 +77,6 @@ class OrderByStore extends localize(i18next)(PageView) {
       switch (this.store.platform) {
         case PLATFORM.SHOPEE.value:
           actions = [
-            {
-              title: i18next.t('button.airway_bill'),
-              action: this._openAirwayBillPopup.bind(this),
-              ...CommonButtonStyles.label
-            },
             {
               title: i18next.t('button.order_init_batch'),
               action: this._openShopeeOrderInitBatch.bind(this),
@@ -83,11 +87,6 @@ class OrderByStore extends localize(i18next)(PageView) {
           break
         case PLATFORM.LAZADA.value:
           actions = [
-            {
-              title: i18next.t('button.airway_bill'),
-              action: this._openAirwayBillPopup.bind(this),
-              ...CommonButtonStyles.label
-            },
             {
               title: i18next.t('button.order_init_batch'),
               action: this._openLazadaOrderInitBatch.bind(this),
@@ -97,6 +96,14 @@ class OrderByStore extends localize(i18next)(PageView) {
           ]
           break
         default:
+          actions = [
+            {
+              title: i18next.t('button.order_init_batch'),
+              action: this._openDefaultOrderInitBatch.bind(this),
+              ...CommonButtonStyles.init
+            },
+            ...actions
+          ]
           break
       }
     }
@@ -114,7 +121,7 @@ class OrderByStore extends localize(i18next)(PageView) {
 
     return {
       title: this.store
-        ? `${i18next.t('title.order_by_store')} - ${this.store.name}`
+        ? `${i18next.t('title.order_by_store')} - ${this.store.storeName}`
         : i18next.t('title.order_by_store'),
       actions,
       exportable: {
@@ -144,7 +151,7 @@ class OrderByStore extends localize(i18next)(PageView) {
     this._searchFields = [
       {
         label: i18next.t('field.order_no'),
-        name: 'name',
+        name: 'orderNo',
         type: 'text',
         props: { searchOper: 'i_like' }
       },
@@ -222,6 +229,13 @@ class OrderByStore extends localize(i18next)(PageView) {
           sortable: false,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'newOwnTrackingNo',
+          header: i18next.t('field.own_tracking_no'),
+          sortable: false,
+          width: 130
+        },
         {
           type: 'string',
           name: 'shippingProvider',
@@ -229,6 +243,20 @@ class OrderByStore extends localize(i18next)(PageView) {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'newOwnTransporter',
+          header: i18next.t('field.own_shipping_carrier'),
+          sortable: false,
+          width: 130
+        },
+        {
+          type: 'string',
+          name: 'postCode',
+          header: i18next.t('field.post_code'),
+          sortable: true,
+          width: 130
+        },
         {
           type: 'string',
           name: 'itemCount',
@@ -250,6 +278,13 @@ class OrderByStore extends localize(i18next)(PageView) {
           sortable: true,
           width: 120
         },
+        {
+          type: 'string',
+          name: 'remark',
+          header: i18next.t('field.remark'),
+          sortable: true,
+          width: 200
+        },
         {
           type: 'datetime',
           name: 'orderUpdatedAt',
@@ -266,90 +301,6 @@ class OrderByStore extends localize(i18next)(PageView) {
         }
       ]
     }
-
-    this.excelConfig = {
-      columns: [
-        {
-          type: 'string',
-          name: 'orderNo',
-          header: i18next.t('field.order_no'),
-          sortable: true,
-          width: 130,
-          imex: { header: i18next.t('field.order_no'), key: 'orderNo', width: 50, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'marketplaceStoreName',
-          header: i18next.t('field.store_name'),
-          sortable: true,
-          width: 120,
-          imex: { header: i18next.t('field.store_name'), key: 'marketplaceStoreName', width: 40, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'marketplaceStorePlatform',
-          header: i18next.t('field.platform'),
-          sortable: true,
-          width: 120,
-          imex: { header: i18next.t('field.platform'), key: 'marketplaceStorePlatform', width: 50, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'shippingProvider',
-          header: i18next.t('field.shipping_carrier'),
-          sortable: true,
-          width: 130,
-          imex: { header: i18next.t('field.shipping_carrier'), key: 'shippingProvider', width: 50, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'sku',
-          header: i18next.t('field.sku'),
-          sortable: true,
-          width: 130,
-          imex: { header: i18next.t('field.sku'), key: 'sku', width: 50, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'variationName',
-          header: i18next.t('field.variation_name'),
-          sortable: true,
-          width: 130,
-          imex: { header: i18next.t('field.variation_name'), key: 'variationName', width: 50, type: 'string' }
-        },
-        {
-          type: 'float',
-          name: 'itemQty',
-          header: i18next.t('field.qty'),
-          sortable: true,
-          width: 100,
-          imex: { header: i18next.t('field.qty'), key: 'itemQty', width: 20, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'status',
-          header: i18next.t('field.status'),
-          sortable: true,
-          width: 120,
-          imex: { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' }
-        },
-        {
-          type: 'string',
-          name: 'trackingNo',
-          header: i18next.t('field.tracking_no'),
-          sortable: true,
-          width: 120,
-          imex: { header: i18next.t('field.tracking_no'), key: 'trackingNo', width: 50, type: 'string' }
-        },
-        {
-          type: 'datetime',
-          name: 'updatedAt',
-          header: i18next.t('field.last_updated'),
-          sortable: true,
-          width: 180
-        }
-      ]
-    }
   }
 
   async pageUpdated(changes, lifecycle) {
@@ -390,6 +341,8 @@ class OrderByStore extends localize(i18next)(PageView) {
             id
             name
             platform
+            isOwnTransport
+            storeName
             storeId
             status
           }
@@ -408,7 +361,7 @@ class OrderByStore extends localize(i18next)(PageView) {
 
     if (this.store) {
       filters.push({
-        name: 'marketplaceStore',
+        name: 'marketplaceStoreId',
         operator: 'eq',
         value: this.store.id
       })
@@ -428,6 +381,7 @@ class OrderByStore extends localize(i18next)(PageView) {
                 id
                 name
                 platform
+                isOwnTransport
                 description
               }
               marketplaceOrderItems {
@@ -447,6 +401,15 @@ class OrderByStore extends localize(i18next)(PageView) {
                   phone2
                   attentionTo
                   trackingNo
+                  ownTrackingNo
+                  totalWeight
+                  weightUnit
+                  totalVolume
+                  volumeUnit
+                  transporter
+                  ownTransporter
+                  orderNoRef
+                  subOrderNoRef
                 }
                 marketplaceProductVariation {
                   marketplaceProduct {
@@ -460,12 +423,14 @@ class OrderByStore extends localize(i18next)(PageView) {
                 paidPrice
               }
               orderNo
+              remark
               type
               paymentMethod
               status
               itemCount
               releaseOrderId
               totalAmount
+              shippingProvider
               orderCreatedAt
               orderUpdatedAt
               updatedAt
@@ -482,7 +447,10 @@ class OrderByStore extends localize(i18next)(PageView) {
       marketplaceOrders = marketplaceOrders.map(item => {
         return {
           ...item,
-          newTrackingNo: this.getTrackingNos(item.marketplaceOrderItems)
+          newTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'trackingNo'),
+          newOwnTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'ownTrackingNo'),
+          newOwnTransporter: this.getOrderShippingInformation(item.marketplaceOrderItems, 'ownTransporter'),
+          postCode: this.getOrderShippingInformation(item.marketplaceOrderItems, 'postCode')
         }
       })
 
@@ -493,8 +461,8 @@ class OrderByStore extends localize(i18next)(PageView) {
     }
   }
 
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -509,23 +477,48 @@ class OrderByStore extends localize(i18next)(PageView) {
       return marketplaceOrderShippings.find(a => a.id === id)
     })
 
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        if (this.store?.platform === PLATFORM.LAZADA.value) {
-          var newTrackingNo = []
-          if (marketplaceOrderShipping?.trackingNo) {
-            const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
-            newTrackingNo = trackingNos.map(item => item.tracking_code)
-          }
-          let uniqueTrackingNos = [...new Set(newTrackingNo)]
-          trackingNo = uniqueTrackingNos.join(', ')
-        } else {
-          trackingNo = marketplaceOrderShipping.trackingNo
+    switch (type) {
+      case 'trackingNo':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            if (this.store?.platform === PLATFORM.LAZADA.value) {
+              var newTrackingNo = []
+              if (marketplaceOrderShipping?.trackingNo) {
+                const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
+                newTrackingNo = trackingNos.map(item => item.tracking_code)
+              }
+              let uniqueTrackingNos = [...new Set(newTrackingNo)]
+              item = uniqueTrackingNos.join(', ')
+            } else {
+              item = marketplaceOrderShipping.trackingNo
+            }
+          })
         }
-      })
+        break
+      case 'ownTrackingNo':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            item = marketplaceOrderShipping.ownTrackingNo
+          })
+        }
+        break
+      case 'ownTransporter':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            item = marketplaceOrderShipping.ownTransporter
+          })
+        }
+        break
+      case 'postCode':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            item = marketplaceOrderShipping.postCode
+          })
+        }
+        break
     }
 
-    return trackingNo
+    return item
   }
 
   _syncOrder() {
@@ -575,7 +568,7 @@ class OrderByStore extends localize(i18next)(PageView) {
         backdrop: true,
         escapable: false,
         size: 'large',
-        title: `${record.name}`
+        title: `${record.orderNo}`
       }
     )
   }
@@ -600,7 +593,27 @@ class OrderByStore extends localize(i18next)(PageView) {
     )
   }
 
-  _openLazadaOrderInitBatch(record) {
+  _openDefaultOrderInitBatch() {
+    openPopup(
+      html`
+        <batch-init-popup
+          .store="${this.store}"
+          @order-updated="${() => {
+            this.dataGrist.fetch()
+            this._showToast({ message: i18next.t('text.order_has_been_updated') })
+          }}"
+        ></batch-init-popup>
+      `,
+      {
+        backdrop: true,
+        escapable: false,
+        size: 'large',
+        title: i18next.t('text.order_init_batch')
+      }
+    )
+  }
+
+  _openLazadaOrderInitBatch() {
     openPopup(
       html`
         <lazada-order-init-batch-popup
@@ -696,6 +709,7 @@ class OrderByStore extends localize(i18next)(PageView) {
           } else {
             switch (this.store.platform) {
               case 'shopee':
+              case 'woocommerce':
                 const orderDocUrls = orderDocInfo.map(item => item.airwayBill)
                 for (var i = 0; i < orderDocUrls.length; i++) {
                   orderDocUrls[i] = 'urls=' + orderDocUrls[i]
@@ -709,6 +723,9 @@ class OrderByStore extends localize(i18next)(PageView) {
                 var decodedHTML = atob(orderDocInfo[0].file)
                 this._callPrintDialog(decodedHTML)
                 break
+
+              default:
+                break
             }
           }
         }
@@ -718,28 +735,30 @@ class OrderByStore extends localize(i18next)(PageView) {
     }
   }
 
-  _callPrintDialog(contentSource) {
+  async _callPrintDialog(contentSource) {
     const iframe = document.createElement('iframe')
     iframe.style.display = 'none'
     document.body.appendChild(iframe)
 
     switch (this.store.platform) {
       case 'shopee':
-        iframe.src = contentSource
-        iframe.onload = () => {
-          iframe.focus()
-          iframe.contentWindow.print()
-          this._showToast({ message: i18next.t('text.document_has_been_generated') })
-        }
+      default:
+        GhostPrint.print({
+          src: contentSource,
+          onfinish: () => {
+            this._showToast({ message: i18next.t('text.document_has_been_generated') })
+          }
+        })
         break
 
       case 'lazada':
-        iframe.contentDocument.body.innerHTML = contentSource
-        setTimeout(() => {
-          iframe.focus()
-          iframe.contentWindow.print()
-          this._showToast({ message: i18next.t('text.document_has_been_generated') })
-        }, 1000)
+        GhostPrint.print({
+          srcdoc: contentSource,
+          pending: 1000,
+          onfinish: () => {
+            this._showToast({ message: i18next.t('text.document_has_been_generated') })
+          }
+        })
         break
     }
   }
@@ -748,8 +767,8 @@ class OrderByStore extends localize(i18next)(PageView) {
     try {
       const response = await client.query({
         query: gql`
-          query marketplaceOrdersForExport($orderNo: String!) {
-            marketplaceOrdersForExport(orderNo: $orderNo) {
+          query marketplaceOrdersForExport($orderNos: [String!]!) {
+            marketplaceOrdersForExport(orderNos: $orderNos) {
               orderNo
               marketplaceStoreName
               marketplaceStorePlatform
@@ -759,10 +778,12 @@ class OrderByStore extends localize(i18next)(PageView) {
               status
               shippingProvider
               trackingNo
+              createdAt
+              updatedAt
             }
           }
         `,
-        variables: { orderNo: selectedOrderNo }
+        variables: { orderNos: selectedOrderNo }
       })
 
       if (!response.errors) {
@@ -777,12 +798,18 @@ class OrderByStore extends localize(i18next)(PageView) {
     try {
       let records = []
       if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
-        let header = [
-          ...this.excelConfig.columns
-            .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
-            .map(column => {
-              return column.imex
-            })
+        const headerSetting = [
+          { header: i18next.t('field.order_no'), key: 'orderNo', width: 75, type: 'string' },
+          { header: i18next.t('field.store_name'), key: 'marketplaceStoreName', width: 75, type: 'string' },
+          { header: i18next.t('field.platform'), key: 'marketplaceStorePlatform', width: 75, type: 'string' },
+          { header: i18next.t('field.sku'), key: 'sku', width: 75, type: 'string' },
+          { header: i18next.t('field.variation_name'), key: 'variationName', width: 75, type: 'string' },
+          { header: i18next.t('field.tracking_no'), key: 'trackingNo', width: 75, type: 'string' },
+          { header: i18next.t('field.shipping_carrier'), key: 'shippingProvider', width: 75, type: 'string' },
+          { header: i18next.t('field.qty'), key: 'itemQty', width: 75, type: 'number' },
+          { header: i18next.t('field.status'), key: 'status', width: 75, type: 'string' },
+          { header: i18next.t('field.created_at'), key: 'createdAt', width: 75, type: 'date' },
+          { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 75, type: 'date' }
         ]
 
         records = this.dataGrist.selected
@@ -790,7 +817,7 @@ class OrderByStore extends localize(i18next)(PageView) {
 
         let data = await this._fetchOrdersForExport(selectedOrderNo)
 
-        return { header, data }
+        return { header: headerSetting, data }
       }
     } catch (e) {
       this._showToast(e)

package/client/pages/setting/marketplace-setting.js

@@ -4,6 +4,7 @@ import { connect } from 'pwa-helpers/connect-mixin.js'
 import { client, store, PageView } from '@things-factory/shell'
 import gql from 'graphql-tag'
 import '../../components/stock-allocation-ratio'
+import '../../components/marketplace-order-max-weight'
 
 class MarketplaceSetting extends connect(store)(PageView) {
   static get styles() {
@@ -55,10 +56,20 @@ class MarketplaceSetting extends connect(store)(PageView) {
 
       <stock-allocation-ratio
         .ratioSettings=${ratioSettings.filter(setting => setting.category === 'stock_allocation')}
+        .category=${'stock_allocation'}
         @fetch-settings=${async () => {
           this.ratioSettings = await this.fetchMarketplaceSettings()
         }}
       ></stock-allocation-ratio>
+
+      <div subtitle>${i18next.t('text.update_marketplace_order_max_weight')}</div>
+
+      <marketplace-order-max-weight
+        .maxWeightSettings=${ratioSettings.filter(setting => setting.category === 'marketplace_order_max_weight')}
+        @fetch-settings=${async () => {
+          this.ratioSettings = await this.fetchMarketplaceSettings()
+        }}
+      ></marketplace-order-max-weight>
     `
   }
 
@@ -135,6 +146,7 @@ class MarketplaceSetting extends connect(store)(PageView) {
               marketplaceStore {
                 id
                 name
+                storeName
                 platform
                 description
               }

package/dist-server/graphql/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

package/dist-server/graphql/resolvers/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };