@axelor/aos-mobile-sale 8.2.13 → 8.2.15
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/api/product-api.js +1 -1
- package/lib/api/product-api.js.map +1 -1
- package/lib/components/molecules/CatalogActionCard/CatalogActionCard.js +23 -6
- package/lib/components/molecules/CatalogActionCard/CatalogActionCard.js.map +1 -1
- package/lib/components/molecules/ProductFloatingButton/ProductFloatingButton.js +1 -1
- package/lib/components/molecules/ProductFloatingButton/ProductFloatingButton.js.map +1 -1
- package/lib/screens/product/VariantProductsScreen.js +2 -2
- package/lib/screens/product/VariantProductsScreen.js.map +1 -1
- package/package.json +4 -4
package/lib/api/product-api.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-api.js","sourceRoot":"","sources":["../../src/api/product-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,EAAE;IAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,sBAAsB,CAAC,EAAE,CAAC;QAE5C,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE;YAC/B,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,kBAAkB,SAAS,KAAK;gBAC3C,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE;aACtC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,kBAAkB,SAAS,KAAK;gBAC3C,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,EAC7B,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,0BAA0B,EAC1B,qBAAqB,GACtB,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG;QACf;YACE,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,wBAAwB;YACnC,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,KAAK;SACb;QACD;YACE,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB;QACD;YACE,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,KAAK;SACb;QACD,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC;KAChD,CAAC;IAEF,IAAI,CAAC,0BAA0B,EAAE;QAC/B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"product-api.js","sourceRoot":"","sources":["../../src/api/product-api.js"],"names":[],"mappings":"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"}
|
|
@@ -16,17 +16,19 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useState } from 'react';
|
|
19
|
-
import { useDispatch, usePermitted, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
19
|
+
import { useDispatch, useNavigation, usePermitted, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
20
20
|
import { ActionCard } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { CartLineCard, VariantPopup } from '../../atoms';
|
|
22
22
|
import { addCartLine } from '../../../features/cartLineSlice';
|
|
23
23
|
const CatalogActionCard = ({ style, product }) => {
|
|
24
24
|
const I18n = useTranslator();
|
|
25
25
|
const dispatch = useDispatch();
|
|
26
|
+
const navigation = useNavigation();
|
|
26
27
|
const { canCreate } = usePermitted({
|
|
27
28
|
modelName: 'com.axelor.apps.sale.db.CartLine',
|
|
28
29
|
});
|
|
29
|
-
const { activeCart } = useSelector(
|
|
30
|
+
const { activeCart } = useSelector(state => state.sale_cart);
|
|
31
|
+
const { mobileSettings } = useSelector(state => state.appConfig);
|
|
30
32
|
const [alertVisible, setAlertVisible] = useState(false);
|
|
31
33
|
const handleAddProduct = useCallback((productId) => {
|
|
32
34
|
dispatch(addCartLine({
|
|
@@ -36,18 +38,33 @@ const CatalogActionCard = ({ style, product }) => {
|
|
|
36
38
|
qty: 1,
|
|
37
39
|
}));
|
|
38
40
|
}, [activeCart, dispatch]);
|
|
41
|
+
const handleShowProduct = useCallback(() => {
|
|
42
|
+
navigation.navigate('ProductSaleDetailsScreen', { productId: product.id });
|
|
43
|
+
}, [navigation, product.id]);
|
|
44
|
+
const handlePress = useCallback(() => {
|
|
45
|
+
if (mobileSettings?.isGenericProductShown &&
|
|
46
|
+
product.productVariantConfig != null) {
|
|
47
|
+
setAlertVisible(true);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
handleAddProduct(product.id);
|
|
51
|
+
}
|
|
52
|
+
}, [
|
|
53
|
+
handleAddProduct,
|
|
54
|
+
mobileSettings?.isGenericProductShown,
|
|
55
|
+
product.id,
|
|
56
|
+
product.productVariantConfig,
|
|
57
|
+
]);
|
|
39
58
|
return (<>
|
|
40
59
|
<ActionCard style={style} actionList={[
|
|
41
60
|
{
|
|
42
61
|
iconName: 'plus-lg',
|
|
43
62
|
helper: I18n.t('Sale_AddOne'),
|
|
44
|
-
onPress:
|
|
45
|
-
? () => handleAddProduct(product.id)
|
|
46
|
-
: () => setAlertVisible(true),
|
|
63
|
+
onPress: handlePress,
|
|
47
64
|
hidden: !canCreate,
|
|
48
65
|
},
|
|
49
66
|
]} translator={I18n.t}>
|
|
50
|
-
<CartLineCard product={product}/>
|
|
67
|
+
<CartLineCard product={product} onPress={handleShowProduct}/>
|
|
51
68
|
</ActionCard>
|
|
52
69
|
<VariantPopup visible={alertVisible} handleClose={() => setAlertVisible(false)} parentProduct={product} handleConfirm={handleAddProduct}/>
|
|
53
70
|
</>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CatalogActionCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/CatalogActionCard/CatalogActionCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EACL,WAAW,EACX,YAAY,EACZ,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,iCAAiC,CAAC;AAO5D,MAAM,iBAAiB,GAAG,CAAC,EAAC,KAAK,EAAE,OAAO,EAAyB,EAAE,EAAE;IACrE,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAC,SAAS,EAAC,GAAG,YAAY,CAAC;QAC/B,SAAS,EAAE,kCAAkC;KAC9C,CAAC,CAAC;IAEH,MAAM,EAAC,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"CatalogActionCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/CatalogActionCard/CatalogActionCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ const ProductFloatingButton = ({}) => {
|
|
|
45
45
|
onPress: () => navigation.navigate('VariantProductsScreen'),
|
|
46
46
|
iconName: 'palette2',
|
|
47
47
|
color: Colors.priorityColor,
|
|
48
|
-
hideIf: product?.productVariant == null,
|
|
48
|
+
hideIf: !product?.productVariant == null && !product?.productVariantConfig,
|
|
49
49
|
},
|
|
50
50
|
]}/>);
|
|
51
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProductFloatingButton.js","sourceRoot":"","sources":["../../../../src/components/molecules/ProductFloatingButton/ProductFloatingButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,EACL,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AAEjC,MAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAElE,OAAO,CACL,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAC7B,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACnB,OAAO,CAAC,CAAC;YACP;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,+BAA+B;gBACtC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC;gBACjE,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE,MAAM,CAAC,YAAY;aAC3B;YACD;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,oBAAoB;gBAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC;gBACjE,QAAQ,EAAE,iBAAiB;gBAC3B,KAAK,EAAE,MAAM,CAAC,aAAa;aAC5B;YACD;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,yBAAyB;gBAChC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC;gBAC3D,QAAQ,EAAE,UAAU;gBACpB,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"ProductFloatingButton.js","sourceRoot":"","sources":["../../../../src/components/molecules/ProductFloatingButton/ProductFloatingButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,EACL,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AAEjC,MAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAElE,OAAO,CACL,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAC7B,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACnB,OAAO,CAAC,CAAC;YACP;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,+BAA+B;gBACtC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC;gBACjE,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE,MAAM,CAAC,YAAY;aAC3B;YACD;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,oBAAoB;gBAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC;gBACjE,QAAQ,EAAE,iBAAiB;gBAC3B,KAAK,EAAE,MAAM,CAAC,aAAa;aAC5B;YACD;gBACE,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,yBAAyB;gBAChC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC;gBAC3D,QAAQ,EAAE,UAAU;gBACpB,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,MAAM,EACJ,CAAC,OAAO,EAAE,cAAc,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,oBAAoB;aACrE;SACF,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,cAAc,EAAE;QACd,MAAM,EAAE,EAAE;KACX;CACF,CAAC,CAAC;AAEH,eAAe,qBAAqB,CAAC"}
|
|
@@ -26,8 +26,8 @@ const VariantProductsScreen = ({}) => {
|
|
|
26
26
|
const { product } = useSelector((state) => state.sale_product);
|
|
27
27
|
const { loadingVariantList, moreLoadingVariantList, isVariantListEnd, variantProductList, } = useSelector((state) => state.sale_product);
|
|
28
28
|
const sliceFunctionData = useMemo(() => ({
|
|
29
|
-
parentProductId: product?.parentProduct?.id,
|
|
30
|
-
}), [product?.parentProduct?.id]);
|
|
29
|
+
parentProductId: product?.parentProduct?.id ?? product?.id,
|
|
30
|
+
}), [product?.id, product?.parentProduct?.id]);
|
|
31
31
|
return (<Screen removeSpaceOnTop>
|
|
32
32
|
<SearchListView list={variantProductList} loading={loadingVariantList} moreLoading={moreLoadingVariantList} isListEnd={isVariantListEnd} sliceFunction={fetchVariantProduct} sliceFunctionData={sliceFunctionData} searchPlaceholder={I18n.t('Base_Search')} topFixedItems={<ProductHeader />} expandableFilter={false} renderListItem={({ item }) => (<VariantProductCard picture={item.picture} name={item.name} code={item.code} price={item.salePrice} unit={item.saleCurrency?.symbol} inAti={item.inAti} id={item.id} version={item.version} onPress={() => navigation.navigate('ProductSaleDetailsScreen', {
|
|
33
33
|
productId: item.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VariantProductsScreen.js","sourceRoot":"","sources":["../../../src/screens/product/VariantProductsScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EACL,cAAc,EACd,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAEhE,MAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClE,MAAM,EACJ,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,GACnB,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEpD,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC;QACL,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"VariantProductsScreen.js","sourceRoot":"","sources":["../../../src/screens/product/VariantProductsScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EACL,cAAc,EACd,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAEhE,MAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClE,MAAM,EACJ,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,GACnB,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEpD,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC;QACL,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,OAAO,EAAE,EAAE;KAC3D,CAAC,EACF,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAC1C,CAAC;IAEF,OAAO,CACL,CAAC,MAAM,CAAC,gBAAgB,CACtB;MAAA,CAAC,cAAc,CACb,IAAI,CAAC,CAAC,kBAAkB,CAAC,CACzB,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAC5B,WAAW,CAAC,CAAC,sBAAsB,CAAC,CACpC,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAC5B,aAAa,CAAC,CAAC,mBAAmB,CAAC,CACnC,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,CACrC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CACzC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,AAAD,EAAG,CAAC,CACjC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,cAAc,CAAC,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAC1B,CAAC,kBAAkB,CACjB,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CACtB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CACtB,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAChC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAClB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CACZ,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CACtB,OAAO,CAAC,CAAC,GAAG,EAAE,CACZ,UAAU,CAAC,QAAQ,CAAC,0BAA0B,EAAE;gBAC9C,SAAS,EAAE,IAAI,CAAC,EAAE;aACnB,CAAC,CACH,EACD,CACH,CAAC,EAEN;IAAA,EAAE,MAAM,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-sale",
|
|
3
|
-
"version": "8.2.
|
|
3
|
+
"version": "8.2.15",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"react-native": "0.73.9"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@axelor/aos-mobile-core": "8.2.
|
|
31
|
-
"@axelor/aos-mobile-crm": "8.2.
|
|
32
|
-
"@axelor/aos-mobile-ui": "8.2.
|
|
30
|
+
"@axelor/aos-mobile-core": "8.2.15",
|
|
31
|
+
"@axelor/aos-mobile-crm": "8.2.15",
|
|
32
|
+
"@axelor/aos-mobile-ui": "8.2.15",
|
|
33
33
|
"@reduxjs/toolkit": "^2.2.7"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|