@things-factory/product-ui 4.0.11 → 4.0.12

package/client/pages/product-bundle-link-popup.js

@@ -266,16 +266,20 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
           productBundleSets(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
-              productId
-              productName
-              productSku
-              productDescription
-              productType
+              product {
+                id
+                name
+                sku
+                description
+                type
+              }
+              productDetail {
+                id
+                packingType
+                packingSize
+                gtin
+              }
               bundleQty
-              productDetailId
-              gtin
-              packingType
-              packingSize
             }
             total
           }
@@ -288,10 +292,24 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
       },
       context: gqlContext()
     })
-
+    const items = response.data.productBundleSets.items
     if (!response.errors) {
       return {
-        records: response.data.productBundleSets.items || [],
+        records:
+          items.map(itm => {
+            return {
+              productSku: itm.product.sku,
+              productName: itm.product.name,
+              productDescription: itm.product.description,
+              productType: itm.product.type,
+              gtin: itm.productDetail.gtin,
+              packingType: itm.productDetail.packingType,
+              packingSize: itm.productDetail.packingSize,
+              product: itm.product,
+              productDetail: itm.productDetail,
+              bundleQty: itm.bundleQty
+            }
+          }) || [],
         total: response.data.productBundleSets.total || 0
       }
     }
@@ -300,7 +318,7 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
   addProductLink(record) {
     if (
       this.productBundleData.records.findIndex(
-        x => x.productId === record.productId && x.productDetailId === record.productDetailId
+        x => x.product.id === record.product.id && x.productDetail.id === record.productDetail.id
       ) < 0
     ) {
       // set bundle qty to null because it is new item to be linked
@@ -334,8 +352,8 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
         return {
           // only existing product bundle will have id
           id: record.id || '',
-          product: { id: record.productId } || {},
-          productDetail: { id: record.productDetailId } || {},
+          product: { id: record.product.id } || {},
+          productDetail: { id: record.productDetail.id } || {},
           bundleQty
         }
       })
