@things-factory/product-ui 4.3.434 → 4.3.443

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

@@ -3,26 +3,15 @@ import '@things-factory/grist-ui'
 import './product-combinations-popup'
 
 import gql from 'graphql-tag'
-import {
-  css,
-  html,
-  LitElement
-} from 'lit'
+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'
+import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import {
-  client,
-  CustomAlert,
-  gqlContext
-} from '@things-factory/shell'
+import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
@@ -677,24 +666,20 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
     let totalProductBarcodes = []
 
-    this.dataGrist._data.records.map(itm => {
+    let data = this.dataGrist._data.records.map((itm, index) => {
+      itm.error = false
+
       if (itm.productBarcodes) {
         itm.productBarcodes.map(itm2 => totalProductBarcodes.push(itm2.gtin))
       } else {
+        itm.error = true
         errors.push({ type: 'gtin', value: 'Gtin is required' })
       }
-    })
-
-    let duplicateProductBarcode = totalProductBarcodes.find(
-      (item, index) => totalProductBarcodes.indexOf(item) !== index
-    )
 
-    if (duplicateProductBarcode) {
-      throw new Error('Gtin cannot be duplicated')
-    }
-
-    let data = this.dataGrist._data.records.map((itm, index) => {
-      itm.error = false
+      // if (isEmpty(itm.refCode) || '') {
+      //   itm.error = true
+      //   if (!errors.find(err => err.type == 'refCode')) errors.push({ type: 'refCode', value: 'Ref code is required' })
+      // }
 
       if (isEmpty(itm.packingType) || '') {
         itm.error = true
@@ -716,6 +701,14 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
       return itm
     })
 
+    let duplicateProductBarcode = totalProductBarcodes.find(
+      (item, index) => totalProductBarcodes.indexOf(item) !== index
+    )
+
+    if (duplicateProductBarcode) {
+      throw new Error('Gtin cannot be duplicated')
+    }
+
     if (errors.length > 0) {
       this._data = {
         ...this.dataGrist.dirtyData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.434",
+  "version": "4.3.443",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,8 +28,8 @@
     "@things-factory/i18n-base": "^4.3.434",
     "@things-factory/import-ui": "^4.3.434",
     "@things-factory/layout-base": "^4.3.434",
-    "@things-factory/product-base": "^4.3.434",
+    "@things-factory/product-base": "^4.3.443",
     "@things-factory/shell": "^4.3.434"
   },
-  "gitHead": "1e313f6256aa565f49d71ee37f60f173c7b49bc0"
+  "gitHead": "9756867524d3f488d74f22738ef3f2d2aec1da8c"
 }