@things-factory/operato-mms 3.6.25 → 3.6.33

package/client/pages/order/logistics/request-ro-popup.js

@@ -1,10 +1,13 @@
 import '@material/mwc-button'
-import { i18next } from '@things-factory/i18n-base'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import { i18next } 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 RequestROPopup extends LitElement {
@@ -164,6 +167,13 @@ class RequestROPopup extends LitElement {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'postCode',
+          header: i18next.t('field.post_code'),
+          sortable: true,
+          width: 130
+        },
         {
           type: 'string',
           name: 'itemCount',
@@ -275,17 +285,18 @@ class RequestROPopup extends LitElement {
     let filters = []
 
     if (this.store) {
-      filters.push({
-        name: 'marketplaceStore',
-        operator: 'eq',
-        value: this.store.id
-      })
-
-      filters.push({
-        name: 'status',
-        operator: 'in',
-        value: this.getROCreatableStatus()
-      })
+      filters.push(
+        {
+          name: 'marketplaceStoreId',
+          operator: 'eq',
+          value: this.store.id
+        },
+        {
+          name: 'status',
+          operator: 'in',
+          value: this.getROCreatableStatus()
+        }
+      )
     }
 
     const pagination = { page, limit }
@@ -356,7 +367,8 @@ class RequestROPopup extends LitElement {
       marketplaceOrders = marketplaceOrders.map(item => {
         return {
           ...item,
-          newTrackingNo: this.getTrackingNos(item.marketplaceOrderItems)
+          newTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'trackingNo'),
+          postCode: this.getOrderShippingInformation(item.marketplaceOrderItems, 'postCode')
         }
       })
 
@@ -367,8 +379,8 @@ class RequestROPopup extends LitElement {
     }
   }
 
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -383,23 +395,34 @@ class RequestROPopup extends 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 'postCode':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            item = marketplaceOrderShipping.postCode
+          })
+        }
+        break
     }
 
