@things-factory/product-ui 4.3.301 → 4.3.326
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,15 +3,26 @@ import '@things-factory/grist-ui'
|
|
|
3
3
|
import './product-combinations-popup'
|
|
4
4
|
|
|
5
5
|
import gql from 'graphql-tag'
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
css,
|
|
8
|
+
html,
|
|
9
|
+
LitElement
|
|
10
|
+
} from 'lit'
|
|
7
11
|
import isEmpty from 'lodash-es/isEmpty'
|
|
8
12
|
import isNaN from 'lodash-es/isNaN'
|
|
9
13
|
import isNumber from 'lodash-es/isNumber'
|
|
10
14
|
|
|
11
15
|
import { getCodeByName } from '@things-factory/code-base'
|
|
12
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
i18next,
|
|
18
|
+
localize
|
|
19
|
+
} from '@things-factory/i18n-base'
|
|
13
20
|
import { openPopup } from '@things-factory/layout-base'
|
|
14
|
-
import {
|
|
21
|
+
import {
|
|
22
|
+
client,
|
|
23
|
+
CustomAlert,
|
|
24
|
+
gqlContext
|
|
25
|
+
} from '@things-factory/shell'
|
|
15
26
|
import { ScrollbarStyles } from '@things-factory/styles'
|
|
16
27
|
import { isMobileDevice } from '@things-factory/utils'
|
|
17
28
|
|
|
@@ -667,7 +678,11 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
|
|
|
667
678
|
let totalProductBarcodes = []
|
|
668
679
|
|
|
669
680
|
this.dataGrist._data.records.map(itm => {
|
|
670
|
-
itm.productBarcodes
|
|
681
|
+
if (itm.productBarcodes) {
|
|
682
|
+
itm.productBarcodes.map(itm2 => totalProductBarcodes.push(itm2.gtin))
|
|
683
|
+
} else {
|
|
684
|
+
errors.push({ type: 'gtin', value: 'Gtin is required' })
|
|
685
|
+
}
|
|
671
686
|
})
|
|
672
687
|
|
|
673
688
|
let duplicateProductBarcode = totalProductBarcodes.find(
|
|
@@ -422,20 +422,6 @@ class ProductList extends localize(i18next)(PageView) {
|
|
|
422
422
|
sortable: true,
|
|
423
423
|
width: 140
|
|
424
424
|
},
|
|
425
|
-
{
|
|
426
|
-
type: 'integer',
|
|
427
|
-
name: 'productShelfLife',
|
|
428
|
-
record: { editable: true, options: { min: 0 } },
|
|
429
|
-
imex: {
|
|
430
|
-
header: i18next.t('field.product_shelf_life'),
|
|
431
|
-
key: 'productShelfLife',
|
|
432
|
-
width: 30,
|
|
433
|
-
type: 'integer'
|
|
434
|
-
},
|
|
435
|
-
header: i18next.t('field.product_shelf_life'),
|
|
436
|
-
sortable: true,
|
|
437
|
-
width: 140
|
|
438
|
-
},
|
|
439
425
|
{
|
|
440
426
|
type: 'boolean',
|
|
441
427
|
name: 'isRequiredCheckExpiry',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/product-ui",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.326",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"@things-factory/i18n-base": "^4.3.281",
|
|
29
29
|
"@things-factory/import-ui": "^4.3.281",
|
|
30
30
|
"@things-factory/layout-base": "^4.3.281",
|
|
31
|
-
"@things-factory/product-base": "^4.3.
|
|
31
|
+
"@things-factory/product-base": "^4.3.318",
|
|
32
32
|
"@things-factory/shell": "^4.3.281"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "9cf676447c169fe7bff053c193ed30962ad177cc"
|
|
35
35
|
}
|