@@ -346,22 +364,7 @@ class ProductBundleLinkPopup extends localize(i18next)(LitElement) {
         const response = await client.query({
           query: gql`
             mutation linkProductBundle($productBundleId: String!, $patches: [ProductBundleSettingPatch!]!) {
-              linkProductBundle(productBundleId: $productBundleId, patches: $patches) {
-                id
-                productId
-                productSku
-                productName
-                productDescription
-                productType
-                bundleSku
-                bundleName
-                bundleDescription
-                bundleQty
-                productDetailId
-                gtin
-                packingType
-                packingSize
-              }
+              linkProductBundle(productBundleId: $productBundleId, patches: $patches)
             }
           `,
           variables: {

package/client/pages/product-combination-settings-popup.js

@@ -256,20 +256,24 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
     })
     const response = await client.query({
       query: gql`
-        query productCombinationSets($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query productCombinationSets($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           productCombinationSets(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
-              productId
-              productName
-              productSku
-              productDescription
-              productType
+              product {
+                id
+                name
+                sku
+                description
+                type
+              }
+              productDetail {
+                id
+                gtin
+                packingType
+                packingSize
+              }
               qty
-              productDetailId
-              gtin
-              packingType
-              packingSize
             }
             total
           }
@@ -282,9 +286,21 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
       },
       context: gqlContext()
     })
+    const items = response.data.productCombinationSets.items
     if (!response.errors) {
       return {
-        records: response.data.productCombinationSets.items || [],
+        records:
+          items.map(itm => {
+            return {
+              productSku: itm.product.sku,
+              gtin: itm.productDetail.gtin,
+              productName: itm.product.name,
+              packingType: itm.productDetail.packingType,
+              product: itm.product,
+              productDetail: itm.productDetail,
+              qty: itm.qty
+            }
+          }) || [],
         total: response.data.productCombinationSets.total || 0
       }
     }
@@ -293,7 +309,7 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
   addProductLink(record) {
     if (
       this.productCombinationSettingData.records.findIndex(
-        x => x.productId === record.productId && x.productDetailId === record.productDetailId
+        x => x.product.id === record.product.id && x.productDetail.id === record.productDetail.id
       ) < 0
     ) {
       // set qty to null because it is new item to be linked
@@ -326,8 +342,8 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
         return {
           // only existing product combination will have id
           id: record.id || '',
-          product: { id: record.productId } || {},
-          productDetail: { id: record.productDetailId } || {},
+          product: { id: record.product.id } || {},
+          productDetail: { id: record.productDetail.id } || {},
           qty
         }
       })
@@ -337,21 +353,9 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
           query: gql`
             mutation linkProductCombination(
               $productCombinationId: String!
-              $patches: [ProductCombinationSettingPatch]!
+              $patches: [ProductCombinationSettingPatch!]!
             ) {
-              linkProductCombination(productCombinationId: $productCombinationId, patches: $patches) {
-                id
-                productId
-                productSku
-                productName
-                productDescription
-                productType
-                qty
-                productDetailId
-                gtin
-                packingType
-                packingSize
-              }
+              linkProductCombination(productCombinationId: $productCombinationId, patches: $patches)
             }
           `,
           variables: {

package/client/pages/product-combinations-popup.js

@@ -235,7 +235,7 @@ class ProductCombinationsPopup extends localize(i18next)(LitElement) {
 
       const response = await client.query({
         query: gql`
-          query productCombinations($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          query productCombinations($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             productCombinations(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
                 id
@@ -322,7 +322,10 @@ class ProductCombinationsPopup extends localize(i18next)(LitElement) {
       if (patches) {
         const response = await client.query({
           query: gql`
-            mutation updateMultipleProductCombination($productDetailId: String!, $patches: [ProductCombinationPatch]!) {
+            mutation updateMultipleProductCombination(
+              $productDetailId: String!
+              $patches: [ProductCombinationPatch!]!
+            ) {
               updateMultipleProductCombination(productDetailId: $productDetailId, patches: $patches) {
                 id
                 name

package/client/pages/product-list.js

@@ -362,6 +362,14 @@ class ProductList extends localize(i18next)(PageView) {
             sortable: true,
             width: 120
           },
+          {
+            type: 'boolean',
+            name: 'isRequireSerialNumberScanning',
+            header: i18next.t('field.require_serial_number_scanning'),
+            record: { editable: true, align: 'center' },
+            sortable: true,
+            width: 120
+          },
           {
             type: 'object',
             name: 'productRef',
@@ -686,6 +694,7 @@ class ProductList extends localize(i18next)(PageView) {
               cogsAccountCode
               expirationPeriod
               isRequiredCheckExpiry
+              isRequireSerialNumberScanning
               weightUnit
               nettWeight
               grossWeight

package/client/pages/product-set-link-popup.js

@@ -1,14 +1,12 @@
+import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-
-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'
+import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
 
 export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
   static get styles() {
@@ -526,7 +524,7 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
 
     const response = await client.query({
       query: gql`
-        query myBizplaceProducts($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+        query myBizplaceProducts($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
           myBizplaceProducts(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               sku
@@ -639,7 +637,7 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
     if (this.productSetId && patches) {
       const response = await client.query({
         query: gql`
-          mutation($productSetId: String!, $patches: [ProductPatch!]!) {
+          mutation($productSetId: String!, $patches: [ProductPatch]!) {
             linkProduct(productSetId: $productSetId, patches: $patches)
           }
         `,
@@ -688,7 +686,7 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
 
       const response = await client.mutate({
         mutation: gql`
-          mutation updateMultipleProduct($patches: [ProductPatch!]!) {
+          mutation updateMultipleProduct($patches: [ProductPatch]!) {
             updateMultipleProduct(patches: $patches) {
               name
             }

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

@@ -1,17 +1,15 @@
+import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import './product-set-link-popup'
-
-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 { openImportPopUp } from '@things-factory/import-ui'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, gqlContext, PageView } from '@things-factory/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import './product-set-link-popup'
 
 class ProductSetList extends localize(i18next)(PageView) {
   static get properties() {
@@ -217,7 +215,7 @@ class ProductSetList extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query myBizplaceProductSets($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+        query myBizplaceProductSets($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
           myBizplaceProductSets(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
@@ -262,7 +260,7 @@ class ProductSetList extends localize(i18next)(PageView) {
 
     const response = await client.mutate({
       mutation: gql`
-        mutation updateMultipleProductSet($patches: [ProductSetPatch!]!) {
+        mutation updateMultipleProductSet($patches: [ProductSetPatch]!) {
           updateMultipleProductSet(patches: $patches) {
             name
           }
@@ -297,7 +295,7 @@ class ProductSetList extends localize(i18next)(PageView) {
 
     const response = await client.mutate({
       mutation: gql`
-        mutation deleteProductSets($ids: [String!]!) {
+        mutation deleteProductSets($ids: [String]!) {
           deleteProductSets(ids: $ids)
         }
       `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,13 +24,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/form-ui": "^4.0.11",
-    "@things-factory/grist-ui": "^4.0.11",
-    "@things-factory/i18n-base": "^4.0.11",
-    "@things-factory/import-ui": "^4.0.11",
-    "@things-factory/layout-base": "^4.0.11",
-    "@things-factory/product-base": "^4.0.11",
-    "@things-factory/shell": "^4.0.11"
+    "@things-factory/form-ui": "^4.0.12",
+    "@things-factory/grist-ui": "^4.0.12",
+    "@things-factory/i18n-base": "^4.0.12",
+    "@things-factory/import-ui": "^4.0.12",
+    "@things-factory/layout-base": "^4.0.12",
+    "@things-factory/product-base": "^4.0.12",
+    "@things-factory/shell": "^4.0.12"
   },
-  "gitHead": "47745d8cdbe99f11d8d69bbcab3901c9771525a0"
+  "gitHead": "29d59ff95fcb473cb43c6f798cd04f3ec3a779a0"
 }

package/translations/en.json

@@ -1,16 +1,10 @@
 {
-  "field.packing_size": "packing size",
-  "field.deleted": "deleted",
-  "button.restore": "restore",
-  "text.there_is_nothing_to_restore": "there is nothing to restore",
-  "text.data_restore_successfully": "data restore successfully",
-  "text.invalid_bundle_qty_for_item_number": "invalid bundle qty for item number",
-  "text.invalid_qty_for_item_number": "invalid qty for item number",
   "button.add_new_product": "add new product",
   "button.back": "back",
   "button.cancel": "cancel",
   "button.delete": "delete",
   "button.link_product": "link product",
+  "button.restore": "restore",
   "button.save": "save",
   "button.sync_data": "sync data",
   "field.aux_unit": "aux unit",
@@ -29,12 +23,12 @@
   "field.child_qty": "child qty",
   "field.cogs_account_code": "COGS account code",
   "field.combination": "combination",
+  "field.deleted": "deleted",
   "field.density": "density",
   "field.depth": "depth",
   "field.description": "description",
   "field.expiration_period": "expiration Period",
   "field.gross_weight": "gross weight",
-  "field.nett_weight": "nett weight",
   "field.gtin": "GTIN",
   "field.height": "height",
   "field.inventory_account_code": "inventory account code",
@@ -43,11 +37,14 @@
   "field.min_qty": "min qty",
   "field.movement": "movement",
   "field.name": "name",
+  "field.nett_weight": "nett weight",
+  "field.packing_size": "packing size",
   "field.packing_type": "packing type",
   "field.product_info": "product info",
   "field.product_ref": "product ref",
   "field.product_set_info": "product set info",
   "field.ref_code": "ref code",
+  "field.require_serial_number_scanning": "require serial number scanning",
   "field.required_checking_expiry": "required checking expiry",
   "field.sku": "SKU",
   "field.sub_brand": "sub brand",
@@ -61,9 +58,16 @@
   "field.weight_unit": "weight unit",
   "field.weight": "weight",
   "field.width": "width",
+  "text.data_import_successfully": "data import successfully",
+  "text.data_restore_successfully": "data restore successfully",
+  "text.invalid_bundle_qty_for_item_number": "invalid bundle qty for item number",
+  "text.invalid_qty_for_item_number": "invalid qty for item number",
+  "text.there_is_nothing_to_restore": "there is nothing to restore",
+  "title.combination_sets": "combination sets",
+  "title.combination": "combination",
+  "title.linked_products": "linked products",
   "title.product_bundle_setting": "product bundle setting",
   "title.product_bundle": "product bundle",
   "title.product_set": "product set",
-  "title.product": "product",
-  "title.combination": "combination"
+  "title.product": "product"
 }

package/translations/ko.json

@@ -1,4 +1,5 @@
 {
+  "field.require_serial_number_scanning": "[ko]require serial number scanning",
   "field.packing_size": "[ko]packing size",
   "field.deleted": "[ko]deleted",
   "button.restore": "[ko]restore",
@@ -61,9 +62,11 @@
   "field.weight_unit": "[ko]weight unit",
   "field.weight": "[ko]weight",
   "field.width": "[ko]width",
+  "title.linked_products": "[ko] linked products",
   "title.product_bundle_setting": "[ko]product bundle setting",
   "title.product_bundle": "[ko]product bundle",
   "title.product_set": "[ko]product set",
   "title.product": "[ko]product",
-  "title.combination": "[ko] combination"
+  "title.combination": "[ko] combination",
+  "title.combination_sets": "[ko] combination sets"
 }

package/translations/ms.json

@@ -1,4 +1,5 @@
 {
+  "field.require_serial_number_scanning": "[ms]require serial number scanning",
   "field.packing_size": "[ms]packing size",
   "field.deleted": "[ms]deleted",
   "button.restore": "[ms]restore",
@@ -61,9 +62,11 @@
   "field.weight_unit": "[ms]weight unit",
   "field.weight": "[ms]weight",
   "field.width": "[ms]width",
+  "title.linked_products": "[ms] linked products",
   "title.product_bundle_setting": "[ms]product bundle setting",
   "title.product_bundle": "[ms]product bundle",
   "title.product_set": "[ms]product set",
   "title.product": "[ms]product",
-  "title.combination": "[ms] combination"
+  "title.combination": "[ms] combination",
+  "title.combination_sets": "[ms] combination sets"
 }

package/translations/zh.json

@@ -1,4 +1,5 @@
 {
+  "field.require_serial_number_scanning": "[zh]require serial number scanning",
   "button.restore": "[zh]restore",
   "text.there_is_nothing_to_restore": "[zh]there is nothing to restore",
   "text.data_restore_successfully": "[zh]data restore successfully",
@@ -63,9 +64,11 @@
   "field.weight_unit": "[zh]weight unit",
   "field.weight": "[zh]weight",
   "field.width": "[zh]width",
+  "title.linked_products": "[zh] linked products",
   "title.product_bundle_setting": "[zh]product bundle setting",
   "title.product_bundle": "[zh]product bundle",
   "title.product_set": "[zh]product set",
   "title.product": "[zh]product",
-  "title.combination": "[zh] combination"
+  "title.combination": "[zh] combination",
+  "title.combination_sets": "[zh] combination sets"
 }