@scrumble-nl/gatherer-frontend 1.3.0-beta.3 → 1.3.1-beta.1
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.
- package/lib/commonjs/context/gatherer-context.js.map +1 -1
- package/lib/commonjs/hooks/use-scanner.js +1 -5
- package/lib/commonjs/hooks/use-scanner.js.map +1 -1
- package/lib/commonjs/picker/partials/modal/pick-quantity-select.js +6 -3
- package/lib/commonjs/picker/partials/modal/pick-quantity-select.js.map +1 -1
- package/lib/commonjs/picker/picker.js +23 -19
- package/lib/commonjs/picker/picker.js.map +1 -1
- package/lib/commonjs/shared/layout/data-format.js.map +1 -1
- package/lib/module/context/gatherer-context.js.map +1 -1
- package/lib/module/hooks/use-scanner.js +1 -5
- package/lib/module/hooks/use-scanner.js.map +1 -1
- package/lib/module/picker/partials/modal/pick-quantity-select.js +6 -3
- package/lib/module/picker/partials/modal/pick-quantity-select.js.map +1 -1
- package/lib/module/picker/picker.js +23 -19
- package/lib/module/picker/picker.js.map +1 -1
- package/lib/module/shared/layout/data-format.js.map +1 -1
- package/lib/typescript/context/gatherer-context.d.ts +1 -2
- package/lib/typescript/picker/picker.d.ts +1 -0
- package/package.json +1 -1
- package/src/context/gatherer-context.tsx +1 -1
- package/src/hooks/use-scanner.tsx +1 -3
- package/src/picker/partials/modal/pick-quantity-select.tsx +6 -3
- package/src/picker/picker.tsx +24 -17
- package/src/shared/layout/data-format.tsx +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["GathererContext","createContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","useState","defaultPickGroupItem","currentPickGroupId","useRef","useEffect","registerEventListener","savePickGroupData","useCallback","data","startPicking","pickGroupId","Promise","resolve","reject","post","START_PICKING_URL","pick_group_id","then","response","current","catch","switchPickItem","dir","url","PREV_PICK_ITEM_URL","NEXT_PICK_ITEM_URL","prevState","previous","next","pick_item_id","id","i18n","changeLanguage","context","useMemo","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) =>
|
|
1
|
+
{"version":3,"names":["GathererContext","createContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","useState","defaultPickGroupItem","currentPickGroupId","useRef","useEffect","registerEventListener","savePickGroupData","useCallback","data","startPicking","pickGroupId","Promise","resolve","reject","post","START_PICKING_URL","pick_group_id","then","response","current","catch","switchPickItem","dir","url","PREV_PICK_ITEM_URL","NEXT_PICK_ITEM_URL","prevState","previous","next","pick_item_id","id","i18n","changeLanguage","context","useMemo","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) => Record<string, string> & {barcode: string};\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({} as IGathererContext<any>);\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n parseEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.useScanner = void 0;
|
|
7
7
|
var _react = require("react");
|
|
8
|
-
var _useGatherer = require("../hooks/use-gatherer");
|
|
9
8
|
var _scanContext = require("../context/scan-context");
|
|
10
9
|
const useScanner = onScan => {
|
|
11
10
|
const {
|
|
@@ -13,9 +12,6 @@ const useScanner = onScan => {
|
|
|
13
12
|
clearEventListeners
|
|
14
13
|
} = (0, _react.useContext)(_scanContext.ScanContext);
|
|
15
14
|
const callbackRef = (0, _react.useRef)(onScan);
|
|
16
|
-
const {
|
|
17
|
-
parseEan
|
|
18
|
-
} = (0, _useGatherer.useGatherer)();
|
|
19
15
|
(0, _react.useEffect)(() => {
|
|
20
16
|
callbackRef.current = onScan;
|
|
21
17
|
}, [onScan]);
|
|
@@ -24,7 +20,7 @@ const useScanner = onScan => {
|
|
|
24
20
|
const trimmedScan = event.data.trim();
|
|
25
21
|
callbackRef.current(trimmedScan);
|
|
26
22
|
});
|
|
27
|
-
}, [
|
|
23
|
+
}, [registerListener]);
|
|
28
24
|
const stopScanner = (0, _react.useCallback)(() => {
|
|
29
25
|
clearEventListeners();
|
|
30
26
|
}, [clearEventListeners]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","
|
|
1
|
+
{"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","useEffect","current","startScanner","useCallback","event","trimmedScan","data","trim","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n\n callbackRef.current(trimmedScan);\n });\n }, [registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAIO,MAAMA,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAG,IAAAC,iBAAU,EAAeC,wBAAW,CAAC;EACrF,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAAeN,MAAM,CAAC;EAEhD,IAAAO,gBAAS,EAAC,MAAM;IACZF,WAAW,CAACG,OAAO,GAAGR,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMS,YAAY,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACzCT,gBAAgB,CAACU,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MAErCT,WAAW,CAACG,OAAO,CAACI,WAAW,CAAC;IACpC,CAAC,CAAC;EACN,CAAC,EAAE,CAACX,gBAAgB,CAAC,CAAC;EAEtB,MAAMc,WAAW,GAAG,IAAAL,kBAAW,EAAC,MAAY;IACxCR,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHO,YAAY;IACZM;EACJ,CAAC;AACL,CAAC;AAAC"}
|
|
@@ -34,7 +34,8 @@ const PickQuantitySelect = props => {
|
|
|
34
34
|
const [selectedQuantity, setSelectedQuantity] = (0, _react.useState)(1);
|
|
35
35
|
const [error, setError] = (0, _react.useState)('');
|
|
36
36
|
const {
|
|
37
|
-
pickItem
|
|
37
|
+
pickItem,
|
|
38
|
+
parseEan
|
|
38
39
|
} = (0, _useGatherer.useGatherer)();
|
|
39
40
|
const {
|
|
40
41
|
t
|
|
@@ -69,11 +70,13 @@ const PickQuantitySelect = props => {
|
|
|
69
70
|
}
|
|
70
71
|
};
|
|
71
72
|
const handleScan = scan => {
|
|
73
|
+
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
74
|
+
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
72
75
|
if (quantityToPick >= singlePickThreshold) {
|
|
73
76
|
setError(t('picker.modal.confirm-error'));
|
|
74
|
-
} else if (selectedQuantity >= quantityToPick && pickItem.barcode ===
|
|
77
|
+
} else if (selectedQuantity >= quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
75
78
|
exitModal();
|
|
76
|
-
} else if (selectedQuantity !== quantityToPick && pickItem.barcode ===
|
|
79
|
+
} else if (selectedQuantity !== quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
77
80
|
addOneToQuantity();
|
|
78
81
|
}
|
|
79
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","pickButtonText","styles","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","useState","error","setError","pickItem","useGatherer","t","useTranslation","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","barcode","startScanner","stopScanner","useScanner","useEffect","useCallback","GREY","WHITE"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\nimport {useGatherer} from '../../../hooks/use-gatherer';\n\ninterface props {\n visible: boolean;\n onPickItems: (quantityPicked: number) => void;\n}\n\nconst singlePickThreshold = 10;\nconst {\n amountSelectRow,\n button,\n subtractButton,\n addButton,\n amountText,\n pickButton,\n pickButtonContainer,\n pickButtonText,\n} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode ===
|
|
1
|
+
{"version":3,"names":["singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","pickButtonText","styles","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","useState","error","setError","pickItem","parseEan","useGatherer","t","useTranslation","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","eanCodes","scannedBarcode","barcode","startScanner","stopScanner","useScanner","useEffect","useCallback","GREY","WHITE"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\nimport {useGatherer} from '../../../hooks/use-gatherer';\n\ninterface props {\n visible: boolean;\n onPickItems: (quantityPicked: number) => void;\n}\n\nconst singlePickThreshold = 10;\nconst {\n amountSelectRow,\n button,\n subtractButton,\n addButton,\n amountText,\n pickButton,\n pickButtonContainer,\n pickButtonText,\n} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem, parseEan} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode === scannedBarcode) {\n exitModal();\n } else if (selectedQuantity !== quantityToPick && pickItem.barcode === scannedBarcode) {\n addOneToQuantity();\n }\n };\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n if (visible) {\n startScanner();\n setSelectedQuantity(quantityToPick < singlePickThreshold ? 1 : quantityToPick);\n }\n }, [visible, quantityToPick, startScanner]);\n\n const exitModal = useCallback((): void => {\n stopScanner();\n onPickItems(selectedQuantity);\n }, [onPickItems, selectedQuantity, stopScanner]);\n\n useEffect(() => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n }\n }, [exitModal, quantityToPick, selectedQuantity]);\n\n return (\n <View>\n <View style={amountSelectRow}>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, subtractButton]}\n onPress={subtractOneFromQuantity}\n >\n <Icon name=\"remove-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <Text style={amountText}>\n {selectedQuantity} / {quantityToPick}\n </Text>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, addButton]}\n onPress={addOneToQuantity}\n >\n <Icon name=\"add-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n </View>\n <View style={pickButtonContainer}>\n {error !== '' && <Text style={styles.error}>{error}</Text>}\n <Pressable style={pickButton} onPress={handlePick}>\n <Text style={pickButtonText}>{t('picker.modal.pick-items')}</Text>\n </Pressable>\n </View>\n </View>\n );\n};\n"],"mappings":"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"}
|
|
@@ -22,6 +22,12 @@ const {
|
|
|
22
22
|
container
|
|
23
23
|
} = _pickerStyles.styles;
|
|
24
24
|
const Picker = props => {
|
|
25
|
+
const {
|
|
26
|
+
children,
|
|
27
|
+
style,
|
|
28
|
+
onMultiQuantityPick,
|
|
29
|
+
onScan
|
|
30
|
+
} = props;
|
|
25
31
|
const {
|
|
26
32
|
pickItem,
|
|
27
33
|
parseEan
|
|
@@ -30,13 +36,17 @@ const Picker = props => {
|
|
|
30
36
|
const {
|
|
31
37
|
nextPickItem
|
|
32
38
|
} = (0, _usePickItemSwitch.usePickItemSwitch)();
|
|
33
|
-
const
|
|
39
|
+
const scanValue = (0, _react.useRef)('');
|
|
34
40
|
const closeModal = () => {
|
|
35
41
|
startScanner();
|
|
36
42
|
setPickModalVisible(false);
|
|
37
43
|
};
|
|
38
44
|
const handleMultiQuantityPick = quantityPicked => {
|
|
39
|
-
|
|
45
|
+
if (onScan) {
|
|
46
|
+
onScan(scanValue.current).then(metaData => nextPickItem(false, quantityPicked, metaData));
|
|
47
|
+
} else {
|
|
48
|
+
nextPickItem(false, quantityPicked);
|
|
49
|
+
}
|
|
40
50
|
closeModal();
|
|
41
51
|
};
|
|
42
52
|
const pickModal = props.pickModal ?? /*#__PURE__*/_react.default.createElement(_pickModal.PickModal, {
|
|
@@ -45,32 +55,26 @@ const Picker = props => {
|
|
|
45
55
|
closeModal: closeModal
|
|
46
56
|
});
|
|
47
57
|
const handleScan = (0, _react.useCallback)(scan => {
|
|
48
|
-
|
|
58
|
+
scanValue.current = scan;
|
|
49
59
|
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
50
60
|
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
51
|
-
|
|
52
|
-
metaData.current = scannedBatchCode ? {
|
|
53
|
-
barcodes: [scannedBatchCode]
|
|
54
|
-
} : undefined;
|
|
55
|
-
console.log({
|
|
56
|
-
eanCodes,
|
|
57
|
-
scannedBarcode,
|
|
58
|
-
scannedBatchCode,
|
|
59
|
-
metaData: metaData.current
|
|
60
|
-
});
|
|
61
|
+
onScan === null || onScan === void 0 ? void 0 : onScan(scan).then(metaData => console.log('meta', metaData));
|
|
61
62
|
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
62
63
|
if (pickItem.quantity === 1) {
|
|
63
|
-
|
|
64
|
+
if (onScan) {
|
|
65
|
+
onScan(scan).then(metaData => nextPickItem(false, 1, metaData));
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
nextPickItem(false, 1);
|
|
64
69
|
} else {
|
|
65
70
|
if (props.pickModal) {
|
|
66
|
-
|
|
67
|
-
(_props$onMultiQuantit = props.onMultiQuantityPick) === null || _props$onMultiQuantit === void 0 ? void 0 : _props$onMultiQuantit.call(props);
|
|
71
|
+
onMultiQuantityPick === null || onMultiQuantityPick === void 0 ? void 0 : onMultiQuantityPick();
|
|
68
72
|
return;
|
|
69
73
|
}
|
|
70
74
|
setPickModalVisible(true);
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
|
-
}, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
77
|
+
}, [parseEan, pickItem.barcode, pickItem.quantity, onScan, nextPickItem, props.pickModal, onMultiQuantityPick]);
|
|
74
78
|
const {
|
|
75
79
|
startScanner,
|
|
76
80
|
stopScanner
|
|
@@ -80,8 +84,8 @@ const Picker = props => {
|
|
|
80
84
|
return () => stopScanner();
|
|
81
85
|
}, [startScanner, stopScanner]);
|
|
82
86
|
return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
|
|
83
|
-
style: [container,
|
|
84
|
-
}, pickModal,
|
|
87
|
+
style: [container, style]
|
|
88
|
+
}, pickModal, children);
|
|
85
89
|
};
|
|
86
90
|
exports.Picker = Picker;
|
|
87
91
|
Picker.Row = _dataRow.DataRow;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["container","styles","Picker","props","pickItem","parseEan","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","
|
|
1
|
+
{"version":3,"names":["container","styles","Picker","props","children","style","onMultiQuantityPick","onScan","pickItem","parseEan","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","scanValue","useRef","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","current","then","metaData","pickModal","handleScan","useCallback","scan","eanCodes","scannedBarcode","barcode","console","log","quantity","stopScanner","useScanner","useEffect","Row","Column","Progress","ProgressBar","PickAmount","ProductInfo"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useRef, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n onScan?: (scan: string) => Promise<any>;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {children, style, onMultiQuantityPick, onScan} = props;\n const {pickItem, parseEan} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n const scanValue = useRef<string>('');\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n if (onScan) {\n onScan(scanValue.current).then(metaData => nextPickItem(false, quantityPicked, metaData));\n } else {\n nextPickItem(false, quantityPicked);\n }\n\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n scanValue.current = scan;\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n\n onScan?.(scan).then(metaData => console.log('meta', metaData));\n\n if (scan !== '' && scannedBarcode === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n if (onScan) {\n onScan(scan).then(metaData => nextPickItem(false, 1, metaData));\n\n return;\n }\n\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [parseEan, pickItem.barcode, pickItem.quantity, onScan, nextPickItem, props.pickModal, onMultiQuantityPick],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, style]}>\n {pickModal}\n {children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["dataText","styles","DataFormat","props","data"],"sources":["data-format.tsx"],"sourcesContent":["import React from 'react';\nimport {Text} from 'react-native';\n\nimport {styles} from './styles/layout-styles';\n\ninterface props {\n data: JSX.Element | string | number;\n}\n\nconst {dataText} = styles;\n\nexport const DataFormat = (props: props): JSX.Element => {\n const {data} = props;\n\n if (typeof data === 'string' || typeof data === 'number') {\n return <Text style={dataText} numberOfLines={1}
|
|
1
|
+
{"version":3,"names":["dataText","styles","DataFormat","props","data"],"sources":["data-format.tsx"],"sourcesContent":["import React from 'react';\nimport {Text} from 'react-native';\n\nimport {styles} from './styles/layout-styles';\n\ninterface props {\n data: JSX.Element | string | number;\n}\n\nconst {dataText} = styles;\n\nexport const DataFormat = (props: props): JSX.Element => {\n const {data} = props;\n\n if (typeof data === 'string' || typeof data === 'number') {\n return (\n <Text style={dataText} numberOfLines={1}>\n {data}\n </Text>\n );\n }\n\n return data;\n};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AAA8C;AAM9C,MAAM;EAACA;AAAQ,CAAC,GAAGC,oBAAM;AAElB,MAAMC,UAAU,GAAIC,KAAY,IAAkB;EACrD,MAAM;IAACC;EAAI,CAAC,GAAGD,KAAK;EAEpB,IAAI,OAAOC,IAAI,KAAK,QAAQ,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE;IACtD,oBACI,6BAAC,iBAAI;MAAC,KAAK,EAAEJ,QAAS;MAAC,aAAa,EAAE;IAAE,GACnCI,IAAI,CACF;EAEf;EAEA,OAAOA,IAAI;AACf,CAAC;AAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","START_PICKING_URL","GathererContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","currentPickGroupId","registerEventListener","savePickGroupData","data","startPicking","pickGroupId","Promise","resolve","reject","post","pick_group_id","then","response","current","catch","switchPickItem","dir","url","prevState","previous","next","pick_item_id","id","changeLanguage","context","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) =>
|
|
1
|
+
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","START_PICKING_URL","GathererContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","currentPickGroupId","registerEventListener","savePickGroupData","data","startPicking","pickGroupId","Promise","resolve","reject","post","pick_group_id","then","response","current","catch","switchPickItem","dir","url","prevState","previous","next","pick_item_id","id","changeLanguage","context","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) => Record<string, string> & {barcode: string};\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({} as IGathererContext<any>);\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n parseEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAGC,aAAa,EAAaC,WAAW,EAAEC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAO,OAAO;AAIxG,OAAOC,IAAI,MAAM,cAAc;AAC/B,SAAQC,mBAAmB,QAAO,gBAAgB;AAClD,SAAQC,oBAAoB,QAAO,mCAAmC;AACtE,SAAQC,kBAAkB,EAAEC,kBAAkB,EAAEC,iBAAiB,QAAO,wBAAwB;AAkBhG,OAAO,MAAMC,eAAe,gBAAGZ,aAAa,CAAwB,CAAC,CAAC,CAA0B;AAEhG,OAAO,MAAMa,uBAAuB,GAA+BC,KAAY,IAAkB;EAC7F,MAAM;IAACC,kBAAkB;IAAEC,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAQ,CAAC,GAAGL,KAAK,CAACM,MAAM;EACnF,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAGjB,QAAQ,CAAcG,oBAAoB,CAAC;EAC3E,MAAMe,kBAAkB,GAAGnB,MAAM,CAAS,CAAC,CAAC;EAE5CF,SAAS,CAAC,MAAM;IAAA;IACZ,yBAAAa,kBAAkB,CAACS,qBAAqB,0DAAxC,2BAAAT,kBAAkB,CAA0B;EAChD,CAAC,EAAE,CAACA,kBAAkB,CAAC,CAAC;EAExB,MAAMU,iBAAiB,GAAGxB,WAAW,CAAEyB,IAAiB,IAAW;IAC/DJ,WAAW,CAACI,IAAI,CAAC;EACrB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,YAAY,GAAG1B,WAAW,CAC5B,MAAO2B,WAAmB,IAA2B;IACjD,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACpCf,QAAQ,CACHgB,IAAI,CAACrB,iBAAiB,EAAE;QAACsB,aAAa,EAAEL;MAAW,CAAC,CAAC,CACrDM,IAAI,CAACC,QAAQ,IAAI;QACdZ,kBAAkB,CAACa,OAAO,GAAGR,WAAW;QACxCH,iBAAiB,CAACU,QAAQ,CAACT,IAAI,CAAC;QAChCI,OAAO,CAACK,QAAQ,CAACT,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDW,KAAK,CAACN,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACf,QAAQ,EAAES,iBAAiB,CAAC,CAChC;EAED,MAAMa,cAAc,GAAGrC,WAAW,CAC9B,MAAOsC,GAAe,IAA2B;IAC7C,MAAMC,GAAG,GAAGD,GAAG,KAAK,MAAM,GAAG7B,kBAAkB,GAAGD,kBAAkB;IAEpEa,WAAW,CAACmB,SAAS,IAAI;MACrB,IAAIF,GAAG,KAAK,MAAM,IAAIE,SAAS,CAACC,QAAQ,EAAE;QACtC,OAAOD,SAAS,CAACC,QAAQ;MAC7B;MAEA,IAAIH,GAAG,KAAK,MAAM,IAAIE,SAAS,CAACE,IAAI,EAAE;QAClC,OAAOF,SAAS,CAACE,IAAI;MACzB;MAEA,OAAOF,SAAS;IACpB,CAAC,CAAC;IAEF,OAAO,IAAIZ,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACpCf,QAAQ,CACHgB,IAAI,CAACQ,GAAG,EAAE;QACPP,aAAa,EAAEV,kBAAkB,CAACa,OAAO;QACzCQ,YAAY,EAAEvB,QAAQ,CAACA,QAAQ,CAACwB;MACpC,CAAC,CAAC,CACDX,IAAI,CAACC,QAAQ,IAAI;QACdb,WAAW,CAACa,QAAQ,CAACT,IAAI,CAAC;QAC1BI,OAAO,CAACK,QAAQ,CAACT,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDW,KAAK,CAACN,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACf,QAAQ,EAAEK,QAAQ,CAACA,QAAQ,CAACwB,EAAE,CAAC,CACnC;EAED3C,SAAS,CAAC,MAAM;IACZ,IAAIgB,QAAQ,EAAE;MACVZ,IAAI,CAACwC,cAAc,CAAC5B,QAAQ,CAAC;IACjC;EACJ,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,MAAM6B,OAAO,GAAG5C,OAAO,CACnB,OAAO;IACHkB,QAAQ;IACRL,QAAQ;IACRC,UAAU;IACVU,YAAY;IACZW,cAAc;IACdnB,QAAQ;IACRM,iBAAiB;IACjBV,kBAAkB;IAClBQ,kBAAkB,EAAEA,kBAAkB,CAACa;EAC3C,CAAC,CAAC,EACF,CAACjB,QAAQ,EAAEH,QAAQ,EAAEC,UAAU,EAAEI,QAAQ,EAAEI,iBAAiB,EAAEV,kBAAkB,EAAEY,YAAY,EAAEW,cAAc,CAAC,CAClH;EAED,oBACI,oBAAC,eAAe,CAAC,QAAQ;IAAC,KAAK,EAAES;EAAQ,gBACrC,oBAAC,mBAAmB;IAAC,OAAO,EAAEjC,KAAK,CAACM,MAAM,CAACL;EAAmB,GAAED,KAAK,CAACkC,QAAQ,CAAuB,CAC9E;AAEnC,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { useCallback, useContext, useEffect, useRef } from 'react';
|
|
2
|
-
import { useGatherer } from '../hooks/use-gatherer';
|
|
3
2
|
import { ScanContext } from '../context/scan-context';
|
|
4
3
|
export const useScanner = onScan => {
|
|
5
4
|
const {
|
|
@@ -7,9 +6,6 @@ export const useScanner = onScan => {
|
|
|
7
6
|
clearEventListeners
|
|
8
7
|
} = useContext(ScanContext);
|
|
9
8
|
const callbackRef = useRef(onScan);
|
|
10
|
-
const {
|
|
11
|
-
parseEan
|
|
12
|
-
} = useGatherer();
|
|
13
9
|
useEffect(() => {
|
|
14
10
|
callbackRef.current = onScan;
|
|
15
11
|
}, [onScan]);
|
|
@@ -18,7 +14,7 @@ export const useScanner = onScan => {
|
|
|
18
14
|
const trimmedScan = event.data.trim();
|
|
19
15
|
callbackRef.current(trimmedScan);
|
|
20
16
|
});
|
|
21
|
-
}, [
|
|
17
|
+
}, [registerListener]);
|
|
22
18
|
const stopScanner = useCallback(() => {
|
|
23
19
|
clearEventListeners();
|
|
24
20
|
}, [clearEventListeners]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useContext","useEffect","useRef","
|
|
1
|
+
{"version":3,"names":["useCallback","useContext","useEffect","useRef","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","current","startScanner","event","trimmedScan","data","trim","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n\n callbackRef.current(trimmedScan);\n });\n }, [registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAO,OAAO;AAEhE,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGP,UAAU,CAAeG,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGN,MAAM,CAAeG,MAAM,CAAC;EAEhDJ,SAAS,CAAC,MAAM;IACZO,WAAW,CAACC,OAAO,GAAGJ,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMK,YAAY,GAAGX,WAAW,CAAC,MAAY;IACzCO,gBAAgB,CAACK,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MAErCN,WAAW,CAACC,OAAO,CAACG,WAAW,CAAC;IACpC,CAAC,CAAC;EACN,CAAC,EAAE,CAACN,gBAAgB,CAAC,CAAC;EAEtB,MAAMS,WAAW,GAAGhB,WAAW,CAAC,MAAY;IACxCQ,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHG,YAAY;IACZK;EACJ,CAAC;AACL,CAAC"}
|
|
@@ -25,7 +25,8 @@ export const PickQuantitySelect = props => {
|
|
|
25
25
|
const [selectedQuantity, setSelectedQuantity] = useState(1);
|
|
26
26
|
const [error, setError] = useState('');
|
|
27
27
|
const {
|
|
28
|
-
pickItem
|
|
28
|
+
pickItem,
|
|
29
|
+
parseEan
|
|
29
30
|
} = useGatherer();
|
|
30
31
|
const {
|
|
31
32
|
t
|
|
@@ -60,11 +61,13 @@ export const PickQuantitySelect = props => {
|
|
|
60
61
|
}
|
|
61
62
|
};
|
|
62
63
|
const handleScan = scan => {
|
|
64
|
+
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
65
|
+
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
63
66
|
if (quantityToPick >= singlePickThreshold) {
|
|
64
67
|
setError(t('picker.modal.confirm-error'));
|
|
65
|
-
} else if (selectedQuantity >= quantityToPick && pickItem.barcode ===
|
|
68
|
+
} else if (selectedQuantity >= quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
66
69
|
exitModal();
|
|
67
|
-
} else if (selectedQuantity !== quantityToPick && pickItem.barcode ===
|
|
70
|
+
} else if (selectedQuantity !== quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
68
71
|
addOneToQuantity();
|
|
69
72
|
}
|
|
70
73
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useState","TouchableHighlight","View","Text","Pressable","useTranslation","Icon","styles","GREY","WHITE","useScanner","useGatherer","singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","pickButtonText","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","error","setError","pickItem","t","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","barcode","startScanner","stopScanner"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\nimport {useGatherer} from '../../../hooks/use-gatherer';\n\ninterface props {\n visible: boolean;\n onPickItems: (quantityPicked: number) => void;\n}\n\nconst singlePickThreshold = 10;\nconst {\n amountSelectRow,\n button,\n subtractButton,\n addButton,\n amountText,\n pickButton,\n pickButtonContainer,\n pickButtonText,\n} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode ===
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useState","TouchableHighlight","View","Text","Pressable","useTranslation","Icon","styles","GREY","WHITE","useScanner","useGatherer","singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","pickButtonText","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","error","setError","pickItem","parseEan","t","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","eanCodes","scannedBarcode","barcode","startScanner","stopScanner"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\nimport {useGatherer} from '../../../hooks/use-gatherer';\n\ninterface props {\n visible: boolean;\n onPickItems: (quantityPicked: number) => void;\n}\n\nconst singlePickThreshold = 10;\nconst {\n amountSelectRow,\n button,\n subtractButton,\n addButton,\n amountText,\n pickButton,\n pickButtonContainer,\n pickButtonText,\n} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem, parseEan} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode === scannedBarcode) {\n exitModal();\n } else if (selectedQuantity !== quantityToPick && pickItem.barcode === scannedBarcode) {\n addOneToQuantity();\n }\n };\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n if (visible) {\n startScanner();\n setSelectedQuantity(quantityToPick < singlePickThreshold ? 1 : quantityToPick);\n }\n }, [visible, quantityToPick, startScanner]);\n\n const exitModal = useCallback((): void => {\n stopScanner();\n onPickItems(selectedQuantity);\n }, [onPickItems, selectedQuantity, stopScanner]);\n\n useEffect(() => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n }\n }, [exitModal, quantityToPick, selectedQuantity]);\n\n return (\n <View>\n <View style={amountSelectRow}>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, subtractButton]}\n onPress={subtractOneFromQuantity}\n >\n <Icon name=\"remove-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <Text style={amountText}>\n {selectedQuantity} / {quantityToPick}\n </Text>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, addButton]}\n onPress={addOneToQuantity}\n >\n <Icon name=\"add-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n </View>\n <View style={pickButtonContainer}>\n {error !== '' && <Text style={styles.error}>{error}</Text>}\n <Pressable style={pickButton} onPress={handlePick}>\n <Text style={pickButtonText}>{t('picker.modal.pick-items')}</Text>\n </Pressable>\n </View>\n </View>\n );\n};\n"],"mappings":"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"}
|
|
@@ -14,6 +14,12 @@ const {
|
|
|
14
14
|
container
|
|
15
15
|
} = styles;
|
|
16
16
|
const Picker = props => {
|
|
17
|
+
const {
|
|
18
|
+
children,
|
|
19
|
+
style,
|
|
20
|
+
onMultiQuantityPick,
|
|
21
|
+
onScan
|
|
22
|
+
} = props;
|
|
17
23
|
const {
|
|
18
24
|
pickItem,
|
|
19
25
|
parseEan
|
|
@@ -22,13 +28,17 @@ const Picker = props => {
|
|
|
22
28
|
const {
|
|
23
29
|
nextPickItem
|
|
24
30
|
} = usePickItemSwitch();
|
|
25
|
-
const
|
|
31
|
+
const scanValue = useRef('');
|
|
26
32
|
const closeModal = () => {
|
|
27
33
|
startScanner();
|
|
28
34
|
setPickModalVisible(false);
|
|
29
35
|
};
|
|
30
36
|
const handleMultiQuantityPick = quantityPicked => {
|
|
31
|
-
|
|
37
|
+
if (onScan) {
|
|
38
|
+
onScan(scanValue.current).then(metaData => nextPickItem(false, quantityPicked, metaData));
|
|
39
|
+
} else {
|
|
40
|
+
nextPickItem(false, quantityPicked);
|
|
41
|
+
}
|
|
32
42
|
closeModal();
|
|
33
43
|
};
|
|
34
44
|
const pickModal = props.pickModal ?? /*#__PURE__*/React.createElement(PickModal, {
|
|
@@ -37,32 +47,26 @@ const Picker = props => {
|
|
|
37
47
|
closeModal: closeModal
|
|
38
48
|
});
|
|
39
49
|
const handleScan = useCallback(scan => {
|
|
40
|
-
|
|
50
|
+
scanValue.current = scan;
|
|
41
51
|
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
42
52
|
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
43
|
-
|
|
44
|
-
metaData.current = scannedBatchCode ? {
|
|
45
|
-
barcodes: [scannedBatchCode]
|
|
46
|
-
} : undefined;
|
|
47
|
-
console.log({
|
|
48
|
-
eanCodes,
|
|
49
|
-
scannedBarcode,
|
|
50
|
-
scannedBatchCode,
|
|
51
|
-
metaData: metaData.current
|
|
52
|
-
});
|
|
53
|
+
onScan === null || onScan === void 0 ? void 0 : onScan(scan).then(metaData => console.log('meta', metaData));
|
|
53
54
|
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
54
55
|
if (pickItem.quantity === 1) {
|
|
55
|
-
|
|
56
|
+
if (onScan) {
|
|
57
|
+
onScan(scan).then(metaData => nextPickItem(false, 1, metaData));
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
nextPickItem(false, 1);
|
|
56
61
|
} else {
|
|
57
62
|
if (props.pickModal) {
|
|
58
|
-
|
|
59
|
-
(_props$onMultiQuantit = props.onMultiQuantityPick) === null || _props$onMultiQuantit === void 0 ? void 0 : _props$onMultiQuantit.call(props);
|
|
63
|
+
onMultiQuantityPick === null || onMultiQuantityPick === void 0 ? void 0 : onMultiQuantityPick();
|
|
60
64
|
return;
|
|
61
65
|
}
|
|
62
66
|
setPickModalVisible(true);
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
|
-
}, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
69
|
+
}, [parseEan, pickItem.barcode, pickItem.quantity, onScan, nextPickItem, props.pickModal, onMultiQuantityPick]);
|
|
66
70
|
const {
|
|
67
71
|
startScanner,
|
|
68
72
|
stopScanner
|
|
@@ -72,8 +76,8 @@ const Picker = props => {
|
|
|
72
76
|
return () => stopScanner();
|
|
73
77
|
}, [startScanner, stopScanner]);
|
|
74
78
|
return /*#__PURE__*/React.createElement(View, {
|
|
75
|
-
style: [container,
|
|
76
|
-
}, pickModal,
|
|
79
|
+
style: [container, style]
|
|
80
|
+
}, pickModal, children);
|
|
77
81
|
};
|
|
78
82
|
Picker.Row = Row;
|
|
79
83
|
Picker.Column = Column;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useRef","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","parseEan","pickModalVisible","setPickModalVisible","nextPickItem","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useRef","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","children","style","onMultiQuantityPick","onScan","pickItem","parseEan","pickModalVisible","setPickModalVisible","nextPickItem","scanValue","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","current","then","metaData","pickModal","handleScan","scan","eanCodes","scannedBarcode","barcode","console","log","quantity","stopScanner","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useRef, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n onScan?: (scan: string) => Promise<any>;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {children, style, onMultiQuantityPick, onScan} = props;\n const {pickItem, parseEan} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n const scanValue = useRef<string>('');\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n if (onScan) {\n onScan(scanValue.current).then(metaData => nextPickItem(false, quantityPicked, metaData));\n } else {\n nextPickItem(false, quantityPicked);\n }\n\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n scanValue.current = scan;\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n\n onScan?.(scan).then(metaData => console.log('meta', metaData));\n\n if (scan !== '' && scannedBarcode === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n if (onScan) {\n onScan(scan).then(metaData => nextPickItem(false, 1, metaData));\n\n return;\n }\n\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [parseEan, pickItem.barcode, pickItem.quantity, onScan, nextPickItem, props.pickModal, onMultiQuantityPick],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, style]}>\n {pickModal}\n {children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Text","styles","dataText","DataFormat","props","data"],"sources":["data-format.tsx"],"sourcesContent":["import React from 'react';\nimport {Text} from 'react-native';\n\nimport {styles} from './styles/layout-styles';\n\ninterface props {\n data: JSX.Element | string | number;\n}\n\nconst {dataText} = styles;\n\nexport const DataFormat = (props: props): JSX.Element => {\n const {data} = props;\n\n if (typeof data === 'string' || typeof data === 'number') {\n return <Text style={dataText} numberOfLines={1}
|
|
1
|
+
{"version":3,"names":["React","Text","styles","dataText","DataFormat","props","data"],"sources":["data-format.tsx"],"sourcesContent":["import React from 'react';\nimport {Text} from 'react-native';\n\nimport {styles} from './styles/layout-styles';\n\ninterface props {\n data: JSX.Element | string | number;\n}\n\nconst {dataText} = styles;\n\nexport const DataFormat = (props: props): JSX.Element => {\n const {data} = props;\n\n if (typeof data === 'string' || typeof data === 'number') {\n return (\n <Text style={dataText} numberOfLines={1}>\n {data}\n </Text>\n );\n }\n\n return data;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAQC,IAAI,QAAO,cAAc;AAEjC,SAAQC,MAAM,QAAO,wBAAwB;AAM7C,MAAM;EAACC;AAAQ,CAAC,GAAGD,MAAM;AAEzB,OAAO,MAAME,UAAU,GAAIC,KAAY,IAAkB;EACrD,MAAM;IAACC;EAAI,CAAC,GAAGD,KAAK;EAEpB,IAAI,OAAOC,IAAI,KAAK,QAAQ,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE;IACtD,oBACI,oBAAC,IAAI;MAAC,KAAK,EAAEH,QAAS;MAAC,aAAa,EAAE;IAAE,GACnCG,IAAI,CACF;EAEf;EAEA,OAAOA,IAAI;AACf,CAAC"}
|
|
@@ -8,9 +8,8 @@ export interface IGathererContext<T extends DefaultPickItem> {
|
|
|
8
8
|
savePickGroupData: (data: PickItem<T>) => void;
|
|
9
9
|
startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
|
|
10
10
|
switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
|
|
11
|
-
parseEan?: (ean: string) => {
|
|
11
|
+
parseEan?: (ean: string) => Record<string, string> & {
|
|
12
12
|
barcode: string;
|
|
13
|
-
batchCode: string;
|
|
14
13
|
};
|
|
15
14
|
}
|
|
16
15
|
interface props {
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ export interface IGathererContext<T extends DefaultPickItem> {
|
|
|
15
15
|
savePickGroupData: (data: PickItem<T>) => void;
|
|
16
16
|
startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
|
|
17
17
|
switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
|
|
18
|
-
parseEan?: (ean: string) =>
|
|
18
|
+
parseEan?: (ean: string) => Record<string, string> & {barcode: string};
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
interface props {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {useCallback, useContext, useEffect, useRef} from 'react';
|
|
2
2
|
|
|
3
|
-
import {useGatherer} from '../hooks/use-gatherer';
|
|
4
3
|
import {IScanContext, ScanContext} from '../context/scan-context';
|
|
5
4
|
|
|
6
5
|
type ScanCallback = (scan: string) => void;
|
|
@@ -8,7 +7,6 @@ type ScanCallback = (scan: string) => void;
|
|
|
8
7
|
export const useScanner = (onScan: ScanCallback): Scanner => {
|
|
9
8
|
const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);
|
|
10
9
|
const callbackRef = useRef<ScanCallback>(onScan);
|
|
11
|
-
const {parseEan} = useGatherer();
|
|
12
10
|
|
|
13
11
|
useEffect(() => {
|
|
14
12
|
callbackRef.current = onScan;
|
|
@@ -20,7 +18,7 @@ export const useScanner = (onScan: ScanCallback): Scanner => {
|
|
|
20
18
|
|
|
21
19
|
callbackRef.current(trimmedScan);
|
|
22
20
|
});
|
|
23
|
-
}, [
|
|
21
|
+
}, [registerListener]);
|
|
24
22
|
|
|
25
23
|
const stopScanner = useCallback((): void => {
|
|
26
24
|
clearEventListeners();
|
|
@@ -31,7 +31,7 @@ export const PickQuantitySelect = (props: props): JSX.Element => {
|
|
|
31
31
|
const {onPickItems, visible} = props;
|
|
32
32
|
const [selectedQuantity, setSelectedQuantity] = useState<number>(1);
|
|
33
33
|
const [error, setError] = useState<TFuncReturn<string, any, any>>('');
|
|
34
|
-
const {pickItem} = useGatherer();
|
|
34
|
+
const {pickItem, parseEan} = useGatherer();
|
|
35
35
|
const {t} = useTranslation();
|
|
36
36
|
const quantityToPick = pickItem.quantity;
|
|
37
37
|
|
|
@@ -73,11 +73,14 @@ export const PickQuantitySelect = (props: props): JSX.Element => {
|
|
|
73
73
|
};
|
|
74
74
|
|
|
75
75
|
const handleScan = (scan: string): void => {
|
|
76
|
+
const eanCodes = parseEan?.(scan);
|
|
77
|
+
const scannedBarcode = eanCodes?.barcode ?? scan;
|
|
78
|
+
|
|
76
79
|
if (quantityToPick >= singlePickThreshold) {
|
|
77
80
|
setError(t('picker.modal.confirm-error'));
|
|
78
|
-
} else if (selectedQuantity >= quantityToPick && pickItem.barcode ===
|
|
81
|
+
} else if (selectedQuantity >= quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
79
82
|
exitModal();
|
|
80
|
-
} else if (selectedQuantity !== quantityToPick && pickItem.barcode ===
|
|
83
|
+
} else if (selectedQuantity !== quantityToPick && pickItem.barcode === scannedBarcode) {
|
|
81
84
|
addOneToQuantity();
|
|
82
85
|
}
|
|
83
86
|
};
|
package/src/picker/picker.tsx
CHANGED
|
@@ -18,15 +18,17 @@ interface props {
|
|
|
18
18
|
pickModal?: JSX.Element;
|
|
19
19
|
onMultiQuantityPick?: () => void;
|
|
20
20
|
shouldLesserPick?: boolean;
|
|
21
|
+
onScan?: (scan: string) => Promise<any>;
|
|
21
22
|
}
|
|
22
23
|
|
|
23
24
|
const {container} = styles;
|
|
24
25
|
|
|
25
26
|
const Picker = (props: props): JSX.Element => {
|
|
27
|
+
const {children, style, onMultiQuantityPick, onScan} = props;
|
|
26
28
|
const {pickItem, parseEan} = useGatherer();
|
|
27
29
|
const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);
|
|
28
30
|
const {nextPickItem} = usePickItemSwitch();
|
|
29
|
-
const
|
|
31
|
+
const scanValue = useRef<string>('');
|
|
30
32
|
|
|
31
33
|
const closeModal = (): void => {
|
|
32
34
|
startScanner();
|
|
@@ -34,7 +36,12 @@ const Picker = (props: props): JSX.Element => {
|
|
|
34
36
|
};
|
|
35
37
|
|
|
36
38
|
const handleMultiQuantityPick = (quantityPicked: number): void => {
|
|
37
|
-
|
|
39
|
+
if (onScan) {
|
|
40
|
+
onScan(scanValue.current).then(metaData => nextPickItem(false, quantityPicked, metaData));
|
|
41
|
+
} else {
|
|
42
|
+
nextPickItem(false, quantityPicked);
|
|
43
|
+
}
|
|
44
|
+
|
|
38
45
|
closeModal();
|
|
39
46
|
};
|
|
40
47
|
|
|
@@ -44,24 +51,24 @@ const Picker = (props: props): JSX.Element => {
|
|
|
44
51
|
|
|
45
52
|
const handleScan = useCallback(
|
|
46
53
|
(scan: string): void => {
|
|
47
|
-
|
|
54
|
+
scanValue.current = scan;
|
|
48
55
|
const eanCodes = parseEan?.(scan);
|
|
49
56
|
const scannedBarcode = eanCodes?.barcode ?? scan;
|
|
50
|
-
|
|
51
|
-
metaData
|
|
52
|
-
|
|
53
|
-
console.log({
|
|
54
|
-
eanCodes,
|
|
55
|
-
scannedBarcode,
|
|
56
|
-
scannedBatchCode,
|
|
57
|
-
metaData: metaData.current,
|
|
58
|
-
});
|
|
57
|
+
|
|
58
|
+
onScan?.(scan).then(metaData => console.log('meta', metaData));
|
|
59
|
+
|
|
59
60
|
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
60
61
|
if (pickItem.quantity === 1) {
|
|
61
|
-
|
|
62
|
+
if (onScan) {
|
|
63
|
+
onScan(scan).then(metaData => nextPickItem(false, 1, metaData));
|
|
64
|
+
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
nextPickItem(false, 1);
|
|
62
69
|
} else {
|
|
63
70
|
if (props.pickModal) {
|
|
64
|
-
|
|
71
|
+
onMultiQuantityPick?.();
|
|
65
72
|
return;
|
|
66
73
|
}
|
|
67
74
|
|
|
@@ -69,7 +76,7 @@ const Picker = (props: props): JSX.Element => {
|
|
|
69
76
|
}
|
|
70
77
|
}
|
|
71
78
|
},
|
|
72
|
-
[parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props],
|
|
79
|
+
[parseEan, pickItem.barcode, pickItem.quantity, onScan, nextPickItem, props.pickModal, onMultiQuantityPick],
|
|
73
80
|
);
|
|
74
81
|
|
|
75
82
|
const {startScanner, stopScanner} = useScanner(handleScan);
|
|
@@ -81,9 +88,9 @@ const Picker = (props: props): JSX.Element => {
|
|
|
81
88
|
}, [startScanner, stopScanner]);
|
|
82
89
|
|
|
83
90
|
return (
|
|
84
|
-
<View style={[container,
|
|
91
|
+
<View style={[container, style]}>
|
|
85
92
|
{pickModal}
|
|
86
|
-
{
|
|
93
|
+
{children}
|
|
87
94
|
</View>
|
|
88
95
|
);
|
|
89
96
|
};
|
|
@@ -13,7 +13,11 @@ export const DataFormat = (props: props): JSX.Element => {
|
|
|
13
13
|
const {data} = props;
|
|
14
14
|
|
|
15
15
|
if (typeof data === 'string' || typeof data === 'number') {
|
|
16
|
-
return
|
|
16
|
+
return (
|
|
17
|
+
<Text style={dataText} numberOfLines={1}>
|
|
18
|
+
{data}
|
|
19
|
+
</Text>
|
|
20
|
+
);
|
|
17
21
|
}
|
|
18
22
|
|
|
19
23
|
return data;
|