-    return trackingNo
+    return item
   }
 
   getROCreatableStatus() {

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

@@ -235,6 +235,13 @@ class OrderByStore extends localize(i18next)(PageView) {
           sortable: true,
           width: 130
         },
+        {
+          type: 'string',
+          name: 'postCode',
+          header: i18next.t('field.post_code'),
+          sortable: true,
+          width: 130
+        },
         {
           type: 'string',
           name: 'itemCount',
@@ -331,7 +338,7 @@ class OrderByStore extends localize(i18next)(PageView) {
 
     if (this.store) {
       filters.push({
-        name: 'marketplaceStore',
+        name: 'marketplaceStoreId',
         operator: 'eq',
         value: this.store.id
       })
@@ -415,7 +422,8 @@ class OrderByStore extends localize(i18next)(PageView) {
       marketplaceOrders = marketplaceOrders.map(item => {
         return {
           ...item,
-          newTrackingNo: this.getTrackingNos(item.marketplaceOrderItems)
+          newTrackingNo: this.getOrderShippingInformation(item.marketplaceOrderItems, 'trackingNo'),
+          postCode: this.getOrderShippingInformation(item.marketplaceOrderItems, 'postCode')
         }
       })
 
@@ -426,8 +434,8 @@ class OrderByStore extends localize(i18next)(PageView) {
     }
   }
 
-  getTrackingNos(marketplaceOrderItems) {
-    let trackingNo = ''
+  getOrderShippingInformation(marketplaceOrderItems, type) {
+    let item
     let marketplaceOrderShippings = []
 
     marketplaceOrderItems.map(item => {
@@ -442,23 +450,34 @@ class OrderByStore extends localize(i18next)(PageView) {
       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 'postCode':
+        if (uniqueMarketplaceOrderShippings) {
+          uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
+            item = marketplaceOrderShipping.postCode
+          })
+        }
+        break
     }
 
-    return trackingNo
+    return item
   }
 
   _syncOrder() {

package/config.development.js

@@ -2,29 +2,30 @@ module.exports = {
   domainType: 'company',
   ormconfig: {
     name: 'default',
-    type: 'postgres',
-    database: 'postgres',
-    username: 'postgres',
-    password: 'abcd1234',
-    host: 'localhost',
-    port: 15432,
-    synchronize: true,
-    logging: true
+    type: 'sqlite',
+    database: 'db.sqlite',
+    synchronize: false,
+    logging: true,
+    logger: 'debug'
+    // name: 'default',
+    // type: 'postgres',
+    // database: 'postgres',
+    // username: 'postgres',
+    // password: 'abcd1234',
+    // host: 'localhost',
+    // port: 15432,
+    // synchronize: true,
+    // logging: true
+  },
+  oauth2: {
+    platforms: [
+      {
+        name: 'Operato Hub',
+        apiURL: 'http://operato-m.localhost:3000/api'
+      }
+    ]
   },
-  // ormconfig: {
-  //   name: 'default',
-  //   type: 'postgres',
-  //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'abcd1234',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
-  //   synchronize: true,
-  //   logging: true
-  // },
   useVirtualHostBasedDomain: false,
-  accessTokenCookieKey: 'access_token.mms',
-  subdomainOffset: 2,
   port: 5000,
   uploads: 'uploads',
   attachmentsPath: 'attachments',
@@ -39,13 +40,14 @@ module.exports = {
       level: 'info'
     }
   },
-  // marketplaceIntegrationShopee: {
-  //   platform: 'shopee',
-  //   isUAT: true,
-  //   application: 'MMS v2',
-  //   partnerId: 1002560,
-  //   partnerKey: '6670f392184ea1c5b5ea8d468f668d911baec6feebcee9bde55c00423b4568b2'
-  // },
+  fulfillmentIntegrationOperato: {
+    host: 'operatohub.com',
+    platform: 'operato',
+    application: 'Operato MMS',
+    appKey: '480d19cbfb0655357878119559d47333',
+    appSecret: 'dc5078bc17d50a18ef6fc3188934bbbd',
+    callback: 'https://www.myoperato.com/callback-operato'
+  },
   marketplaceIntegrationShopee: {
     platform: 'shopee',
     isUAT: false,
@@ -60,31 +62,6 @@ module.exports = {
     appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
     callback: 'https://myoperato.com/lazada-callback'
   },
-  marketplaceIntegrationShopify: {
-    platform: 'shopify',
-    application: 'Operato MMS',
-    apiKey: '21e55f83b2b705172364c93a18cf560c',
-    apiSecret: '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'
-  },
-  marketplaceIntegrationShopifyPrivate: {
-    platform: 'shopify',
-    application: 'Operato MMS Test',
-    apiKey: '5be8c95bc9a03d41e3c0da3d8c033747',
-    apiSecret: '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'
-  },
-  fulfillmentIntegrationOperato: {
-    protocol: 'http',
-    host: 'operato-h.com:3000',
-    platform: 'operato',
-    application: 'Operato MMS',
-    appKey: 'a9bf751e622bf146662b240d58971051',
-    appSecret: '1c385935dc131c4b902b9bbf6a4798af',
-    callback: 'http://operato-m.com:5000/callback-operato'
-  },
-  lmdIntegrationCitylink: {
-    protocol: 'http',
-    host: '202.133.101.28:8889'
-  },
   notification: {
     fcm: {
       serviceAccount: {

package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js

@@ -17,7 +17,7 @@ exports.autoAddReleaseOrderResolver = {
             .leftJoinAndSelect('MO.marketplaceStore', 'MPS')
             .where('MO.domain = :domainId', { domainId: domain.id })
             .andWhere('MO.releaseOrderId IS NULL')
-            .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled'] })
+            .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled', 'packed'] })
             .andWhere('MPS.status = :marketplaceStatus', { marketplaceStatus: 'ACTIVE' })
             .getMany();
         var fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(warehouseId);

package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,uDAAyE;AACzE,qFAAwE;AACxE,uEAA6F;AAC7F,iDAA8C;AAEjC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,EAAE,WAAW,EAA2B,EAAE,OAAY;QACvF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,EAAE,GAAyC,IAAA,4BAAkB,EAAC,mCAAgB,EAAE,IAAI,CAAC,CAAA;QAC3F,MAAM,iBAAiB,GAAuB,MAAM,EAAE;aACnD,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,CAAC;aACpD,iBAAiB,CAAC,8BAA8B,EAAE,KAAK,CAAC;aACxD,iBAAiB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC3D,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;aAC/C,KAAK,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvD,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,EAAE,CAAC;aACnF,QAAQ,CAAC,iCAAiC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;aAC5E,OAAO,EAAE,CAAA;QAEZ,IAAI,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAEhD,IAAI,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,IAAI,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;QAC/E,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,IAAI,CACvD,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CACrE,CAAC,EAAE,CAAA;QAEJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAE7C,MAAM,yBAAyB,GAA+B,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,IAAI,CAAC;gBAC/G,KAAK,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;aACxD,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzD,MAAM,wBAAwB,GAA6B,yBAAyB,CAAC,CAAC,CAAC,CAAA;gBAEvF,MAAM,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;gBAC7B,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;qBAC/D,QAAQ,EAAE;qBACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAA;gBAEnE,MAAM,mBAAmB,GAAQ;oBAC/B,WAAW;oBACX,IAAI,EAAE,KAAK;oBACX,WAAW,EAAE,gBAAgB,CAAC,gBAAgB;oBAC9C,UAAU,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa;wBACjD,CAAC,CAAC,wBAAwB,CAAC,aAAa;wBACxC,CAAC,CAAC,wBAAwB,CAAC,UAAU;oBACvC,aAAa,EAAE,IAAI;oBACnB,YAAY,EAAE,KAAK;oBACnB,YAAY,EAAE,IAAI;oBAClB,aAAa,EAAE,IAAI;oBACnB,iBAAiB,EAAE,gBAAgB,CAAC,OAAO;oBAC3C,KAAK,EAAE,gBAAgB,CAAC,OAAO;oBAC/B,MAAM,EAAE,gBAAgB,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,yBAAyB,CAAC,MAAM;oBAC3F,SAAS,EAAE;wBACT,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;wBACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;wBACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;wBACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;wBACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;wBACnD,WAAW,EAAE,wBAAwB,CAAC,WAAW;wBACjD,IAAI,EAAE,wBAAwB,CAAC,IAAI;wBACnC,UAAU,EAAE,wBAAwB,CAAC,QAAQ;wBAC7C,OAAO,EAAE,wBAAwB,CAAC,OAAO;wBACzC,KAAK,EAAE,wBAAwB,CAAC,KAAK;wBACrC,MAAM,EAAE,wBAAwB,CAAC,MAAM;wBACvC,MAAM,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,MAAM,EAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;qBAClF;oBACD,sBAAsB,EAAE,gBAAgB,CAAC,MAAM;oBAC/C,UAAU,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,UAAU,EAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;oBAC7F,OAAO,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,OAAO,EAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;oBACpF,gBAAgB,EAAE,gBAAgB,CAAC,qBAAqB;yBACrD,MAAM,CAAC,IAAI,CAAC,EAAE;wBACb,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,KAAK,wBAAwB,CAAC,EAAE,EAAE;4BACpE,OAAO,IAAI,CAAA;yBACZ;oBACH,CAAC,CAAC;yBACD,GAAG,CAAC,CAAC,SAAc,EAAE,EAAE;wBACtB,MAAM,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,GAAQ,SAAS,CAAA;wBACxE,OAAO;4BACL,OAAO,EAAE;gCACP,GAAG,EAAE,gBAAgB,CAAC,GAAG;6BAC1B;4BACD,UAAU,EAAE,SAAS,CAAC,GAAG;yBAC1B,CAAA;oBACH,CAAC,CAAC;iBACL,CAAA;gBAED,IAAI,YAAY,GAAQ,MAAM,wCAAc,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;oBACjF,kBAAkB;oBAClB,YAAY,EAAE,mBAAmB;iBAClC,CAAC,CAAA;aACH;YAED,gBAAgB,CAAC,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;YACjD,gBAAgB,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;YACrD,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;SAC7D;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-mms",
-  "version": "3.6.25",
+  "version": "3.6.33",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,8 +25,8 @@
     "clean:server": "rm -rf dist-server",
     "clean:client": "rm -rf dist-client",
     "clean": "npm run clean:server && npm run clean:client",
-    "migration": "npm run build:server && things-factory-migration",
-    "migration:privileges": "npm run build:server && things-factory-migration-privileges",
+    "migration": "things-factory-migration",
+    "migration:privileges": "things-factory-migration-privileges",
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations",
     "migration:generate": "node ../../node_modules/typeorm/cli.js migration:generate",
     "migration:run": "node ../../node_modules/typeorm/cli.js migration:run",
@@ -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.24",
-    "@things-factory/attachment-base": "^3.6.24",
-    "@things-factory/auth-ui": "^3.6.24",
-    "@things-factory/biz-base": "^3.6.24",
-    "@things-factory/board-service": "^3.6.24",
-    "@things-factory/board-ui": "^3.6.24",
-    "@things-factory/code-ui": "^3.6.24",
-    "@things-factory/context-ui": "^3.6.24",
-    "@things-factory/dashboard": "^3.6.24",
-    "@things-factory/export-ui": "^3.6.24",
-    "@things-factory/export-ui-csv": "^3.6.24",
-    "@things-factory/export-ui-excel": "^3.6.24",
-    "@things-factory/geography": "^3.6.24",
-    "@things-factory/grist-ui": "^3.6.24",
-    "@things-factory/help": "^3.6.24",
-    "@things-factory/i18n-ui": "^3.6.24",
-    "@things-factory/integration-fulfillment": "^3.6.24",
-    "@things-factory/integration-lmd": "^3.6.24",
-    "@things-factory/lite-menu": "^3.6.24",
-    "@things-factory/marketplace-base": "^3.6.25",
-    "@things-factory/more-ui": "^3.6.24",
-    "@things-factory/notification": "^3.6.24",
-    "@things-factory/oauth2-client": "^3.6.24",
-    "@things-factory/pdf": "^3.6.24",
-    "@things-factory/product-base": "^3.6.24",
-    "@things-factory/resource-ui": "^3.6.24",
-    "@things-factory/scene-chartjs": "^3.6.24",
-    "@things-factory/scene-clock": "^3.6.24",
-    "@things-factory/scene-clone": "^3.6.24",
-    "@things-factory/scene-compass": "^3.6.24",
-    "@things-factory/scene-data-transform": "^3.6.24",
-    "@things-factory/scene-excel": "^3.6.24",
-    "@things-factory/scene-firebase": "^3.6.24",
-    "@things-factory/scene-form": "^3.6.24",
-    "@things-factory/scene-gauge": "^3.6.24",
-    "@things-factory/scene-google-map": "^3.6.24",
-    "@things-factory/scene-graphql": "^3.6.24",
-    "@things-factory/scene-grist": "^3.6.24",
-    "@things-factory/scene-half-roundrect": "^3.6.24",
-    "@things-factory/scene-indoor-map": "^3.6.24",
-    "@things-factory/scene-integration": "^3.6.24",
-    "@things-factory/scene-label": "^3.6.24",
-    "@things-factory/scene-legend": "^3.6.24",
-    "@things-factory/scene-marker": "^3.6.24",
-    "@things-factory/scene-mqtt": "^3.6.24",
-    "@things-factory/scene-news-ticker": "^3.6.24",
-    "@things-factory/scene-progressbar": "^3.6.24",
-    "@things-factory/scene-random": "^3.6.24",
-    "@things-factory/scene-restful": "^3.6.24",
-    "@things-factory/scene-switch": "^3.6.24",
-    "@things-factory/scene-tab": "^3.6.24",
-    "@things-factory/scene-table": "^3.6.24",
-    "@things-factory/scene-timer": "^3.6.24",
-    "@things-factory/scene-visualizer": "^3.6.24",
-    "@things-factory/scene-wheel-sorter": "^3.6.24",
-    "@things-factory/setting-ui": "^3.6.24",
-    "@things-factory/system-ui": "^3.6.24",
-    "@things-factory/warehouse-base": "^3.6.25"
+    "@things-factory/apptool-ui": "^3.6.33",
+    "@things-factory/attachment-base": "^3.6.33",
+    "@things-factory/auth-ui": "^3.6.33",
+    "@things-factory/biz-base": "^3.6.33",
+    "@things-factory/board-service": "^3.6.33",
+    "@things-factory/board-ui": "^3.6.33",
+    "@things-factory/code-ui": "^3.6.33",
+    "@things-factory/context-ui": "^3.6.33",
+    "@things-factory/dashboard": "^3.6.33",
+    "@things-factory/export-ui": "^3.6.33",
+    "@things-factory/export-ui-csv": "^3.6.33",
+    "@things-factory/export-ui-excel": "^3.6.33",
+    "@things-factory/geography": "^3.6.33",
+    "@things-factory/grist-ui": "^3.6.33",
+    "@things-factory/help": "^3.6.33",
+    "@things-factory/i18n-ui": "^3.6.33",
+    "@things-factory/integration-fulfillment": "^3.6.33",
+    "@things-factory/integration-lmd": "^3.6.33",
+    "@things-factory/lite-menu": "^3.6.33",
+    "@things-factory/marketplace-base": "^3.6.33",
+    "@things-factory/more-ui": "^3.6.33",
+    "@things-factory/notification": "^3.6.33",
+    "@things-factory/oauth2-client": "^3.6.33",
+    "@things-factory/pdf": "^3.6.33",
+    "@things-factory/product-base": "^3.6.33",
+    "@things-factory/resource-ui": "^3.6.33",
+    "@things-factory/scene-chartjs": "^3.6.33",
+    "@things-factory/scene-clock": "^3.6.33",
+    "@things-factory/scene-clone": "^3.6.33",
+    "@things-factory/scene-compass": "^3.6.33",
+    "@things-factory/scene-data-transform": "^3.6.33",
+    "@things-factory/scene-excel": "^3.6.33",
+    "@things-factory/scene-firebase": "^3.6.33",
+    "@things-factory/scene-form": "^3.6.33",
+    "@things-factory/scene-gauge": "^3.6.33",
+    "@things-factory/scene-google-map": "^3.6.33",
+    "@things-factory/scene-graphql": "^3.6.33",
+    "@things-factory/scene-grist": "^3.6.33",
+    "@things-factory/scene-half-roundrect": "^3.6.33",
+    "@things-factory/scene-indoor-map": "^3.6.33",
+    "@things-factory/scene-integration": "^3.6.33",
+    "@things-factory/scene-label": "^3.6.33",
+    "@things-factory/scene-legend": "^3.6.33",
+    "@things-factory/scene-marker": "^3.6.33",
+    "@things-factory/scene-mqtt": "^3.6.33",
+    "@things-factory/scene-news-ticker": "^3.6.33",
+    "@things-factory/scene-progressbar": "^3.6.33",
+    "@things-factory/scene-random": "^3.6.33",
+    "@things-factory/scene-restful": "^3.6.33",
+    "@things-factory/scene-switch": "^3.6.33",
+    "@things-factory/scene-tab": "^3.6.33",
+    "@things-factory/scene-table": "^3.6.33",
+    "@things-factory/scene-timer": "^3.6.33",
+    "@things-factory/scene-visualizer": "^3.6.33",
+    "@things-factory/scene-wheel-sorter": "^3.6.33",
+    "@things-factory/setting-ui": "^3.6.33",
+    "@things-factory/system-ui": "^3.6.33",
+    "@things-factory/warehouse-base": "^3.6.33"
   },
   "devDependencies": {
-    "@things-factory/builder": "^3.6.24",
+    "@things-factory/builder": "^3.6.33",
     "@types/node-fetch": "^2.5.7"
   },
-  "gitHead": "ed7ebb0b015be0995a24c0d9dba244473ff41982"
+  "gitHead": "965ef2f6fdc604b4f800e4d01337a3814b3b0d21"
 }

package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts

@@ -17,7 +17,7 @@ export const autoAddReleaseOrderResolver = {
       .leftJoinAndSelect('MO.marketplaceStore', 'MPS')
       .where('MO.domain = :domainId', { domainId: domain.id })
       .andWhere('MO.releaseOrderId IS NULL')
-      .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled'] })
+      .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled', 'packed'] })
       .andWhere('MPS.status = :marketplaceStatus', { marketplaceStatus: 'ACTIVE' })
       .getMany()
 

package/translations/en.json

@@ -65,6 +65,7 @@
   "field.pallet_qty": "pallet qty",
   "field.pickup_date": "pickup date",
   "field.pickup_time_id": "pickup time id",
+  "field.post_code": "post code",
   "field.price": "price",
   "field.product_info": "product info",
   "field.product_name": "product name",

package/translations/ko.json

@@ -65,6 +65,7 @@
   "field.pallet_qty": "[ko] pallet qty",
   "field.pickup_date": "[ko] pickup date",
   "field.pickup_time_id": "[ko] pickup time id",
+  "field.post_code": "[ko] post code",
   "field.price": "[ko] price",
   "field.product_info": "[ko] product info",
   "field.product_name": "[ko] product name",

package/translations/ms.json

@@ -65,6 +65,7 @@
   "field.pallet_qty": "[ms] pallet qty",
   "field.pickup_date": "[ms] pickup date",
   "field.pickup_time_id": "[ms] pickup time id",
+  "field.post_code": "[ms] post code",
   "field.price": "[ms] price",
   "field.product_info": "[ms] product info",
   "field.product_name": "[ms] product name",

package/translations/zh.json

@@ -65,6 +65,7 @@
   "field.pallet_qty": "[zh] pallet qty",
   "field.pickup_date": "[zh] pickup date",
   "field.pickup_time_id": "[zh] pickup time id",
+  "field.post_code": "[zh] post code",
   "field.price": "[zh] price",
   "field.product_info": "[zh] product info",
   "field.product_name": "[zh] product name",