@things-factory/product-ui 4.1.40 → 4.3.0-alpha.0

package/client/components/product-combination-selection-popup.js

@@ -2,7 +2,7 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, gqlContext } from '@things-factory/shell'

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

@@ -2,7 +2,7 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, gqlContext } from '@things-factory/shell'

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

@@ -3,7 +3,7 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import { css, html } from 'lit'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'

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

@@ -2,7 +2,7 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, gqlContext } from '@things-factory/shell'
@@ -337,7 +337,7 @@ class ProductCombinationSettingsPopup extends localize(i18next)(LitElement) {
       let patches = this.productCombinationSettingGrist.dirtyData.records.map(record => {
         const qty = record.qty
         if (!qty || qty <= 0 || !Number.isSafeInteger(qty)) {
-          throw new Error(i18next.t('text.invalid_qty_for_item_number_x', { state: {x: record.__seq__} }))
+          throw new Error(i18next.t('text.invalid_qty_for_item_number_x', { state: { x: record.__seq__ } }))
         }
         return {
           // only existing product combination will have id

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

@@ -3,7 +3,7 @@ import '@things-factory/grist-ui'
 import './product-combination-settings-popup'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, gqlContext } from '@things-factory/shell'

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

@@ -3,7 +3,10 @@ import '@things-factory/grist-ui'
 import './product-combinations-popup'
 
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
+import isEmpty from 'lodash-es/isEmpty'
+import isNaN from 'lodash-es/isNaN'
+import isNumber from 'lodash-es/isNumber'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -12,8 +15,6 @@ 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) {
   static get styles() {
     return [
@@ -568,20 +569,20 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
     let data = this.dataGrist._data.records.map(itm => {
       itm.error = false
 
-      if (_.isEmpty(itm.gtin) || '') {
+      if (isEmpty(itm.gtin) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'gtin')) errors.push({ type: 'gtin', value: 'GTIN is required' })
       }
-      if (_.isEmpty(itm.packingType) || '') {
+      if (isEmpty(itm.packingType) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'packingType'))
           errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
-      if (_.isEmpty(itm.uom) || '') {
+      if (isEmpty(itm.uom) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '') {
+      if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
@@ -639,7 +640,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           ...this.dataGrist._data,
           records: this._updateRowOption(
             this.dataGrist._data.records.map((record, idx) => {
-              if (!_.isEmpty(record.childProductDetail) && record.childProductDetail == before) {
+              if (!isEmpty(record.childProductDetail) && record.childProductDetail == before) {
                 record.childProductDetail = after
               }
               return record
@@ -649,7 +650,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
         break
       case 'uomValue':
-        if (_.isNaN(after)) {
+        if (isNaN(after)) {
           updatedRecords.records[row].uomValue = 1
         }
         break
@@ -704,7 +705,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
                 value: ''
               },
               ...data
-                .filter(child => child.gtin != itm.gtin && !_.isEmpty(child.gtin))
+                .filter(child => child.gtin != itm.gtin && !isEmpty(child.gtin))
                 .map(x => {
                   const rowOption = {
                     display: x.gtin,

package/client/pages/product-list.js

@@ -2,18 +2,17 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import './product-details-popup'
 
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { CustomAlert, PageView, client, gqlContext } from '@things-factory/shell'
+import { css, html } from 'lit'
+import { i18next, localize } from '@things-factory/i18n-base'
 
+import { PICKING_STRATEGIES } from './constants/picking-strategy'
 import { getCodeByName } from '@things-factory/code-base'
-import { i18next, localize } from '@things-factory/i18n-base'
+import gql from 'graphql-tag'
+import { isMobileDevice } from '@things-factory/utils'
 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 { isMobileDevice } from '@things-factory/utils'
-
-import { PICKING_STRATEGIES } from './constants/picking-strategy'
 
 class ProductList extends localize(i18next)(PageView) {
   static get properties() {

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

@@ -6,7 +6,7 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 
 export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
   static get styles() {

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

@@ -8,7 +8,7 @@ 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 } from 'lit-element'
+import { css, html } from 'lit'
 import './product-set-link-popup'
 
 class ProductSetList extends localize(i18next)(PageView) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.1.40",
+  "version": "4.3.0-alpha.0",
   "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.1.40",
-    "@things-factory/grist-ui": "^4.1.40",
-    "@things-factory/i18n-base": "^4.1.40",
-    "@things-factory/import-ui": "^4.1.40",
-    "@things-factory/layout-base": "^4.1.40",
-    "@things-factory/product-base": "^4.1.40",
-    "@things-factory/shell": "^4.1.40"
+    "@things-factory/form-ui": "^4.3.0-alpha.0",
+    "@things-factory/grist-ui": "^4.3.0-alpha.0",
+    "@things-factory/i18n-base": "^4.3.0-alpha.0",
+    "@things-factory/import-ui": "^4.3.0-alpha.0",
+    "@things-factory/layout-base": "^4.3.0-alpha.0",
+    "@things-factory/product-base": "^4.3.0-alpha.0",
+    "@things-factory/shell": "^4.3.0-alpha.0"
   },
-  "gitHead": "060b5c664e80a6fcba09598f2c7ceffe067e02bf"
+  "gitHead": "6467d1b2a5b2f8abb1bc3982e4651a5742ad4043"
 }

package/translations/en.json

@@ -62,6 +62,11 @@
   "field.weight_unit": "weight unit",
   "field.weight": "weight",
   "field.width": "width",
+  "label.fefo": "FEFO",
+  "label.fmfo": "FMFO",
+  "label.fifo": "FIFO",
+  "label.lifo": "LIFO",
+  "label.location": "location",
   "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",

package/translations/ko.json

@@ -1,18 +1,11 @@
 {
   "field.picking_strategy": "[ko]picking strategy",
-  "field.require_serial_number_scanning": "[ko]require serial number scanning",
-  "field.packing_size": "[ko]packing size",
-  "field.deleted": "[ko]deleted",
-  "button.restore": "[ko]restore",
-  "text.there_is_nothing_to_restore": "[ko]there is nothing to restore",
-  "text.data_restore_successfully": "[ko]data restore successfully",
-  "text.invalid_bundle_qty_for_item_number": "[ko] invalid bundle qty for item number",
-  "text.invalid_qty_for_item_number_x": "[ko] invalid qty for item #{state.x}",
   "button.add_new_product": "[ko]add new product",
   "button.back": "[ko]back",
   "button.cancel": "[ko]cancel",
   "button.delete": "[ko]delete",
   "button.link_product": "[ko]link product",
+  "button.restore": "[ko]restore",
   "button.save": "[ko]save",
   "button.sync_data": "[ko]sync data",
   "field.aux_unit": "[ko]aux unit",
@@ -20,7 +13,7 @@
   "field.brand_sku": "[ko]brand sku",
   "field.buffer_qty": "[ko]buffer qty",
   "field.case_depth": "[ko]case depth",
-  "field.case_gross_weight": "c[ko]ase gross weight",
+  "field.case_gross_weight": "[ko]case gross weight",
   "field.case_gtin": "[ko]case GTIN",
   "field.case_height": "[ko]case height",
   "field.case_volume": "[ko]case volume",
@@ -30,13 +23,13 @@
   "field.child_product_ref": "[ko]child product ref",
   "field.child_qty": "[ko]child qty",
   "field.cogs_account_code": "[ko]COGS account code",
-  "field.combination": "[ko] combination",
+  "field.combination": "[ko]combination",
+  "field.deleted": "[ko]deleted",
   "field.density": "[ko]density",
   "field.depth": "[ko]depth",
   "field.description": "[ko]description",
   "field.expiration_period": "[ko]expiration Period",
   "field.gross_weight": "g[ko]ross weight",
-  "field.nett_weight": "n[ko]ett weight",
   "field.gtin": "[ko]GTIN",
   "field.height": "[ko]height",
   "field.inventory_account_code": "[ko]inventory account code",
@@ -45,11 +38,14 @@
   "field.min_qty": "[ko]min qty",
   "field.movement": "[ko]movement",
   "field.name": "[ko]name",
+  "field.nett_weight": "n[ko]ett weight",
+  "field.packing_size": "[ko]packing size",
   "field.packing_type": "[ko]packing type",
   "field.product_info": "[ko]product info",
   "field.product_ref": "[ko]product ref",
   "field.product_set_info": "[ko]product set info",
-  "field.ref_code": "[ko] ref code",
+  "field.ref_code": "[ko]ref code",
+  "field.require_serial_number_scanning": "[ko]require serial number scanning",
   "field.required_checking_expiry": "[ko]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[ko] require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[ko] require serial number scanning outbound",
@@ -65,11 +61,20 @@
   "field.weight_unit": "[ko]weight unit",
   "field.weight": "[ko]weight",
   "field.width": "[ko]width",
-  "title.linked_products": "[ko] linked products",
+  "label.fefo": "[ko]FEFO",
+  "label.fmfo": "[ko]FMFO",
+  "label.fifo": "[ko]FIFO",
+  "label.lifo": "[ko]LIFO",
+  "label.location": "[ko]location",
+  "text.data_restore_successfully": "[ko]data restore successfully",
+  "text.invalid_bundle_qty_for_item_number": "[ko]invalid bundle qty for item number",
+  "text.invalid_qty_for_item_number_x": "[ko]invalid qty for item #{state.x}",
+  "text.there_is_nothing_to_restore": "[ko]there is nothing to restore",
+  "title.combination_sets": "[ko]combination sets",
+  "title.combination": "[ko]combination",
+  "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_sets": "[ko] combination sets"
+  "title.product": "[ko]product"
 }

package/translations/ms.json

@@ -1,18 +1,11 @@
 {
   "field.picking_strategy": "[ms]picking strategy",
-  "field.require_serial_number_scanning": "[ms]require serial number scanning",
-  "field.packing_size": "[ms]packing size",
-  "field.deleted": "[ms]deleted",
-  "button.restore": "[ms]restore",
-  "text.there_is_nothing_to_restore": "[ms]there is nothing to restore",
-  "text.data_restore_successfully": "[ms]data restore successfully",
-  "text.invalid_bundle_qty_for_item_number": "[ms] invalid bundle qty for item number",
-  "text.invalid_qty_for_item_number_x": "[ms] invalid qty for item #{state.x}",
   "button.add_new_product": "[ms]add new product",
   "button.back": "[ms]back",
   "button.cancel": "[ms]cancel",
   "button.delete": "[ms]delete",
   "button.link_product": "[ms]link product",
+  "button.restore": "[ms]restore",
   "button.save": "[ms]save",
   "button.sync_data": "[ms]sync data",
   "field.aux_unit": "[ms]aux unit",
@@ -31,12 +24,12 @@
   "field.child_qty": "[ms]child qty",
   "field.cogs_account_code": "[ms]COGS account code",
   "field.combination": "[ms] combination",
+  "field.deleted": "[ms]deleted",
   "field.density": "[ms]density",
   "field.depth": "[ms]depth",
   "field.description": "[ms]description",
   "field.expiration_period": "[ms]expiration Period",
   "field.gross_weight": "g[ms]ross weight",
-  "field.nett_weight": "n[ms]ett weight",
   "field.gtin": "[ms]GTIN",
   "field.height": "[ms]height",
   "field.inventory_account_code": "[ms]inventory account code",
@@ -45,11 +38,14 @@
   "field.min_qty": "[ms]min qty",
   "field.movement": "[ms]movement",
   "field.name": "[ms]name",
+  "field.nett_weight": "n[ms]ett weight",
+  "field.packing_size": "[ms]packing size",
   "field.packing_type": "[ms]packing type",
   "field.product_info": "[ms]product info",
   "field.product_ref": "[ms]product ref",
   "field.product_set_info": "[ms]product set info",
   "field.ref_code": "[ms]ref code",
+  "field.require_serial_number_scanning": "[ms]require serial number scanning",
   "field.required_checking_expiry": "[ms]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[ms]require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[ms]require serial number scanning outbound",
@@ -65,11 +61,20 @@
   "field.weight_unit": "[ms]weight unit",
   "field.weight": "[ms]weight",
   "field.width": "[ms]width",
+  "label.fefo": "[ms]FEFO",
+  "label.fmfo": "[ms]FMFO",
+  "label.fifo": "[ms]FIFO",
+  "label.lifo": "[ms]LIFO",
+  "label.location": "[ms]location",
+  "text.data_restore_successfully": "[ms]data restore successfully",
+  "text.invalid_bundle_qty_for_item_number": "[ms] invalid bundle qty for item number",
+  "text.invalid_qty_for_item_number_x": "[ms] invalid qty for item #{state.x}",
+  "text.there_is_nothing_to_restore": "[ms]there is nothing to restore",
+  "title.combination_sets": "[ms] combination sets",
+  "title.combination": "[ms] combination",
   "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_sets": "[ms] combination sets"
+  "title.product": "[ms]product"
 }

package/translations/zh.json

@@ -1,22 +1,13 @@
 {
   "field.picking_strategy": "[zh]picking strategy",
-  "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",
-  "text.invalid_bundle_qty_for_item_number": "[zh] invalid bundle qty for item number",
-  "text.invalid_qty_for_item_number_x": "[zh] invalid qty for item #{state.x}",
-
   "button.add_new_product": "[zh]add new product",
   "button.back": "[zh]back",
   "button.cancel": "[zh]cancel",
   "button.delete": "[zh]delete",
   "button.link_product": "[zh]link product",
+  "button.restore": "[zh]restore",
   "button.save": "[zh]save",
   "button.sync_data": "[zh]sync data",
-
-  "field.packing_size": "[zh]packing size",
-  "field.deleted": "[zh]deleted",
   "field.aux_unit": "[zh]aux unit",
   "field.aux_value": "[zh]aux value",
   "field.brand_sku": "[zh]brand sku",
@@ -33,12 +24,12 @@
   "field.child_qty": "[zh]child qty",
   "field.cogs_account_code": "[zh]COGS account code",
   "field.combination": "[zh] combination",
+  "field.deleted": "[zh]deleted",
   "field.density": "[zh]density",
   "field.depth": "[zh]depth",
   "field.description": "[zh]description",
   "field.expiration_period": "[zh]expiration Period",
   "field.gross_weight": "[zh]gross weight",
-  "field.nett_weight": "[zh]nett weight",
   "field.gtin": "[zh]GTIN",
   "field.height": "[zh]height",
   "field.inventory_account_code": "[zh]inventory account code",
@@ -47,11 +38,14 @@
   "field.min_qty": "[zh]min qty",
   "field.movement": "[zh]movement",
   "field.name": "[zh]name",
+  "field.nett_weight": "[zh]nett weight",
+  "field.packing_size": "[zh]packing size",
   "field.packing_type": "[zh]packing type",
   "field.product_info": "[zh]product info",
   "field.product_ref": "[zh]product ref",
   "field.product_set_info": "[zh]product set info",
   "field.ref_code": "[zh]ref code",
+  "field.require_serial_number_scanning": "[zh]require serial number scanning",
   "field.required_checking_expiry": "[zh]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[zh]require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[zh]require serial number scanning outbound",
@@ -67,11 +61,20 @@
   "field.weight_unit": "[zh]weight unit",
   "field.weight": "[zh]weight",
   "field.width": "[zh]width",
+  "label.fefo": "[ms]FEFO",
+  "label.fmfo": "[ms]FMFO",
+  "label.fifo": "[ms]FIFO",
+  "label.lifo": "[ms]LIFO",
+  "label.location": "[ms]location",
+  "text.data_restore_successfully": "[zh]data restore successfully",
+  "text.invalid_bundle_qty_for_item_number": "[zh] invalid bundle qty for item number",
+  "text.invalid_qty_for_item_number_x": "[zh] invalid qty for item #{state.x}",
+  "text.there_is_nothing_to_restore": "[zh]there is nothing to restore",
+  "title.combination_sets": "[zh] combination sets",
+  "title.combination": "[zh] combination",
   "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_sets": "[zh] combination sets"
+  "title.product": "[zh]product"
 }