@things-factory/operato-wms 3.6.2 → 3.6.7

package/client/pages/master/product/product-detail-bizplace-setting-popup.js

@@ -1,12 +1,14 @@
-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, CustomAlert, gqlContext, PageView } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { isMobileDevice, flattenObject } from '@things-factory/utils'
+
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, CustomAlert, gqlContext } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
+
 const _ = require('lodash')
 
 export class ProductDetailBizplaceSettingPopup extends localize(i18next)(LitElement) {
@@ -131,7 +133,7 @@ export class ProductDetailBizplaceSettingPopup extends localize(i18next)(LitElem
         {
           type: 'string',
           name: 'productDetail|refCode',
-          header: i18next.t('field.refCode'),
+          header: i18next.t('field.ref_code'),
           sortable: true,
           width: 150
         },

package/client/pages/master/product/product-details-popup.js

@@ -1,12 +1,15 @@
-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, CustomAlert, gqlContext, PageView } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { isMobileDevice } from '@things-factory/utils'
+
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+
+import { getCodeByName } from '@things-factory/code-base'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, CustomAlert, gqlContext } from '@things-factory/shell'
+import { ScrollbarStyles } from '@things-factory/styles'
+import { isMobileDevice } from '@things-factory/utils'
+
 const _ = require('lodash')
 
 export class ProductDetailsPopup extends localize(i18next)(LitElement) {
@@ -159,7 +162,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
         {
           type: 'string',
           name: 'refCode',
-          header: i18next.t('field.refCode'),
+          header: i18next.t('field.ref_code'),
           record: { editable: true },
           sortable: true,
           width: 150

package/client/pages/master/product/product-list.js

@@ -429,8 +429,8 @@ class ProductList extends localize(i18next)(PageView) {
             type: 'string',
             name: 'refCode',
             record: { editable: true },
-            imex: { header: i18next.t('field.refCode'), key: 'refCode', width: 20, type: 'string' },
-            header: i18next.t('field.refCode'),
+            imex: { header: i18next.t('field.ref_code'), key: 'refCode', width: 20, type: 'string' },
+            header: i18next.t('field.ref_code'),
             width: 80
           },
           {

package/client/pages/order/transport-order/delivery-order-list.js

@@ -1,14 +1,16 @@
 import '@things-factory/form-ui'
-import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/grist-ui'
+import './upload-delivery-note'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, navigate, PageView } from '@things-factory/shell'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
 import { ScrollbarStyles } from '@things-factory/styles'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import './upload-delivery-note'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
 
 class DeliveryOrderList extends localize(i18next)(PageView) {
   static get styles() {
@@ -64,6 +66,26 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     }
   }
 
+  get searchForm() {
+    return this.shadowRoot.querySelector('search-form')
+  }
+
+  get dataGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
+
+  get _fromDateInput() {
+    return this.searchForm.shadowRoot.querySelector('input[name=fromDate]')
+  }
+
+  get _toDateInput() {
+    return this.searchForm.shadowRoot.querySelector('input[name=toDate]')
+  }
+
+  get _columns() {
+    return this.config.columns
+  }
+
   pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.dataGrist.fetch()
@@ -83,7 +105,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
       },
       {
         name: 'releaseGoodNo',
-        label: i18next.t('field.release_good_no'),
+        label: i18next.t('field.ro_no'),
         type: 'text',
         props: { searchOper: 'i_like' }
       },
@@ -122,6 +144,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     this.config = {
       list: { fields: ['name', 'refNo', 'bizplace', 'deliveryDate', 'ownCollection', 'status', 'updatedAt'] },
       rows: { selectable: { multiple: true }, appendable: false },
+      pagination: { pages: [20, 50, 100, 200, 500] },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
@@ -146,6 +169,13 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           sortable: true,
           width: 150
         },
+        {
+          type: 'object',
+          name: 'releaseGood',
+          header: i18next.t('field.ro_no'),
+          sortable: true,
+          width: 150
+        },
         {
           type: 'string',
           name: 'refNo',
@@ -199,14 +229,6 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     }
   }
 
-  get searchForm() {
-    return this.shadowRoot.querySelector('search-form')
-  }
-
-  get dataGrist() {
-    return this.shadowRoot.querySelector('data-grist')
-  }
-
   async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
     const filters = this.searchForm.queryFilters
     const response = await client.query({
@@ -224,12 +246,6 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
                 id
                 name
               }
-              attachments {
-                id
-                name
-                refBy
-                path
-              }
               to
               deliveryDate
               status
@@ -317,13 +333,23 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     )
   }
 
-  get _columns() {
-    return this.config.columns
-  }
-
   _exportableData() {
     return this.dataGrist.exportRecords()
   }
+
+  _modifyDateRange(e) {
+    const fromDate = e.currentTarget.value
+
+    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+
+    let min = new Date(fromDate)
+    let today = new Date()
+    today.setHours(0, 0, 0, 0)
+
+    min = min.toISOString().split('T')[0]
+
+    this._toDateInput.min = min
+  }
 }
 
 window.customElements.define('delivery-order-list', DeliveryOrderList)

