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

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

@@ -1,10 +1,14 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+
+import { PLATFORM } from '../../constants'
 
 class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
   static get properties() {
@@ -64,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"
@@ -74,6 +96,11 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
         ></data-grist>
       </div>
       <div class="button-container">
+        <mwc-button
+          @click="${this.splitOrders.bind(this)}"
+          raised
+          label="${i18next.t('button.split_order')}"
+        ></mwc-button>
         <mwc-button
           @click="${this.initLogistics.bind(this)}"
           raised
@@ -99,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' },
@@ -133,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',
@@ -147,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',
@@ -266,6 +324,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
                   phone2
                   attentionTo
                   trackingNo
+                  ownTrackingNo
+                  transporter
+                  ownTransporter
+                  totalWeight
+                  weightUnit
+                  totalVolume
+                  volumeUnit
                 }
                 marketplaceProductVariation {
                   name
@@ -279,10 +344,12 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
               status
               itemCount
               shippingProvider
+              ownShippingProvider
               totalAmount
               orderCreatedAt
               orderUpdatedAt
               trackingNo
+              ownTrackingNo
               updatedAt
               fullLogisticsDetail {
                 pickup
@@ -327,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')
         }
       })
 
@@ -341,8 +411,8 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -357,28 +427,63 @@ 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 => {
+            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() {
@@ -403,6 +508,73 @@ 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) {
+        this.grist.fetch()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async initLogistics() {
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
@@ -480,6 +652,46 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
     }
   }
 
+  async splitOrders() {
+    try {
+      let selectedData = this.grist.selected
+      this._validateSplitting(selectedData)
+
+      const patches = selectedData.map(patch => {
+        return {
+          id: patch.id,
+          orderNo: patch.orderNo
+        }
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation splitOrdersByBatch($patches: [LogisticsInfo]!) {
+            splitOrdersByBatch(patches: $patches)
+          }
+        `,
+        variables: { patches }
+      })
+
+      if (!response.errors) {
+        this.dispatchEvent(new CustomEvent('order-updated'))
+        history.back()
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  _validateSplitting(data) {
+    if (!data) {
+      throw new Error('No order to split')
+    }
+
+    if (data.some(item => item.trackingNo)) {
+      throw new Error('Order with tracking no not allowed to split')
+    }
+  }
+
   _submit(e) {
     this.searchForm.submit()
   }

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

@@ -1,11 +1,14 @@
 import '@things-factory/component-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { client } from '@things-factory/shell'
+
 import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
+import { client } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
-import { css, html, LitElement } from 'lit-element'
+
 import { PLATFORM } from '../../constants'
 
 class OrderShippingItems extends localize(i18next)(LitElement) {
@@ -96,79 +99,103 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
           <div field>
             <label
               >${i18next.t('label.attention_to')}
-              <input type="text" name="attentionTo" />
+              <input type="text" name="attentionTo" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.tracking_no')}
-              <input type="text" name="trackingNo" />
+              <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
-              <input type="text" name="phone1" />
+              <input type="text" name="phone1" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.phone')} 2
-              <input type="text" name="phone2" />
+              <input type="text" name="phone2" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.address')} 1
-              <input type="text" name="address1" />
+              <input type="text" name="address1" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.address')} 2
-              <input type="text" name="address2" />
+              <input type="text" name="address2" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.address')} 3
-              <input type="text" name="address3" />
+              <input type="text" name="address3" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.address')} 4
-              <input type="text" name="address4" />
+              <input type="text" name="address4" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.address')} 5
-              <input type="text" name="address5" />
+              <input type="text" name="address5" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.postcode')}
-              <input type="text" name="postCode" />
+              <input type="text" name="postCode" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.city')}
-              <input type="text" name="city" />
+              <input type="text" name="city" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.state')}
-              <input type="text" name="state" />
+              <input type="text" name="state" readonly />
             </label>
           </div>
           <div field>
             <label
               >${i18next.t('label.country')}
-              <input type="text" name="country" />
+              <input type="text" name="country" readonly />
+            </label>
+          </div>
+          <div field>
+            <label
+              >${i18next.t('label.weight')}
+              <input type="text" name="totalWeight" readonly />
+            </label>
+          </div>
+          <div field>
+            <label
+              >${i18next.t('label.shipping_provider')}
+              <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>
@@ -248,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

@@ -1,10 +1,11 @@
 import '@things-factory/component-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
+import './order-shipping-items'
+
 import { css, html, LitElement } from 'lit-element'
 
-import './order-shipping-items'
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { i18next, localize } from '@things-factory/i18n-base'
 
 class OrderShipping extends localize(i18next)(LitElement) {
   static get properties() {
@@ -64,7 +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 + ' ) '}`
+          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