Merge tag '1.5.1' into develop

version 1.5.1
dehy · Jan 26, 2023 · c56e2bd · c56e2bd
2 parents f77a2ff + 4cffa95
commit c56e2bd
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 29 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -146,8 +146,8 @@ android {
         applicationId "fr.supercoop.app_android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 49
-        versionName "1.5.0"
+        versionCode 51
+        versionName "1.5.1"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'RNN.reactNativeVersion', 'reactNative68'
         multiDexEnabled true

diff --git a/ios/Supercoop.xcodeproj/project.pbxproj b/ios/Supercoop.xcodeproj/project.pbxproj
@@ -492,7 +492,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Supercoop/Supercoop.entitlements;
-				CURRENT_PROJECT_VERSION = 49;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = QPB8MBWLB4;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Supercoop/Info.plist;
@@ -501,7 +501,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -526,15 +526,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Supercoop/Supercoop.entitlements;
-				CURRENT_PROJECT_VERSION = 49;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = QPB8MBWLB4;
 				INFOPLIST_FILE = Supercoop/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/metro.config.js b/metro.config.js
@@ -20,6 +20,9 @@ module.exports = (async () => {
                 },
             }),
             babelTransformerPath: require.resolve('react-native-svg-transformer'),
+            minifierConfig: {
+                mangle: false,
+            },
         },
         resolver: {
             assetExts: assetExts.filter(ext => ext !== 'svg'),

diff --git a/src/screens/Lists/GoodsReceipt/Scan.tsx b/src/screens/Lists/GoodsReceipt/Scan.tsx
@@ -116,7 +116,7 @@ export default class ListsGoodsReceiptScan extends React.Component<Props, State>
             .dataSource.getRepository(GoodsReceiptEntry)
             .findOneOrFail({
                 where: {
-                    productBarcode: product.barcode,
+                    productId: product.id,
                     list: {
                         id: this.props.list.id!,
                     },
@@ -125,7 +125,7 @@ export default class ListsGoodsReceiptScan extends React.Component<Props, State>
             })
             .then((entry: GoodsReceiptEntry) => {
                 AppLogger.getLogger().debug(
-                    `GoodsReceipt Entry found for Product '${entry.productBarcode}': ${entry.productName} (${
+                    `GoodsReceipt Entry found for Product #'${entry.productId}': ${entry.productName} (${
                         entry.expectedProductQty
                     } ${ProductProduct.quantityUnitAsString(entry.expectedProductUom)}) for session #${
                         entry.list ? entry.list.id : 'inconnue'

diff --git a/src/screens/Lists/GoodsReceipt/Show.tsx b/src/screens/Lists/GoodsReceipt/Show.tsx
@@ -428,27 +428,30 @@ export default class ListsGoodsReceiptShow extends React.Component<Props, State>
                             }
                             return '';
                         }}
-                        renderItem={({item}): React.ReactElement => (
-                            <ListItem
-                                containerStyle={{backgroundColor: this.itemBackgroundColor(item)}}
-                                onPress={(): void => {
-                                    this.openGoodsReceiptScan(item.productId);
-                                }}
-                                topDivider>
-                                <ListItem.Content>
-                                    <ListItem.Title numberOfLines={1} ellipsizeMode={'middle'}>
-                                        {item.productName}
-                                    </ListItem.Title>
-                                    <ListItem.Subtitle style={item.productBarcode ? undefined : {fontStyle: 'italic'}}>
-                                        {item.productBarcode ? item.productBarcode.toString() : 'Pas de code barre'}
-                                    </ListItem.Subtitle>
-                                </ListItem.Content>
-                                <ListItem.Content right>
-                                    {this.renderEntryQty(item)}
-                                    {this.renderPackageQty(item)}
-                                </ListItem.Content>
-                            </ListItem>
-                        )}
+                        renderItem={({item}): React.ReactElement => {
+                            const barcode = item.productBarcode === '0.0' ? undefined : item.productBarcode;
+                            return (
+                                <ListItem
+                                    containerStyle={{backgroundColor: this.itemBackgroundColor(item)}}
+                                    onPress={(): void => {
+                                        this.openGoodsReceiptScan(item.productId);
+                                    }}
+                                    topDivider>
+                                    <ListItem.Content>
+                                        <ListItem.Title numberOfLines={1} ellipsizeMode={'middle'}>
+                                            {item.productName}
+                                        </ListItem.Title>
+                                        <ListItem.Subtitle style={barcode ? undefined : {fontStyle: 'italic'}}>
+                                            {barcode ?? 'Pas de code barre'}
+                                        </ListItem.Subtitle>
+                                    </ListItem.Content>
+                                    <ListItem.Content right>
+                                        {this.renderEntryQty(item)}
+                                        {this.renderPackageQty(item)}
+                                    </ListItem.Content>
+                                </ListItem>
+                            );
+                        }}
                         ListHeaderComponent={this.renderHeader}
                         ListFooterComponent={this.renderFooter}
                     />