@things-factory/operato-wms 4.3.0 → 4.4.0-alpha.0

package/client/pages/constants/index.js

@@ -16,4 +16,3 @@ export * from './worksheet'
 export * from './pallet'
 export * from './platform'
 export * from './group-type'
-export * from './tote'

package/client/pages/constants/setting.js

@@ -6,4 +6,3 @@ export const PRODUCT_LABEL_SETTING_KEY = 'product-label'
 export const REUSABLE_PALLET_LABEL_SETTING_KEY = 'reusable-pallet-label'
 export const INTENALIZED_AWB_SETTING_KEY = 'internalized-awb-label'
 export const ROUTE_LABEL_SETTING_KEY = 'route-label'
-export const TOTE_LABEL_SETTING_KEY = 'tote-label'

package/client/pages/inbound/unload-product.js

@@ -372,7 +372,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   this.productBarcodeInput.readOnly = false
                   this.productBarcodeInput.value = ''
                 }
-                if (record.product?.isRequireSerialNumberScanningInbound) {
+                if (this.serialNumberInput) {
                   this.serialNumberInput.value = ''
                 }
                 this.cartonInput.value = ''
@@ -1090,14 +1090,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
           this._selectedOrderProduct = null
 
-        if (!this._selectedOrderProduct) {
-          if (foundOrderProducts?.length > 1) {
-            this.selectOrderProduct(foundOrderProducts)
-          } else if (foundOrderProducts?.length == 1) {
-            this._selectedOrderProduct = foundOrderProducts[0]
-          } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length > 0) {
-            this._selectedOrderProduct = foundParentProducts[0]
-          }
+        if (foundOrderProducts?.length > 1 && !this._selectedOrderProduct) {
+          this.selectOrderProduct(foundOrderProducts)
+        } else {
+          this._selectedOrderProduct = foundParentProducts[0]
         }
       }
     } catch (e) {

package/client/pages/inventory/inventory-adjustment-approval.js

@@ -8,7 +8,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
-import { client, PageView, store,gqlContext } from '@things-factory/shell'
+import { client, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 import { openPopup } from '@things-factory/layout-base'
@@ -141,9 +141,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       { column: 'expirationDate', name: 'Exp. Date' },
       { column: 'manufactureDate', name: 'Mfg. Date' },
       { column: 'unitCost', name: 'Unit Cost' },
-      { column: 'inventoryItemChange', name: 'Inventory Item Changes' },
-      { column: 'status', name: 'Status' },
-
+      { column: 'inventoryItemChange', name: 'Inventory Item Changes' }
     ]
 
     this.config = {
@@ -196,17 +194,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
               } else {
                 this._compareColumn.map(item => {
                   let currentVal = compareData[item.column]?.name || compareData[item.column] || '[N/A]'
-                  let updatedVal
-
-                  if (item.column == 'status' && record.transactionType == 'MISSING') {
-                    updatedVal = record.transactionType || '[N/A]'
-                  }else if(item.column == 'status'){
-                    updatedVal = '[N/A]'
-                  }
-
-                  if (item.column !== 'status') {
-                    updatedVal = record[item.column]?.name || record[item.column] || '[N/A]'
-                  }
+                  let updatedVal = record[item.column]?.name || record[item.column] || '[N/A]'
 
                   recordDiff.push({
                     column: item.name,
@@ -416,7 +404,6 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 batchIdRef
                 packingType
                 packingSize
-                status
                 bizplace {
                   id
                   name
@@ -445,7 +432,6 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 packingType
                 packingSize
                 batchIdRef
-                status
                 bizplace {
                   id
                   name
@@ -562,8 +548,8 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation warehouseInventoryAdjustment($patches: [InventoryChangePatch!]!) {
-            warehouseInventoryAdjustment(patches: $patches) {
+          mutation approveInventoryChanges($patches: [InventoryChangePatch!]!) {
+            approveInventoryChanges(patches: $patches) {
               items {
                 id
               }
@@ -571,14 +557,13 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
             }
           }
         `,
-        variables: { patches },
-        context: gqlContext()
+        variables: { patches }
       })
       if (!response.errors) {
-        this._lockedPallet = response.data.warehouseInventoryAdjustment.items
+        this._lockedPallet = response.data.approveInventoryChanges.items
         this._showToast({
           message:
-            response.data.warehouseInventoryAdjustment.total > 0
+            response.data.approveInventoryChanges.total > 0
               ? 'Highlighted pallet could not be approved due to ongoing process.'
               : i18next.t('text.data_approved'),
           option: 7000
@@ -692,4 +677,4 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   }
 }
 
-window.customElements.define('inventory-adjustment-approval', InventoryAdjustmentApproval)
+window.customElements.define('inventory-adjustment-approval', InventoryAdjustmentApproval)

package/client/pages/inventory/inventory-adjustment.js

@@ -13,7 +13,7 @@ import { DirectPrinter } from '@things-factory/barcode-base'
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import { client, CustomAlert, PageView, store } from '@things-factory/shell'
+import { client, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
@@ -75,11 +75,6 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           action: this.printCartonLabel.bind(this),
           ...CommonButtonStyles.label
         },
-        {
-          title: i18next.t('button.missing_stock'),
-          action: this.missingStock.bind(this),
-          ...CommonButtonStyles.save
-        },
         {
           title: i18next.t('button.save'),
           action: this.saveInventories.bind(this),
@@ -728,15 +723,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
     switch (e.detail.column.name) {
       case 'uomValue':
-        if (e.detail.after < 0 || e.detail.after.toString() == NaN.toString()) {
-          item._data.records[e.detail.row].uomValue = 0
-          this._showToast({ level: 'error', message: i18next.t('text.invalid_uom_value') })
-        }
+        if (e.detail.after < 0) item._data.records[e.detail.row].uomValue = 0
         break
       case 'qty':
-        if (e.detail.after < 0 || !Number.isInteger(e.detail.after)) {
-          this._showToast({ level: 'error', message: i18next.t('text.invalid_qty') })
-        }
+        if (e.detail.after < 0 || !Number.isInteger(e.detail.after))
+          item._data.records[e.detail.row].qty = e.detail.before
         break
       case 'unitCost':
         if (e.detail.after < 0) item._data.records[e.detail.row].unitCost = e.detail.before
@@ -770,46 +761,6 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async missingStock() {
-    const selectOrderInventory = this.dataGrist.selected
-
-    const patchesArr = [...selectOrderInventory]
-
-    const patches = patchesArr.map(p => {
-      return {
-        palletId: p.palletId,
-        transactionType: 'MISSING'
-      }
-    })
-
-    const result = await CustomAlert({
-      title: i18next.t('title.are_you_sure'),
-      text: i18next.t('text.do_you_want_to_mark_it_as_missing'),
-      confirmButton: { text: i18next.t('button.confirm') },
-      cancelButton: { text: i18next.t('button.cancel') }
-    })
-
-    if (result.isConfirmed) {
-      try {
-        const response = await client.mutate({
-          mutation: gql`
-            mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
-              submitInventoryChanges(patches: $patches)
-            }
-          `,
-          variables: { patches }
-        })
-
-        if (!response.error) {
-          this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
-          this.updateContext()
-        }
-      } catch (error) {
-        throw new Error(error)
-      }
-    }
-  }
-
   async saveInventories() {
     try {
       var patches = this.dataGrist.exportPatchList({ flagName: 'cuFlag' })
@@ -842,34 +793,18 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       })
 
       if (patches && patches.length) {
-        const validateInventoryChanges = await client.query({
-          query: gql`
-            query validateOrderInventory($patches: [InventoryPatch!]!) {
-              validateOrderInventory(patches: $patches)
+        const response = await client.mutate({
+          mutation: gql`
+            mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
+              submitInventoryChanges(patches: $patches)
             }
           `,
           variables: { patches }
         })
 
-        if (validateInventoryChanges.data.validateOrderInventory) {
-          const response = await client.mutate({
-            mutation: gql`
-              mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
-                submitInventoryChanges(patches: $patches)
-              }
-            `,
-            variables: { patches }
-          })
-
-          if (!response.errors) {
-            this.dataGrist.fetch()
-            this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
-          }
-        } else {
-          this._showToast({
-            type: 'error',
-            message: `${i18next.t('text.complete_the_picking_process_before_adjust_the_batch_number')}`
-          })
+        if (!response.errors) {
+          this.dataGrist.fetch()
+          this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
         }
       }
     } catch (e) {
@@ -958,7 +893,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       if (!response.errors) {
         history.back()
         this.dataGrist.fetch()
-        this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
+        this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
       }
     } catch (e) {
       this._showToast(e)
@@ -1392,11 +1327,10 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _showToast({ level, type, message }) {
+  _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {
-          level,
           type,
           message
         }

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

@@ -653,7 +653,7 @@ class ProductList extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query productsByBizplace($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+        query productsByBizplace($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
           productsByBizplace(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               sku

package/client/pages/order/arrival-notice/arrival-notice-detail.js

@@ -1057,6 +1057,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
         title: i18next.t('title.reject_arrival_notice')
       }
     )
+
+    popup.onclosed
   }
 
   async _receiveArrivalNotice() {

package/client/pages/order/arrival-notice/receive-arrival-notice.js

@@ -778,6 +778,8 @@ class ReceiveArrivalNotice extends localize(i18next)(PageView) {
         title: i18next.t('title.reject_arrival_notice')
       }
     )
+
+    popup.onclosed
   }
 
   _showToast({ type, message }) {

package/client/pages/order/goods-received-note/customer-received-note.js

@@ -90,9 +90,6 @@ class CustomerReceivedNote extends localize(i18next)(PageView) {
       case 'seebuu-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_seebuu_grn/${this._grnNo}`
         break
-      case 'freight-mark-warehouse':
-        this.shadowRoot.querySelector('#container').src = `/view_fm_grn/${this._grnNo}/${timezoneOffSet}`
-        break
       case 'kimeda-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_kimeda_grn/${this._grnNo}/${timezoneOffSet}`
         break

package/client/pages/order/goods-received-note/received-note-detail.js

@@ -92,9 +92,6 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
       case 'seebuu-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_seebuu_grn/${this._grnNo}`
         break
-      case 'freight-mark-warehouse':
-        this.shadowRoot.querySelector('#container').src = `/view_fm_grn/${this._grnNo}/${timezoneOffSet}`
-        break
       case 'kimeda-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_kimeda_grn/${this._grnNo}/${timezoneOffSet}`
         break

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

@@ -3,20 +3,38 @@ import '@things-factory/grist-ui'
 import '../batch-picking-popup'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import {
+  css,
+  html
+} from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { GhostPrint } from '@operato/ghost-print'
 import { DirectPrinter } from '@things-factory/barcode-base'
 import { getCodeByName } from '@things-factory/code-base'
-import { i18next, localize } from '@things-factory/i18n-base'
+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 {
+  client,
+  CustomAlert,
+  navigate,
+  PageView,
+  store
+} from '@things-factory/shell'
+import {
+  CommonButtonStyles,
+  ScrollbarStyles
+} from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../../../fetch-setting-value'
-import { INTENALIZED_AWB_SETTING_KEY, ORDER_STATUS } from '../../../constants'
+import {
+  INTENALIZED_AWB_SETTING_KEY,
+  ORDER_STATUS
+} from '../../../constants'
 
 const HEADER_JSON = {
   'Content-Type': 'application/json',
@@ -242,13 +260,6 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         name: 'sku',
         type: 'text',
         props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.order_remark'),
-        name: 'orderRemark',
-        type: 'checkbox',
-        props: { searchOper: 'eq' },
-        attrs: ['indeterminate']
       }
     ]
 
@@ -292,14 +303,6 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
             }
           }
         },
-        {
-          type: 'boolean',
-          name: 'orderRemark',
-          header: i18next.t('field.order_remark'),
-          imex: { header: i18next.t('field.order_remark'), key: 'orderRemark', width: 20, type: 'string' },
-          sortable: true,
-          width: 100
-        },
         {
           type: 'string',
           name: 'name',
@@ -362,6 +365,13 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 120
         },
+        // {
+        //   type: 'string',
+        //   name: 'marketplaceOrderStatus',
+        //   header: i18next.t('field.marketplace_order_status'),
+        //   sortable: true,
+        //   width: 120
+        // },
         {
           type: 'string',
           name: 'status',
@@ -431,7 +441,6 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
               postalCode
               marketplaceOrderStatus
               transporter
-              orderRemark
               bizplace {
                 id
                 name

package/client/pages/order/release-order/bulk-print-packing-list.js

@@ -168,9 +168,6 @@ class BulkPrintPackingList extends localize(i18next)(PageView) {
                   rows="5"
                   readonly
                 ></textarea>
-
-                <label>${i18next.t('label.order_remark')}</label>
-                <textarea rows="5" readonly></textarea>
               </fieldset>
             </form>
 
@@ -268,7 +265,6 @@ class BulkPrintPackingList extends localize(i18next)(PageView) {
               attentionTo
               phone1
               deliveryAddress1
-              remark
               bizplace {
                 id
                 name

package/client/pages/order/release-order/receive-release-order-request.js

@@ -828,6 +828,8 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
         title: i18next.t('title.reject_release_order')
       }
     )
+
+    popup.onclosed
   }
 
   async _generateSinglePickingWorksheet() {

package/client/pages/order/release-order/release-order-detail.js

@@ -55,7 +55,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       _containerArrivalDate: Date,
       _containerLeavingDate: Date,
       _vasExpanded: Boolean,
-      _beforeRemark: String,
       isUserBelongsDomain: Boolean
     }
   }
@@ -310,10 +309,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             <label ?hidden="${this.roType === 'b2b'}">${i18next.t('label.delivery_address')}</label>
             <textarea name="deliveryAddress1" ?hidden="${this.roType === 'b2b'}" rows="5" readonly></textarea>
 
-            <label ?hidden="${this.roType === 'b2b'}">${i18next.t('label.order_remark')}</label>
-            <textarea name="remark" ?hidden="${this.roType === 'b2b'}" rows="5" ?readonly="${!this
-      ?._editable}"></textarea>
-
             ${
               this._crossDocking
                 ? html`
@@ -562,10 +557,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return this.shadowRoot.querySelector('input[name=warehouseTransport]')
   }
 
-  get _remarkInput() {
-    return this.shadowRoot.querySelector('textarea[name=remark]')
-  }
-
   get _exportInput() {
     return this.shadowRoot.querySelector('input[name=exportOption]')
   }
@@ -758,6 +749,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           type: 'object',
           name: 'vas',
           header: i18next.t('field.vas'),
+          record: { options: { queryName: 'vass' } },
           width: 250
         },
         {
@@ -798,7 +790,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             attentionTo
             phone1
             deliveryAddress1
-            remark
             bizplace {
               id
               name
@@ -943,7 +934,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this.partnerBizplaceId = releaseOrder.bizplace.id
       this._exportOption = releaseOrder.exportOption
 
-      this._beforeRemark = releaseOrder?.remark
       this._courierOption = releaseOrder.courierOption
       this._packingOption = releaseOrder.packingOption
       this._crossDocking = releaseOrder?.crossDocking
@@ -974,9 +964,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         this._attachments = releaseOrder && releaseOrder.attachment
       }
 
-      const nonEditableStatus = ['DONE', 'PACKING']
-
-      if (!nonEditableStatus.includes(releaseOrder.status) && this.isUserBelongsDomain) {
+      if (releaseOrder.status !== 'DONE' && this.isUserBelongsDomain) {
         this._editable = true
       } else {
         this._editable = false
@@ -1056,6 +1044,8 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         title: i18next.t('title.reject_release_order')
       }
     )
+
+    popup.onclosed
   }
 
   async _receiveReleaseOrder() {
@@ -1219,7 +1209,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     this._packingOption = false
     this._ownTransport = true
     this._downloadable = true
-    this._beforeRemark = null
     this._attachments = []
     this.inventoryData = { records: [] }
     this.vasData = { records: [] }
@@ -1227,6 +1216,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
   async _deleteReleaseOrder() {
     try {
+      let userIsOfficeAdmin = this._userRoles
+        ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+        : false
+
       let result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.you_wont_be_able_to_revert_this'),
@@ -1267,6 +1260,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _submitCancellationReleaseOrder() {
+    let userIsOfficeAdmin = this._userRoles
+      ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+      : false
+
     try {
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
@@ -1314,6 +1311,10 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _confirmReleaseOrder() {
+    let userIsOfficeAdmin = this._userRoles
+      ? this._userRoles.find(x => x.name?.toLowerCase() === 'office admin')
+      : false
+
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
       text: i18next.t('text.confirm_release_good'),
@@ -1359,7 +1360,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     try {
       const response = await client.query({
         query: gql`
-          query checkUserBelongsDomain {
+          query {
             checkUserBelongsDomain
           }
         `
@@ -1430,31 +1431,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this._validateTransport()
       this._validateForm()
 
-      let releaseOrder = this._getFormInfo()
-      delete releaseOrder.warehouseTransport
-      delete releaseOrder.bizplaceId
-      delete releaseOrder.bizplaceName
-      delete releaseOrder.status
-      delete releaseOrder.ganNo
-
-      let afterRemarkValue
-      if (releaseOrder?.remark) {
-        afterRemarkValue = releaseOrder.remark = releaseOrder.remark.trimStart()
-      }
-
-      if (this._beforeRemark !== afterRemarkValue) {
-        if (!afterRemarkValue) {
-          const remarkResult = await CustomAlert({
-            title: i18next.t('title.removing_order_remark'),
-            text: i18next.t('text.do_you_want_to_proceed'),
-            confirmButton: { text: i18next.t('button.proceed') },
-            cancelButton: { text: i18next.t('button.cancel') }
-          })
-
-          if (!remarkResult.value) return
-        }
-      }
-
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.update_release_order_details'),
@@ -1464,6 +1440,13 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
       if (!result.value) return
 
+      let releaseOrder = this._getFormInfo()
+      delete releaseOrder.warehouseTransport
+      delete releaseOrder.bizplaceId
+      delete releaseOrder.bizplaceName
+      delete releaseOrder.status
+      delete releaseOrder.ganNo
+
       let shippingOrder = this._exportOption ? this._serializeForm(this.shippingOrderForm) : null
 
       const response = await client.mutate({
@@ -1496,15 +1479,14 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _getFormInfo() {
-    let formData = this._serializeForm(this.releaseOrderForm)
+    const formData = this._serializeForm(this.releaseOrderForm)
     delete formData.importedOrder
-
     return formData
   }
 
   _serializeForm(form) {
     let obj = {}
-    Array.from(form.querySelectorAll('input, select, textarea')).forEach(field => {
+    Array.from(form.querySelectorAll('input, select')).forEach(field => {
       if (!field.hasAttribute('hidden')) {
         obj[field.name] = field.type === 'checkbox' ? field.checked : field.value
       }

package/client/pages/order/return-order/receive-return-order-requests.js

@@ -510,6 +510,8 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
         title: i18next.t('title.reject_return_order')
       }
     )
+
+    popup.onclosed
   }
 
   _showToast({ type, message }) {

package/client/pages/order/transfer-order/receive-transfer-order-request.js

@@ -423,7 +423,7 @@ class ReceiveTransferOrderRequest extends localize(i18next)(PageView) {
   //     }
   //   )
 
-  //  
+  //   popup.onclosed
   // }
 
   get _columns() {

package/client/pages/order/transport-order/print-delivery-note.js

@@ -227,6 +227,7 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
         title: i18next.t('title.completed_delivery_order')
       }
     )
+    popup.onclosed
   }
 
   _editDeliveryNote() {