@things-factory/operato-mms 3.6.4 → 3.6.9

package/Dockerfile

@@ -10,7 +10,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -o Acquire::CompressionTypes::Order::=gz
 RUN apt-get upgrade -y
 
-RUN echo "deb http://ftp.de.debian.org/debian sid main" > /etc/apt/sources.list
+RUN echo "deb http://ftp.de.debian.org/debian stable main" > /etc/apt/sources.list
 
 RUN apt-get update
 

package/client/pages/order/logistics/batch-init-popup.js

@@ -207,6 +207,15 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
           sortable: false,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'ownTrackingNo',
+          header: i18next.t('field.own_tracking_no'),
+          record: { editable: true },
+          label: true,
+          sortable: false,
+          width: 130
+        },
         {
           type: 'string',
           name: 'shippingProvider',
@@ -215,6 +224,14 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'ownShippingProvider',
+          header: i18next.t('field.own_shipping_carrier'),
+          label: true,
+          sortable: true,
+          width: 130
+        },
         {
           type: 'number',
           name: 'totalVolume',
@@ -313,7 +330,11 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
               phone2
               attentionTo
               trackingNo
+              ownTrackingNo
+              transporter
+              ownTransporter
               orderNoRef
+              subOrderNoRef
               totalWeight
               weightUnit
               totalVolume
@@ -363,88 +384,14 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
             return {
               ...itm,
               status: itm.marketplaceOrder.status,
-              shippingProvider: itm.transporter
+              shippingProvider: itm.transporter,
+              ownShippingProvider: itm.ownTransporter
             }
           }) || []
       }
     }
   }
 
