@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -1,6 +1,7 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../../../outbound/generate-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -13,7 +14,7 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
-import { isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice, sleep } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../../../fetch-setting-value'
 import { INTENALIZED_AWB_SETTING_KEY, ORDER_STATUS } from '../../../constants'
@@ -84,14 +85,9 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         action: this._generatePackingList.bind(this),
         ...CommonButtonStyles.label
       },
-      {
-        title: i18next.t('button.batch_picking'),
-        action: this._openBatchPickingPopup.bind(this),
-        ...CommonButtonStyles.activate
-      },
       {
         title: i18next.t('button.generate_worksheet'),
-        action: this._generatePickingWorksheet.bind(this),
+        action: this._openGenerateWorksheetPopup.bind(this),
         ...CommonButtonStyles.activate
       }
     ]
@@ -131,7 +127,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
 
     this._searchFields = [
       {
-        label: i18next.t('field.release_order_no'),
+        label: i18next.t('field.order_info'),
         name: 'name',
         type: 'text',
         props: { searchOper: 'i_like' }
@@ -159,40 +155,26 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         type: 'select',
         options: [
           { value: '' },
-          ..._orderStatus.map(status => {
-            return { name: i18next.t(`label.${status.description}`), value: status.name }
-          })
+          ..._orderStatus
+            .filter(res => {
+              return res.name !== 'LOADING'
+            })
+            .map(status => {
+              return { name: i18next.t(`label.${status.description}`), value: status.name }
+            })
         ],
         props: { searchOper: 'eq' }
       },
-      {
-        label: i18next.t('field.ref_no'),
-        name: 'refNo',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_2'),
-        name: 'refNo2',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_3'),
-        name: 'refNo3',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
       {
         label: i18next.t('field.from'),
         name: 'fromDate',
         type: 'date',
         props: {
-          searchOper: 'eq'
+          searchOper: 'gte'
         },
         value: (() => {
           let date = new Date()
-          date.setMonth(date.getMonth() - 6)
+          date.setMonth(date.getMonth() - 1)
           return date.toISOString().split('T')[0]
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
@@ -202,10 +184,15 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         name: 'toDate',
         type: 'date',
         props: {
-          searchOper: 'eq',
+          searchOper: 'lte',
           min: (() => {
             let date = new Date()
-            date.setMonth(date.getMonth() - 6)
+            date.setMonth(date.getMonth() - 1)
+            return date.toISOString().split('T')[0]
+          })(),
+          max: (() => {
+            let date = new Date()
+            date.setDate(date.getDate())
             return date.toISOString().split('T')[0]
           })()
         },
@@ -238,7 +225,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         options: [{ value: '' }, { name: 'Single Item', value: 1 }, { name: 'Multiple Item', value: 2 }]
       },
       {
-        label: i18next.t('field.sku'),
+        label: i18next.t('field.product_info'),
         name: 'sku',
         type: 'text',
         props: { searchOper: 'i_like' }
@@ -249,6 +236,13 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         type: 'checkbox',
         props: { searchOper: 'eq' },
         attrs: ['indeterminate']
+      },
+      {
+        label: i18next.t('field.manifested'),
+        name: 'manifested',
+        type: 'checkbox',
+        props: { searchOper: 'eq' },
+        attrs: ['indeterminate']
       }
     ]
 
@@ -344,6 +338,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           type: 'string',
           name: 'postalCode',
           header: i18next.t('field.postal_code'),
+          imex: { header: i18next.t('field.postal_code'), key: 'postalCode', width: 25, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -351,6 +346,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           type: 'string',
           name: 'transporter',
           header: i18next.t('field.transporter'),
+          imex: { header: i18next.t('field.transporter'), key: 'transporter', width: 25, type: 'string' },
           sortable: true,
           width: 120
         },
@@ -366,7 +362,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
-          imex: { header: i18next.t('field.grn_status'), key: 'status', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
           sortable: true,
           width: 120
         },
@@ -378,6 +374,14 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 120
         },
+        {
+          type: 'datetime',
+          name: 'acceptedAt',
+          header: i18next.t('field.accepted_at'),
+          imex: { header: i18next.t('field.accepted_at'), key: 'acceptedAt', width: 25, type: 'datetime' },
+          sortable: true,
+          width: 160
+        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -393,6 +397,86 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           imex: { header: i18next.t('field.accepted_by'), key: 'acceptedBy.name', width: 25, type: 'string' },
           sortable: true,
           width: 200
+        },
+        {
+          type: 'object',
+          name: 'updater',
+          header: i18next.t('field.updated_by'),
+          imex: { header: i18next.t('field.updated_by'), key: 'updater.name', width: 25, type: 'string' },
+          sortable: true,
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'attentionTo',
+          header: i18next.t('field.receiver_name'),
+          imex: { header: i18next.t('field.receiver_name'), key: 'attentionTo', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'attentionCompany',
+          header: i18next.t('field.receiver_company'),
+          imex: { header: i18next.t('field.receiver_company'), key: 'attentionCompany', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'deliveryAddress1',
+          header: i18next.t('field.delivery_address'),
+          imex: { header: i18next.t('field.delivery_address'), key: 'deliveryAddress1', width: 75, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'city',
+          header: i18next.t('field.city'),
+          imex: { header: i18next.t('field.city'), key: 'city', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'state',
+          header: i18next.t('field.state'),
+          imex: { header: i18next.t('field.state'), key: 'state', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'country',
+          header: i18next.t('field.country'),
+          imex: { header: i18next.t('field.country'), key: 'country', width: 20, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'phone1',
+          header: `${i18next.t('field.contact')} 1`,
+          imex: { header: `${i18next.t('field.contact')} 1`, key: 'phone1', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'phone2',
+          header: `${i18next.t('field.contact')} 2`,
+          imex: { header: `${i18next.t('field.contact')} 2`, key: 'phone2', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
+        },
+        {
+          type: 'string',
+          name: 'email',
+          header: i18next.t('field.email'),
+          imex: { header: i18next.t('field.email'), key: 'email', width: 25, type: 'string' },
+          width: 200,
+          hidden: true
         }
       ]
     }
@@ -406,6 +490,10 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
+  get _toDateInput() {
+    return this.searchForm.shadowRoot.querySelector('input[name=toDate]')
+  }
+
   async fetchHandler({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
@@ -414,7 +502,6 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
             items {
               id
               trackingNo
-              attentionTo
               deliveryAddress1
               deliveryAddress2
               deliveryAddress3
@@ -428,6 +515,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
               country
               phone1
               phone2
+              email
               postalCode
               marketplaceOrderStatus
               transporter
@@ -446,11 +534,17 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
               noOfItems
               createdAt
               updatedAt
+              acceptedAt
               acceptedBy {
                 id
                 name
                 description
               }
+              updater {
+                id
+                name
+                description
+              }
               airwayBill
               trackingNo
             }
@@ -548,24 +642,6 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openBatchPickingPopup() {
-    openPopup(
-      html`
-        <batch-picking-popup
-          @generated="${() => {
-            navigate('merged_outbound_worksheets')
-            this._showToast({ message: i18next.t('text.worksheet_has_been_generated') })
-          }}"
-        ></batch-picking-popup>
-      `,
-      {
-        backdrop: true,
-        size: 'large',
-        title: i18next.t('title.generate_batch_picking')
-      }
-    )
-  }
-
   async _printInvoices() {
     try {
       if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
@@ -709,82 +785,25 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  async _exportableData() {
-    try {
-      let data = []
-
-      var headerSetting = [
-        { header: i18next.t('field.ro'), key: 'name', width: 25, type: 'string' },
-        { header: i18next.t('field.company'), key: 'bizplaceName', width: 25, type: 'string' },
-        { header: i18next.t('field.ref_no'), key: 'refNo', width: 25, type: 'string' },
-        { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
-        { header: i18next.t('field.release_date'), key: 'releaseDate', width: 30, type: 'date' },
-        { header: i18next.t('field.postal_code'), key: 'postalCode', width: 30, type: 'string' },
-        {
-          header: i18next.t('field.marketplace_order_status'),
-          key: 'marketplaceOrderStatus',
-          width: 30,
-          type: 'string'
-        },
-        { header: i18next.t('field.warehouse_status'), key: 'status', width: 30, type: 'string' },
-        { header: i18next.t('field.transporter'), key: 'transporter', width: 30, type: 'string' },
-        { header: i18next.t('field.delivery_address'), key: 'deliveryAddress1', width: 30, type: 'string' },
-        { header: i18next.t('field.attention_to'), key: 'attentionTo', width: 30, type: 'string' },
-        { header: i18next.t('field.phone'), key: 'phone1', width: 30, type: 'string' }
-      ]
-
-      if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
-        data = this.dataGrist.selected
-      } else {
-        const bizplaceFilters = (await this.searchForm.getQueryFilters()).filter(x => x.name === 'bizplaceId')
-        if (bizplaceFilters.length == 0) {
-          throw new Error(`Please select a customer for export.`)
-        }
-        data = await this.fetchHandler({ page: 1, limit: 9999999 })
-      }
-
-      return { header: headerSetting, data }
-    } catch (e) {
-      this._showToast(e)
-    }
-  }
-
-  async _generatePickingWorksheet() {
+  async _openGenerateWorksheetPopup() {
     try {
-      let releaseGoodNos = []
       if (this.dataGrist.selected.length <= 0)
         throw new Error(i18next.t('text.please_select_one_or_more_order_to_generate_worksheet'))
 
+      let releaseGoodNos = []
+
       let readyToPick = this.dataGrist.selected.filter(itm => itm.status === ORDER_STATUS.PENDING_WORKSHEET.value)
       releaseGoodNos = readyToPick.map(record => record.name)
 
       if (releaseGoodNos.length <= 0)
-        throw new Error(i18next.t('text.selected_release_order(s)_has_existing_worksheet'))
-
-      let result = await CustomAlert({
-        title: i18next.t('title.are_you_sure'),
-        text: i18next.t('text.generate_worksheet'),
-        confirmButton: { text: i18next.t('button.submit') },
-        cancelButton: { text: i18next.t('button.cancel') }
-      })
-
-      if (!result.value) return
+        throw new Error(i18next.t('text.selected_release_order(s)_is_not_in_pending_worksheet_status'))
 
-      const response = await client.mutate({
-        mutation: gql`
-          mutation generateMultipleReleaseGoodWorksheet($releaseGoodNos: [String!]) {
-            generateMultipleReleaseGoodWorksheet(releaseGoodNos: $releaseGoodNos)
-          }
-        `,
-        variables: {
-          releaseGoodNos
-        }
+      await sleep(1010)
+      openPopup(html` <generate-worksheet-popup .gristData=${this.dataGrist}></generate-worksheet-popup> `, {
+        backdrop: true,
+        size: 'medium',
+        title: i18next.t('title.generate_picking_worksheet')
       })
-
-      if (!response.errors) {
-        navigate('single_outbound_worksheets')
-        this._showToast({ message: i18next.t('text.worksheet(s)_has_been_generated') })
-      }
     } catch (e) {
       this._showToast(e)
     }
@@ -812,15 +831,21 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
   _modifyDateRange(e) {
     const fromDate = e.currentTarget.value
 
-    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+    if (this._toDateInput?.value < fromDate) this._toDateInput.value = fromDate
 
     let min = new Date(fromDate)
     let today = new Date()
+    let oneMonthRange = new Date(fromDate)
+    oneMonthRange.setMonth(oneMonthRange.getMonth() + 1)
+    oneMonthRange = oneMonthRange.toISOString().split('T')[0]
+
     today.setHours(0, 0, 0, 0)
 
     min = min.toISOString().split('T')[0]
 
     this._toDateInput.min = min
+    this._toDateInput.value = oneMonthRange
+    this._toDateInput.max = oneMonthRange
   }
 
   _exportableData() {
@@ -832,7 +857,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     }
 
     var headerSetting = this.dataGrist._config.columns
-      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .filter(column => column.type !== 'gutter' /* && column.record !== undefined */ && column.imex !== undefined)
       .map(column => {
         return column.imex
       })
@@ -841,7 +866,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
       return {
         id: item.id,
         ...this._columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .filter(column => column.type !== 'gutter' /* && column.record !== undefined */ && column.imex !== undefined)
           .reduce((record, column) => {
             record[column.imex.key] = column.imex.key
               .split('.')

package/client/pages/order/release-order/batch-picking-popup.js

@@ -312,6 +312,7 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
                 name
                 description
               }
+              recall
             }
             total
           }
@@ -369,7 +370,17 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
 
   async generateBatchPicking() {
     try {
+      const data = this.releaseOrderGrist
       if (this.releaseOrderGrist.selected.length < 2) throw new Error('Minimum of 2 orders required for batch picking')
+
+      let uniqueWS = this.releaseOrderGrist.selected.filter(
+        res => res.recall !== this.releaseOrderGrist.selected[0].recall
+      )
+
+      if (uniqueWS.length > 0) {
+        throw new Error("Recall Release Order can't be generated together with Normal Release Order")
+      }
+
       let result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.create_batch_picking'),