package/client/pages/outbound/packing-product.js

@@ -1,18 +1,20 @@
 import '@things-factory/barcode-ui'
-import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { openPopup } from '@things-factory/layout-base'
+import './logistics-init/logistics-init-popup'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin.js'
+
+import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin.js'
-import { fetchSettingRule } from '../../fetch-setting-value'
-import { WORKSHEET_STATUS, PLATFORM } from '../constants'
 
-import './logistics-init/logistics-init-popup'
+import { fetchSettingRule } from '../../fetch-setting-value'
+import { PLATFORM, WORKSHEET_STATUS } from '../constants'
 
 class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -22,6 +24,8 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       trackingNo: String,
       shippingProvider: String,
       platform: String,
+      airwayBill: String,
+      invoice: String,
       config: Object,
       data: Object,
       _productName: String,
@@ -119,7 +123,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (this.releaseGoodNo && this.completed && this.trackingNo) {
+    if (this.releaseGoodNo && this.platform != 'operato' && this.completed && this.trackingNo) {
       if (this.platform === PLATFORM.LAZADA.value) {
         actions.push({
           title: i18next.t('button.print_invoice'),
@@ -135,6 +139,26 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
+    if (this.releaseGoodNo && this.platform == 'operato' && !this.airwayBill && this.completed) {
+      actions.push({
+        title: i18next.t('button.fetch_airway_bill'),
+        action: this.fetchSellercraftAirwayBill.bind(this),
+        ...CommonButtonStyles.label
+      })
+    } else if (this.releaseGoodNo && this.platform == 'operato' && this.airwayBill && this.completed) {
+      actions.push({
+        title: i18next.t('button.print_airway_bill'),
+        action: this.printSellercraftAirwayBill.bind(this),
+        ...CommonButtonStyles.label
+      })
+
+      actions.push({
+        title: i18next.t('button.print_invoice'),
+        action: this.printSellercraftInvoice.bind(this),
+        ...CommonButtonStyles.label
+      })
+    }
+
     if (
       this.releaseGoodNo &&
       this.orderInformation.status === 'packed' &&
@@ -247,9 +271,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           <label>${i18next.t('label.tracking_no')}</label>
           <input name="trackingNo" readonly />
 
-          <label>${i18next.t('label.platform')}</label>
-          <input name="platform" readonly />
-
           <label>${i18next.t('label.status')}</label>
           <input name="marketplaceStatus" readonly />
 
@@ -417,11 +438,12 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               bizplaceName
               partnerDomainId
               refNo
+              airwayBill
+              invoice
               startedAt
               shippingProvider
               marketplaceStatus
               trackingNo
-              platform
               marketplaceOrder {
                 id
                 name
@@ -432,6 +454,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
                   platform
                 }
               }
+              platform
             }
             worksheetDetailInfos {
               name
@@ -476,6 +499,8 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       const { worksheetInfo, worksheetDetailInfos } = response.data.packingWorksheet
 
       this.trackingNo = worksheetInfo.trackingNo
+      this.airwayBill = worksheetInfo.airwayBill
+      this.invoice = worksheetInfo.invoice
       this.refNo = worksheetInfo.refNo
       this.platform = worksheetInfo.platform
       this.shippingProvider = worksheetInfo.shippingProvider
@@ -569,6 +594,20 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     return otherInfo.deliveryType
   }
 
+  printSellercraftInvoice() {
+    let url = new URL(window.location)
+
+    var convertedPdfUrl = `${url.origin}/proxy?url=${this.invoice}`
+    this._callPrintDialog(convertedPdfUrl)
+  }
+
+  printSellercraftAirwayBill() {
+    let url = new URL(window.location)
+
+    var convertedPdfUrl = `${url.origin}/proxy?url=${this.airwayBill}`
+    this._callPrintDialog(convertedPdfUrl)
+  }
+
   async printInvoice() {
     var orderDocInfo = await this.getOrderDocument(this.refNo, 'invoice')
 
@@ -609,6 +648,30 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async fetchSellercraftAirwayBill() {
+    const response = await client.query({
+      query: gql`
+        query fetchSellercraftAirwayBill($releaseOrderNo: String!) {
+          fetchSellercraftAirwayBill(releaseOrderNo: $releaseOrderNo) {
+            airwayBill
+          }
+        }
+      `,
+      variables: { releaseOrderNo }
+    })
+
+    if (!response.errors) {
+      this.airwayBill = response.data.fetchAirwayBill.airwayBill
+
+      if (airwayBill) {
+        this.updateContext()
+        this._callPrintDialog(this.airwayBill)
+      } else {
+        this._showToast({ message: i18next.t('text.pending_airwaybill_from_ecommerce_platform') })
+      }
+    }
+  }
+
   async getOrderDocument(orderNo, docType) {
     try {
       const response = await client.query({
@@ -657,6 +720,15 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           this._showToast({ message: i18next.t('text.document_has_been_generated') })
         }, 1000)
         break
+
+      default:
+        iframe.src = contentSource
+        iframe.onload = () => {
+          iframe.focus()
+          iframe.contentWindow.print()
+          this._showToast({ message: i18next.t('text.document_has_been_generated') })
+        }
+        break
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.6.2",
+  "version": "3.6.7",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,71 +41,71 @@
     "docker:run": "docker run -p 4000:3000 hatiolab/operato-wms:latest"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^3.6.1",
-    "@things-factory/attachment-ui": "^3.6.1",
-    "@things-factory/auth-ui": "^3.6.1",
-    "@things-factory/barcode-ui": "^3.6.1",
-    "@things-factory/biz-ui": "^3.6.2",
-    "@things-factory/board-service": "^3.6.1",
-    "@things-factory/board-ui": "^3.6.1",
-    "@things-factory/code-ui": "^3.6.1",
-    "@things-factory/context-ui": "^3.6.1",
-    "@things-factory/export-ui": "^3.6.1",
-    "@things-factory/export-ui-csv": "^3.6.1",
-    "@things-factory/export-ui-excel": "^3.6.1",
-    "@things-factory/fav-base": "^3.6.1",
-    "@things-factory/form-ui": "^3.6.1",
-    "@things-factory/grist-ui": "^3.6.0",
-    "@things-factory/help": "^3.6.1",
-    "@things-factory/i18n-ui": "^3.6.1",
-    "@things-factory/id-rule-base": "^3.6.1",
-    "@things-factory/import-ui": "^3.6.1",
-    "@things-factory/import-ui-excel": "^3.6.1",
-    "@things-factory/menu-ui": "^3.6.1",
-    "@things-factory/more-ui": "^3.6.1",
-    "@things-factory/notification": "^3.6.1",
-    "@things-factory/pdf": "^3.6.0",
-    "@things-factory/print-proxy-service": "^3.6.1",
-    "@things-factory/print-service": "^3.6.1",
-    "@things-factory/print-ui": "^3.6.1",
-    "@things-factory/product-base": "^3.6.1",
-    "@things-factory/resource-ui": "^3.6.1",
-    "@things-factory/sales-ui": "^3.6.1",
-    "@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-half-roundrect": "^3.6.0",
-    "@things-factory/scene-indoor-map": "^3.6.0",
-    "@things-factory/scene-label": "^3.6.1",
-    "@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-visualizer": "^3.6.0",
-    "@things-factory/scene-wheel-sorter": "^3.6.0",
-    "@things-factory/setting-ui": "^3.6.1",
-    "@things-factory/system-ui": "^3.6.1",
-    "@things-factory/transport-base": "^3.6.1",
-    "@things-factory/tutorial-ui": "^3.6.1",
-    "@things-factory/warehouse-base": "^3.6.1",
-    "@things-factory/worksheet-base": "^3.6.1"
+    "@things-factory/apptool-ui": "^3.6.7",
+    "@things-factory/attachment-ui": "^3.6.7",
+    "@things-factory/auth-ui": "^3.6.7",
+    "@things-factory/barcode-ui": "^3.6.7",
+    "@things-factory/biz-ui": "^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/export-ui": "^3.6.7",
+    "@things-factory/export-ui-csv": "^3.6.7",
+    "@things-factory/export-ui-excel": "^3.6.7",
+    "@things-factory/fav-base": "^3.6.7",
+    "@things-factory/form-ui": "^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/id-rule-base": "^3.6.7",
+    "@things-factory/import-ui": "^3.6.7",
+    "@things-factory/import-ui-excel": "^3.6.7",
+    "@things-factory/menu-ui": "^3.6.7",
+    "@things-factory/more-ui": "^3.6.7",
+    "@things-factory/notification": "^3.6.7",
+    "@things-factory/pdf": "^3.6.7",
+    "@things-factory/print-proxy-service": "^3.6.7",
+    "@things-factory/print-service": "^3.6.7",
+    "@things-factory/print-ui": "^3.6.7",
+    "@things-factory/product-base": "^3.6.7",
+    "@things-factory/resource-ui": "^3.6.7",
+    "@things-factory/sales-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-half-roundrect": "^3.6.7",
+    "@things-factory/scene-indoor-map": "^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-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/transport-base": "^3.6.7",
+    "@things-factory/tutorial-ui": "^3.6.7",
+    "@things-factory/warehouse-base": "^3.6.7",
+    "@things-factory/worksheet-base": "^3.6.7"
   },
   "devDependencies": {
-    "@things-factory/builder": "^3.6.0"
+    "@things-factory/builder": "^3.6.7"
   },
-  "gitHead": "8c07b01b1e5a4e539981a7357e240f047f4f8371"
+  "gitHead": "6f15856aaf04842e4b4508133753c3e17eadeec9"
 }