-  getTotalWeight(marketplaceOrderItems) {
-    let totalWeight = 0
-    let marketplaceOrderShippings = []
-
-    marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
-
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
-    })
-
-    const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
-      return marketplaceOrderShippings.find(a => a.id === id)
-    })
-
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        totalWeight += marketplaceOrderShipping.totalWeight
-      })
-    }
-
-    return parseFloat(totalWeight) || 0
-  }
-
-  getTotalVolume(marketplaceOrderItems) {
-    let totalVolume = 0
-    let marketplaceOrderShippings = []
-
-    marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
-
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
-    })
-
-    const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
-      return marketplaceOrderShippings.find(a => a.id === id)
-    })
-
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        totalVolume += marketplaceOrderShipping.totalVolume
-      })
-    }
-
-    return parseFloat(totalVolume) || 0
-  }
-
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
-    let marketplaceOrderShippings = []
-
-    marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
-
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
-    })
-
-    const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
-      return marketplaceOrderShippings.find(a => a.id === id)
-    })
-
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        trackingNo = marketplaceOrderShipping.trackingNo
-      })
-    }
-
-    return trackingNo
-  }
-
   async fetchShippingProvider() {
     const filters = []
     const response = await client.query({
@@ -510,7 +457,8 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
         if (selectedData.find(selected => selected.id == item.id) && shippingProviderValue) {
           return {
             ...item,
-            shippingProvider: shippingProviderValue
+            shippingProvider: shippingProviderValue,
+            ownShippingProvider: shippingProviderValue
           }
         } else {
           return item

package/client/pages/order/logistics/lazada-order-init-batch-popup.js

@@ -68,6 +68,24 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     return html`
       <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.grist.fetch()}></search-form>
 
+      <div name="batchUpdate" class="multi-column-form">
+        <label>${i18next.t('label.own_shipping_provider')}</label>
+        <select name="ownShippingProvider-select">
+          <option value="">${i18next.t('text.select_courier')}</option>
+          ${(this.ownShippingProviders || []).map(
+            shippingProvider => html` <option value="${shippingProvider.name}">${shippingProvider.name}</option> `
+          )}
+        </select>
+
+        <div class="set-button-container">
+          <mwc-button
+            @click="${e => this.setShippingProvider()}"
+            raised
+            label="${i18next.t('button.set')}"
+          ></mwc-button>
+        </div>
+      </div>
+
       <div class="grist">
         <data-grist
           id="grist"
@@ -108,10 +126,27 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     return this.shadowRoot.querySelector('select[name=pickupdate-select]')
   }
 
+  get ownShippingProviderSelect() {
+    return this.shadowRoot.querySelector('select[name=ownShippingProvider-select]')
+  }
+
   get gristConfig() {
+    const maxWeight = this.maxWeightSetting[0].value
     return {
       list: { fields: ['name', 'marketplaceStore', 'itemCount', 'totalAmount', 'status', 'updatedAt'] },
-      rows: { selectable: { multiple: true }, appendable: false },
+      rows: {
+        selectable: { multiple: true },
+        appendable: false,
+        classifier: function (record, rowIndex) {
+          const totalWeight = record['totalWeight']
+          var emphasized
+          if (totalWeight > maxWeight) {
+            emphasized = ['#F43838', 'yellow']
+          }
+
+          return { emphasized }
+        }
+      },
       pagination: { infinite: true },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -142,6 +177,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'ownShippingProvider',
+          header: i18next.t('field.own_shipping_carrier'),
+          sortable: true,
+          width: 130
+        },
         {
           type: 'string',
           name: 'itemCount',
@@ -156,6 +198,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
           sortable: true,
           width: 100
         },
+        {
+          type: 'float',
+          name: 'totalWeight',
+          header: i18next.t('field.total_weight'),
+          sortable: true,
+          width: 100
+        },
         {
           type: 'string',
           name: 'status',
@@ -275,6 +324,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
                   phone2
                   attentionTo
                   trackingNo
+                  ownTrackingNo
+                  transporter
+                  ownTransporter
+                  totalWeight
+                  weightUnit
+                  totalVolume
+                  volumeUnit
                 }
                 marketplaceProductVariation {
                   name
@@ -288,10 +344,12 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
               status
               itemCount
               shippingProvider
+              ownShippingProvider
               totalAmount
               orderCreatedAt
               orderUpdatedAt
               trackingNo
+              ownTrackingNo
               updatedAt
               fullLogisticsDetail {
                 pickup
@@ -336,7 +394,10 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
       marketplaceOrders = marketplaceOrders.map(item => {
         return {
           ...item,
-          trackingNo: this.getTrackingNos(item.marketplaceOrderItems)
+          trackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'trackingNo'),
+          ownTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'ownTrackingNo'),
+          totalWeight: this.getOrderShippingInformation(item.marketplaceOrderItems, 'totalWeight'),
+          totalVolume: this.getOrderShippingInformation(item.marketplaceOrderItems, 'totalVolume')
         }
       })
 
@@ -350,8 +411,8 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -366,28 +427,73 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
       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 => {
+            if (this.store?.platform === PLATFORM.LAZADA.value) {
+              var newTrackingNo = []
+              if (marketplaceOrderShipping?.ownTrackingNo) {
+                const trackingNos = JSON.parse(marketplaceOrderShipping.ownTrackingNo)
+                newTrackingNo = trackingNos.map(item => item.tracking_code)
+              }
+              let uniqueTrackingNos = [...new Set(newTrackingNo)]
+              item = uniqueTrackingNos.join(', ')
+            } else {
+              item = marketplaceOrderShipping.ownTrackingNo
+            }
+          })
+        }
+        break
+      case 'totalVolume':
+        let totalVolume = 0
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            totalVolume += marketplaceOrderShipping?.totalVolume || 0
+          })
+        }
+
+        item = parseFloat(totalVolume) || 0
+        break
+      case 'totalWeight':
+        let totalWeight = 0
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            totalWeight += marketplaceOrderShipping?.totalWeight
+          })
+        }
+        item = parseFloat(totalWeight) || 0
+        break
     }
 
-    return trackingNo
+    return item
   }
 
   async _marketplaceLogisticsInitParam() {
     this.shippingProviders = await this.fetchShippingProvider()
     this.deliveryTypes = [{ name: 'dropship', description: 'dropship' }]
+    this.ownShippingProviders = [{ name: 'SeeBuu Logistics' }]
+    this.marketplaceSettings = await this.fetchMarketplaceSettings()
+    this.maxWeightSetting = this.marketplaceSettings.filter(
+      setting => setting.category === 'marketplace_order_max_weight'
+    )
   }
 
   async fetchShippingProvider() {
@@ -412,6 +518,74 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
+  async fetchMarketplaceSettings() {
+    const filters = []
+    const sortings = []
+
+    const response = await client.query({
+      query: gql`
+        query marketplaceSettings($filters: [Filter], $sortings: [Sorting]) {
+          marketplaceSettings(filters: $filters, sortings: $sortings) {
+            items {
+              id
+              name
+              marketplaceStore {
+                id
+                name
+                storeName
+                platform
+                description
+              }
+              category
+              value
+              updatedAt
+            }
+            total
+          }
+        }
+      `,
+      variables: { filters, sortings }
+    })
+
+    if (!response.error) {
+      return response.data.marketplaceSettings.items || []
+    }
+  }
+
+  async setShippingProvider() {
+    try {
+      let selectedData = this.grist.selected
+      if (!selectedData?.length) throw new Error('please select at least one order')
+
+      const ownShippingProviderValue = this.ownShippingProviderSelect?.value
+      if (!ownShippingProviderValue) throw new Error('Own Shipping provider selection is required')
+
+      const patches = selectedData.map(patch => {
+        return {
+          id: patch.id,
+          orderNo: patch.orderNo,
+          ownShippingProvider: ownShippingProviderValue
+        }
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation setOwnShippingProviderByOrders($patches: [LogisticsInfo]!) {
+            setOwnShippingProviderByOrders(patches: $patches)
+          }
+        `,
+        variables: { patches }
+      })
+
+      if (!response.errors) {
+        await this.fetchHandler({ page: 1, limit: 100 })
+        this._initGrist()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async initLogistics() {
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
@@ -519,13 +693,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  _validateInit(data) {
+  _validateSplitting(data) {
     if (!data) {
-      throw new Error('No order to initiate logistics')
+      throw new Error('No order to split')
     }
 
-    if (!this.shippingProviderInput?.value || this.shippingProviderInput.value == '') {
-      throw new Error('Shipping provider selection is required for initiate logistics')
+    if (data.some(item => item.trackingNo)) {
+      throw new Error('Order with tracking no not allowed to split')
     }
   }
 

package/client/pages/order/logistics/order-shipping-items.js

@@ -108,6 +108,12 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
               <input type="text" name="trackingNo" readonly />
             </label>
           </div>
+          <div field>
+            <label
+              >${i18next.t('label.own_tracking_no')}
+              <input type="text" name="ownTrackingNo" readonly />
+            </label>
+          </div>
           <div field>
             <label
               >${i18next.t('label.phone')} 1
@@ -186,6 +192,12 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
               <input type="text" name="transporter" readonly />
             </label>
           </div>
+          <div field>
+            <label
+              >${i18next.t('label.own_shipping_provider')}
+              <input type="text" name="ownTransporter" readonly />
+            </label>
+          </div>
         </div>
       </form>
 
@@ -263,6 +275,10 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
           marketplaceOrderShipping(name: $name) {
             id
             name
+            trackingNo
+            ownTrackingNo
+            transporter
+            ownTransporter
             marketplaceOrderItems {
               marketplaceProductVariation {
                 marketplaceProduct {

package/client/pages/order/logistics/order-shipping.js

@@ -65,8 +65,9 @@ class OrderShipping extends localize(i18next)(LitElement) {
         .data="${infoSet}"
         @tabChanged="${e => (this.currentTab = e.detail.currentTabKey)}"
         .headerRenderer=${shipping => {
-          return html`${shipping.attentionTo} ( ${shipping.postCode}, ${shipping.city} ) - ${shipping.totalWeight}
-          ${shipping.weightUnit}`
+          return html`[Order No]: ${shipping?.subOrderNoRef ? shipping.subOrderNoRef : shipping.orderNoRef} [Attention
+          To]: ${shipping.attentionTo} [Address]: ${shipping.postCode}, ${shipping.city} [Weight]:
+          ${shipping.totalWeight} ${shipping.weightUnit}`
         }}
         .contentRenderer="${shipping =>
           html`<order-shipping-items

package/client/pages/order/logistics/shopee-order-init-batch-popup.js

@@ -23,12 +23,15 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
       _searchFields: Array,
       store: Object,
       marketplaceSettings: Array,
-      maxWeightSetting: Object
+      maxWeightSetting: Object,
+      ownShippingProviders: Array,
+      shippingProviders: Array
     }
   }
 
   constructor() {
     super()
+    this._searchFields = []
     this.addressList = []
     this.timeSlotList = []
     this.branchList = []
@@ -77,6 +80,25 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     return html`
       <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.grist.fetch()}></search-form>
 
+      ${this._type === 'non_integrated'
+        ? html`<div name="batchUpdate" class="multi-column-form">
+            <label>${i18next.t('label.own_shipping_provider')}</label>
+            <select name="ownShippingProvider-select">
+              <option value="">${i18next.t('text.select_courier')}</option>
+              ${(this.ownShippingProviders || []).map(
+                shippingProvider => html` <option value="${shippingProvider.name}">${shippingProvider.name}</option> `
+              )}
+            </select>
+
+            <div class="set-button-container">
+              <mwc-button
+                @click="${e => this.setShippingProvider()}"
+                raised
+                label="${i18next.t('button.set')}"
+              ></mwc-button>
+            </div>
+          </div>`
+        : ''}
       ${this._type === 'pickup'
         ? html` <div name="batchUpdate" class="multi-column-form">
             <label>${i18next.t('label.address')}</label>
@@ -142,6 +164,10 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     return this.shadowRoot.querySelector('select[name=pickupdate-select]')
   }
 
+  get ownShippingProviderSelect() {
+    return this.shadowRoot.querySelector('select[name=ownShippingProvider-select]')
+  }
+
   get gristConfig() {
     const maxWeight = this.maxWeightSetting[0].value
     return {
@@ -202,6 +228,13 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'ownShippingProvider',
+          header: i18next.t('field.own_shipping_carrier'),
+          sortable: true,
+          width: 130
+        },
         {
           type: 'string',
           name: 'itemCount',
@@ -214,21 +247,21 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
           name: 'totalAmount',
           header: i18next.t('field.total_amount'),
           sortable: true,
-          width: 100
+          width: 80
         },
         {
           type: 'number',
           name: 'totalVolume',
           header: i18next.t('field.total_volume'),
           label: true,
-          width: 120
+          width: 80
         },
         {
           type: 'number',
           name: 'totalWeight',
           header: i18next.t('field.total_weight'),
           label: true,
-          width: 120
+          width: 80
         },
         {
           type: 'string',
@@ -242,11 +275,13 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
   }
 
   async firstUpdated() {
-    const shippingProviders = await this.fetchShippingProvider()
+    this.ownShippingProviders = [{ name: 'SeeBuu Logistics' }]
+    this.shippingProviders = await this.fetchShippingProvider()
     this.marketplaceSettings = await this.fetchMarketplaceSettings()
     this.maxWeightSetting = this.marketplaceSettings.filter(
       setting => setting.category === 'marketplace_order_max_weight'
     )
+
     await this.fetchHandler({ page: 1, limit: 100 })
     this._initGrist()
 
@@ -273,7 +308,7 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
         type: 'select',
         options: [
           { value: '' },
-          ...shippingProviders.map(shippingProvider => {
+          ...this.shippingProviders.map(shippingProvider => {
             return {
               name: shippingProvider.name,
               value: shippingProvider.name
@@ -339,6 +374,9 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
                     phone2
                     attentionTo
                     trackingNo
+                    ownTrackingNo
+                    transporter
+                    ownTransporter
                     totalWeight
                     weightUnit
                     totalVolume
@@ -356,10 +394,12 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
                 status
                 itemCount
                 shippingProvider
+                ownShippingProvider
                 totalAmount
                 orderCreatedAt
                 orderUpdatedAt
                 trackingNo
+                ownTrackingNo
                 updatedAt
                 fullLogisticsDetail {
                   pickup
@@ -403,9 +443,10 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
         const marketplaceOrders = response.data.marketplaceOrdersForBatchInit.items.map(item => {
           return {
             ...item,
-            trackingNo: this.getTrackingNos(item.marketplaceOrderItems),
-            totalWeight: this.getTotalWeight(item.marketplaceOrderItems),
-            totalVolume: this.getTotalVolume(item.marketplaceOrderItems)
+            trackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'trackingNo'),
+            ownTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'ownTrackingNo'),
+            totalWeight: this.getOrderShippingInformation(item.marketplaceOrderItems, 'totalWeight'),
+            totalVolume: this.getOrderShippingInformation(item.marketplaceOrderItems, 'totalVolume')
           }
         })
 
@@ -498,8 +539,8 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     return logisticsParam
   }
 
-  getTotalWeight(marketplaceOrderItems) {
-    let totalWeight = 0
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -514,73 +555,63 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
       return marketplaceOrderShippings.find(a => a.id === id)
     })
 
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        totalWeight += marketplaceOrderShipping.totalWeight
-      })
-    }
-
-    return parseFloat(totalWeight) || 0
-  }
-
-  getTotalVolume(marketplaceOrderItems) {
-    let totalVolume = 0
-    let marketplaceOrderShippings = []
-
-    marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
-
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
-    })
-
-    const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
-      return marketplaceOrderShippings.find(a => a.id === id)
-    })
-
-    if (uniqueMarketplaceOrderShippings) {
-      uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
-        totalVolume += marketplaceOrderShipping.totalVolume
-      })
-    }
-
-    return parseFloat(totalVolume) || 0
-  }
-
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
-    let marketplaceOrderShippings = []
-
-    marketplaceOrderItems.map(item => {
-      const marketplaceOrderShipping = item.marketplaceOrderShipping
-
-      if (marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(marketplaceOrderShipping)
-      }
-    })
-
-    const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
-      return marketplaceOrderShippings.find(a => a.id === id)
-    })
+    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 => {
+            if (this.store?.platform === PLATFORM.LAZADA.value) {
+              var newTrackingNo = []
+              if (marketplaceOrderShipping?.ownTrackingNo) {
+                const trackingNos = JSON.parse(marketplaceOrderShipping.ownTrackingNo)
+                newTrackingNo = trackingNos.map(item => item.tracking_code)
+              }
+              let uniqueTrackingNos = [...new Set(newTrackingNo)]
+              item = uniqueTrackingNos.join(', ')
+            } else {
+              item = marketplaceOrderShipping.ownTrackingNo
+            }
+          })
+        }
+        break
+      case 'totalVolume':
+        let totalVolume = 0
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            totalVolume += marketplaceOrderShipping?.totalVolume || 0
+          })
+        }
 
-    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
+        item = parseFloat(totalVolume) || 0
+        break
+      case 'totalWeight':
+        let totalWeight = 0
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            totalWeight += marketplaceOrderShipping?.totalWeight
+          })
         }
-      })
+        item = parseFloat(totalWeight) || 0
+        break
     }
 
-    return trackingNo
+    return item
   }
 
   _initGrist() {
@@ -727,6 +758,40 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
+  async setShippingProvider() {
+    try {
+      let selectedData = this.grist.selected
+      if (!selectedData?.length) throw new Error('please select at least one order')
+
+      const ownShippingProviderValue = this.ownShippingProviderSelect?.value
+      if (!ownShippingProviderValue) throw new Error('Own Shipping provider selection is required')
+
+      const patches = selectedData.map(patch => {
+        return {
+          id: patch.id,
+          orderNo: patch.orderNo,
+          ownShippingProvider: ownShippingProviderValue
+        }
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation setOwnShippingProviderByOrders($patches: [LogisticsInfo]!) {
+            setOwnShippingProviderByOrders(patches: $patches)
+          }
+        `,
+        variables: { patches }
+      })
+
+      if (!response.errors) {
+        await this.fetchHandler({ page: 1, limit: 100 })
+        this._initGrist()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async initLogistics() {
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
@@ -740,6 +805,7 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     try {
       let selectedData = this.grist.selected
       let deliveryType = this.searchForm.queryFilters.find(itm => itm.name == 'logisticsType')?.value
+      let shippingProvider = this.searchForm.queryFilters.find(itm => itm.name == 'shippingProvider')?.value
       let patches = []
       this._validateInit(selectedData)
 
@@ -778,7 +844,9 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
             id: patch.id,
             orderNo: patch.orderNo,
             deliveryType,
-            trackingNo: patch.trackingNo
+            trackingNo: patch.trackingNo,
+            ownTrackingNo: patch.ownTrackingNo,
+            shippingProvider
           }
         })
       }
@@ -895,9 +963,9 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
             return { ...item, ...updateData }
           })
         ]
-      }
 
-      this.grist.refresh()
+        this.grist.refresh()
+      }
     } catch (e) {
       this._showToast(e)
     }
@@ -922,6 +990,17 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
 
     if (this._type == 'non_integrated') {
+      let deliveryType = this.searchForm.queryFilters.find(itm => itm.name == 'logisticsType')?.value
+      let shippingProvider = this.searchForm.queryFilters.find(itm => itm.name == 'shippingProvider')?.value
+
+      if (!shippingProvider || shippingProvider === '') {
+        throw new Error('Shipping provider selection is required for initiate logistics')
+      }
+
+      if (!deliveryType || deliveryType === '') {
+        throw new Error('Delivery type selection is required for initiate logistics')
+      }
+
       patches.forEach(itm => {
         if (!itm?.trackingNo) throw new Error(i18next.t('text.tracking_is_required'))
       })
@@ -958,16 +1037,6 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  _validateInit(data) {
-    if (!data) {
-      throw new Error('No order to initiate logistics')
-    }
-
-    if (!this.shippingProviderInput?.value || this.shippingProviderInput.value == '') {
-      throw new Error('Shipping provider selection is required for initiate logistics')
-    }
-  }
-
   _validateSplitting(data) {
     if (!data) {
       throw new Error('No order to split')

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

@@ -370,11 +370,15 @@ class OrderByStore extends localize(i18next)(PageView) {
                   phone2
                   attentionTo
                   trackingNo
+                  ownTrackingNo
                   totalWeight
                   weightUnit
                   totalVolume
                   volumeUnit
                   transporter
+                  ownTransporter
+                  orderNoRef
+                  subOrderNoRef
                 }
                 marketplaceProductVariation {
                   marketplaceProduct {
@@ -504,7 +508,7 @@ class OrderByStore extends localize(i18next)(PageView) {
         backdrop: true,
         escapable: false,
         size: 'large',
-        title: `${record.name}`
+        title: `${record.orderNo}`
       }
     )
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-mms",
-  "version": "3.6.4",
+  "version": "3.6.9",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,68 +41,68 @@
     "@material/mwc-formfield": "^0.22.1",
     "@material/mwc-linear-progress": "^0.22.1",
     "@material/mwc-radio": "^0.22.1",
-    "@things-factory/apptool-ui": "^3.6.4",
-    "@things-factory/attachment-base": "^3.6.4",
-    "@things-factory/auth-ui": "^3.6.4",
-    "@things-factory/biz-base": "^3.6.4",
-    "@things-factory/board-service": "^3.6.4",
-    "@things-factory/board-ui": "^3.6.4",
-    "@things-factory/code-ui": "^3.6.4",
-    "@things-factory/context-ui": "^3.6.4",
-    "@things-factory/dashboard": "^3.6.4",
-    "@things-factory/export-ui": "^3.6.4",
-    "@things-factory/export-ui-csv": "^3.6.4",
-    "@things-factory/export-ui-excel": "^3.6.4",
-    "@things-factory/geography": "^3.6.4",
-    "@things-factory/grist-ui": "^3.6.4",
-    "@things-factory/help": "^3.6.4",
-    "@things-factory/i18n-ui": "^3.6.4",
-    "@things-factory/integration-fulfillment": "^3.6.4",
-    "@things-factory/integration-lmd": "^3.6.4",
-    "@things-factory/lite-menu": "^3.6.4",
-    "@things-factory/marketplace-base": "^3.6.4",
-    "@things-factory/more-ui": "^3.6.4",
-    "@things-factory/notification": "^3.6.4",
-    "@things-factory/oauth2-client": "^3.6.4",
-    "@things-factory/pdf": "^3.6.0",
-    "@things-factory/product-base": "^3.6.4",
-    "@things-factory/resource-ui": "^3.6.4",
-    "@things-factory/scene-chartjs": "^3.6.0",
-    "@things-factory/scene-clock": "^3.6.0",
-    "@things-factory/scene-clone": "^3.6.0",
-    "@things-factory/scene-compass": "^3.6.0",
-    "@things-factory/scene-data-transform": "^3.6.0",
-    "@things-factory/scene-excel": "^3.6.0",
-    "@things-factory/scene-firebase": "^3.6.0",
-    "@things-factory/scene-form": "^3.6.0",
-    "@things-factory/scene-gauge": "^3.6.0",
-    "@things-factory/scene-google-map": "^3.6.0",
-    "@things-factory/scene-graphql": "^3.6.0",
-    "@things-factory/scene-grist": "^3.6.4",
-    "@things-factory/scene-half-roundrect": "^3.6.0",
-    "@things-factory/scene-indoor-map": "^3.6.0",
-    "@things-factory/scene-integration": "^3.6.0",
-    "@things-factory/scene-label": "^3.6.4",
-    "@things-factory/scene-legend": "^3.6.0",
-    "@things-factory/scene-marker": "^3.6.0",
-    "@things-factory/scene-mqtt": "^3.6.0",
-    "@things-factory/scene-news-ticker": "^3.6.0",
-    "@things-factory/scene-progressbar": "^3.6.0",
-    "@things-factory/scene-random": "^3.6.0",
-    "@things-factory/scene-restful": "^3.6.0",
-    "@things-factory/scene-switch": "^3.6.0",
-    "@things-factory/scene-tab": "^3.6.0",
-    "@things-factory/scene-table": "^3.6.0",
-    "@things-factory/scene-timer": "^3.6.0",
-    "@things-factory/scene-visualizer": "^3.6.0",
-    "@things-factory/scene-wheel-sorter": "^3.6.0",
-    "@things-factory/setting-ui": "^3.6.4",
-    "@things-factory/system-ui": "^3.6.4",
-    "@things-factory/warehouse-base": "^3.6.4"
+    "@things-factory/apptool-ui": "^3.6.7",
+    "@things-factory/attachment-base": "^3.6.7",
+    "@things-factory/auth-ui": "^3.6.7",
+    "@things-factory/biz-base": "^3.6.7",
+    "@things-factory/board-service": "^3.6.7",
+    "@things-factory/board-ui": "^3.6.7",
+    "@things-factory/code-ui": "^3.6.7",
+    "@things-factory/context-ui": "^3.6.7",
+    "@things-factory/dashboard": "^3.6.7",
+    "@things-factory/export-ui": "^3.6.7",
+    "@things-factory/export-ui-csv": "^3.6.7",
+    "@things-factory/export-ui-excel": "^3.6.7",
+    "@things-factory/geography": "^3.6.7",
+    "@things-factory/grist-ui": "^3.6.7",
+    "@things-factory/help": "^3.6.7",
+    "@things-factory/i18n-ui": "^3.6.7",
+    "@things-factory/integration-fulfillment": "^3.6.8",
+    "@things-factory/integration-lmd": "^3.6.7",
+    "@things-factory/lite-menu": "^3.6.7",
+    "@things-factory/marketplace-base": "^3.6.8",
+    "@things-factory/more-ui": "^3.6.7",
+    "@things-factory/notification": "^3.6.7",
+    "@things-factory/oauth2-client": "^3.6.7",
+    "@things-factory/pdf": "^3.6.7",
+    "@things-factory/product-base": "^3.6.7",
+    "@things-factory/resource-ui": "^3.6.7",
+    "@things-factory/scene-chartjs": "^3.6.7",
+    "@things-factory/scene-clock": "^3.6.7",
+    "@things-factory/scene-clone": "^3.6.7",
+    "@things-factory/scene-compass": "^3.6.7",
+    "@things-factory/scene-data-transform": "^3.6.7",
+    "@things-factory/scene-excel": "^3.6.7",
+    "@things-factory/scene-firebase": "^3.6.7",
+    "@things-factory/scene-form": "^3.6.7",
+    "@things-factory/scene-gauge": "^3.6.7",
+    "@things-factory/scene-google-map": "^3.6.7",
+    "@things-factory/scene-graphql": "^3.6.7",
+    "@things-factory/scene-grist": "^3.6.7",
+    "@things-factory/scene-half-roundrect": "^3.6.7",
+    "@things-factory/scene-indoor-map": "^3.6.7",
+    "@things-factory/scene-integration": "^3.6.7",
+    "@things-factory/scene-label": "^3.6.7",
+    "@things-factory/scene-legend": "^3.6.7",
+    "@things-factory/scene-marker": "^3.6.7",
+    "@things-factory/scene-mqtt": "^3.6.7",
+    "@things-factory/scene-news-ticker": "^3.6.7",
+    "@things-factory/scene-progressbar": "^3.6.7",
+    "@things-factory/scene-random": "^3.6.7",
+    "@things-factory/scene-restful": "^3.6.7",
+    "@things-factory/scene-switch": "^3.6.7",
+    "@things-factory/scene-tab": "^3.6.7",
+    "@things-factory/scene-table": "^3.6.7",
+    "@things-factory/scene-timer": "^3.6.7",
+    "@things-factory/scene-visualizer": "^3.6.7",
+    "@things-factory/scene-wheel-sorter": "^3.6.7",
+    "@things-factory/setting-ui": "^3.6.7",
+    "@things-factory/system-ui": "^3.6.7",
+    "@things-factory/warehouse-base": "^3.6.8"
   },
   "devDependencies": {
-    "@things-factory/builder": "^3.6.0",
+    "@things-factory/builder": "^3.6.7",
     "@types/node-fetch": "^2.5.7"
   },
-  "gitHead": "48b9fe15809b253c674ab386589db01a6bf8b0fc"
+  "gitHead": "a8154d7742cf9a7dad7e5b13125eade87093bcd4"
 }

package/translations/en.json

@@ -57,6 +57,8 @@
   "field.not_assigned": "not assigned",
   "field.on_hold": "on hold",
   "field.order_no": "order no",
+  "field.own_shipping_carrier": "own shipping carrier",
+  "field.own_tracking_no": "own tracking no",
   "field.pack_qty": "pack qty",
   "field.pack_weight": "pack weight",
   "field.packing_type": "packing type",
@@ -174,6 +176,8 @@
   "label.order_status_rejected": "rejected",
   "label.order_status_shipped": "shipped",
   "label.order_status_to_confirm_receive": "to confirm receive",
+  "label.own_shipping_provider": "own shipping provider",
+  "label.own_tracking_no": "own tracking no",
   "label.own_transport": "own transport",
   "label.oversell_will_happen_with_all_full_allocation": "oversell will happen with all 100% allocation",
   "label.parent_sku": "parent SKU",

package/translations/ko.json

@@ -57,6 +57,8 @@
   "field.not_assigned": "[ko] not assigned",
   "field.on_hold": "[ko] on hold",
   "field.order_no": "[ko] order no",
+  "field.own_shipping_carrier": "[ko] own shipping carrier",
+  "field.own_tracking_no": "[ko] own tracking no",
   "field.pack_qty": "[ko] pack qty",
   "field.pack_weight": "[ko] pack weight",
   "field.packing_type": "[ko] packing type",
@@ -171,6 +173,8 @@
   "label.order_status_rejected": "[ko] rejected",
   "label.order_status_shipped": "[ko] shipped",
   "label.order_status_to_confirm_receive": "[ko] to confirm receive",
+  "label.own_shipping_provider": "[ko] own shipping provider",
+  "label.own_tracking_no": "[ko] own tracking no",
   "label.own_transport": "[ko] own transport",
   "label.parent_sku": "[ko] parent SKU",
   "label.pending": "[ko] pending",

package/translations/ms.json

@@ -57,6 +57,8 @@
   "field.not_assigned": "[ms] not assigned",
   "field.on_hold": "[ms] on hold",
   "field.order_no": "[ms] order no",
+  "field.own_shipping_carrier": "[ms] own shipping carrier",
+  "field.own_tracking_no": "[ms] own tracking no",
   "field.pack_qty": "[ms] pack qty",
   "field.pack_weight": "[ms] pack weight",
   "field.packing_type": "[ms] packing type",
@@ -171,6 +173,8 @@
   "label.order_status_rejected": "[ms] rejected",
   "label.order_status_shipped": "[ms] shipped",
   "label.order_status_to_confirm_receive": "[ms] to confirm receive",
+  "label.own_shipping_provider": "[ms] own shipping provider",
+  "label.own_tracking_no": "[ms] own tracking no",
   "label.own_transport": "[ms] own transport",
   "label.parent_sku": "[ms] parent SKU",
   "label.pending": "[ms] pending",

package/translations/zh.json

@@ -57,6 +57,8 @@
   "field.not_assigned": "[zh] not assigned",
   "field.on_hold": "[zh] on hold",
   "field.order_no": "[zh] order no",
+  "field.own_shipping_carrier": "[zh] own shipping carrier",
+  "field.own_tracking_no": "[zh] own tracking no",
   "field.pack_qty": "[zh] pack qty",
   "field.pack_weight": "[zh] pack weight",
   "field.packing_type": "[zh] packing type",
@@ -171,6 +173,8 @@
   "label.order_status_rejected": "[zh] rejected",
   "label.order_status_shipped": "[zh] shipped",
   "label.order_status_to_confirm_receive": "[zh] to confirm receive",
+  "label.own_shipping_provider": "[zh] own shipping provider",
+  "label.own_tracking_no": "[zh] own tracking no",
   "label.own_transport": "[zh] own transport",
   "label.parent_sku": "[zh] parent SKU",
   "label.pending": "[zh] pending",