From aed1425f84b463b54b2a523e945602e841f80acf Mon Sep 17 00:00:00 2001
From: fakz9 <fakc445@gmail.com>
Date: Thu, 23 Nov 2023 04:58:25 +0300
Subject: [PATCH] minor features

---
 .gitignore                                  | 38 ++-------------------
 src/components/OrderCard/OrderCard.tsx      |  3 +-
 src/screens/BarcodeScreen/BarcodeScreen.tsx |  3 ++
 src/screens/MainScreen/MainScreen.tsx       |  2 +-
 src/screens/OrderScreen/OrderScreen.tsx     |  3 ++
 src/types/order.ts                          |  1 +
 6 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1cb5746..1af8792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,39 +41,5 @@ package-lock.json
 # The following patterns were generated by expo-cli
 
 # Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
-
-# dependencies
-node_modules/
-
-# Expo
-.expo/
-dist/
-web-build/
-
-# Native
-*.orig.*
-*.jks
-*.p8
-*.p12
-*.key
-*.mobileprovision
-
-# Metro
-.metro-health-check*
-
-# debug
-npm-debug.*
-yarn-debug.*
-yarn-error.*
-
-# macOS
-.DS_Store
-*.pem
-
-# local env files
-.env*.local
-
-# typescript
-*.tsbuildinfo
-
-# @end expo-cli
\ No newline at end of file
+*.apk
+*.log
diff --git a/src/components/OrderCard/OrderCard.tsx b/src/components/OrderCard/OrderCard.tsx
index c9da9ac..911a4bd 100644
--- a/src/components/OrderCard/OrderCard.tsx
+++ b/src/components/OrderCard/OrderCard.tsx
@@ -42,10 +42,11 @@ const OrderCard: FC<Props> = ({onPress, onSelect, order}) => {
                     <DText>Товаров в заказе: {order.products.length}</DText>
                     <DText>Создан: {order.createdOn}</DText>
                     <DText>Отгрузка: {order.shipmentDate}</DText>
+                    <DText>Склад отгрузки: {order.shippingWarehouse}</DText>
 
                 </View>
                 <View style={styles.descriptionStatus}>
-                    <DText>
+                    <DText style={order.status >= OrderStatus.CANCELLED  && {color: "red"}}>
                         {OrderStatusDictionary[order.status as OrderStatus]}
                     </DText>
                 </View>
diff --git a/src/screens/BarcodeScreen/BarcodeScreen.tsx b/src/screens/BarcodeScreen/BarcodeScreen.tsx
index d297d59..397e55f 100644
--- a/src/screens/BarcodeScreen/BarcodeScreen.tsx
+++ b/src/screens/BarcodeScreen/BarcodeScreen.tsx
@@ -62,6 +62,9 @@ function BarcodeScreen() {
                         showsVerticalScrollIndicator={true}
                         onEndReachedThreshold={0.1}
                         estimatedItemSize={720}
+                        contentContainerStyle={{
+                            paddingBottom: responsiveHeight(10)
+                        }}
                         ItemSeparatorComponent={flashListSeparator}
                     /> :
                     <View style={{justifyContent: "center", flex: 1}}>
diff --git a/src/screens/MainScreen/MainScreen.tsx b/src/screens/MainScreen/MainScreen.tsx
index 794ad65..56f13ad 100644
--- a/src/screens/MainScreen/MainScreen.tsx
+++ b/src/screens/MainScreen/MainScreen.tsx
@@ -124,7 +124,7 @@ const styles = StyleSheet.create({
         elevation: 10,
         height: responsiveHeight(8),
         paddingHorizontal: responsiveWidth(5),
-        backgroundColor: "white"
+        backgroundColor: "white",
     }
 
 })
diff --git a/src/screens/OrderScreen/OrderScreen.tsx b/src/screens/OrderScreen/OrderScreen.tsx
index 3920b28..0e5f933 100644
--- a/src/screens/OrderScreen/OrderScreen.tsx
+++ b/src/screens/OrderScreen/OrderScreen.tsx
@@ -34,6 +34,7 @@ import Toast from "react-native-toast-message";
 import mainScreen, {TabNavigatorParamList} from "../MainScreen/MainScreen";
 import toast from "../../components/Toast/Toast";
 import {openImageZoomModal, setImages} from "../../features/imageZoomModal/loadingModalSlice";
+import {OrderStatus, OrderStatusDictionary} from "../../features/ordersFilter/ordersFilterSlice";
 
 
 type AssemblyPeriod = {
@@ -241,6 +242,8 @@ const OrderScreen: FC<OrderScreenProps> = ({order}) => {
                         <DText>Селлер: {order.sellerName}</DText>
                         <DText>Создан: {order.createdOn}</DText>
                         <DText>Отгрузка: {order.shipmentDate}</DText>
+                        <DText>Статус: {OrderStatusDictionary[order.status as OrderStatus]}</DText>
+                        <DText>Склад отгрузки: {order.shippingWarehouse}</DText>
                         <DText>{}</DText>
                         <DTitle style={styles.contentTitle}>Товар</DTitle>
                         <DText>Арт. DENCO: {selectedProduct?.dencoArticle}</DText>
diff --git a/src/types/order.ts b/src/types/order.ts
index dc080c7..dac521a 100644
--- a/src/types/order.ts
+++ b/src/types/order.ts
@@ -26,5 +26,6 @@ export type Order = {
     status: number;
     shipmentDate: string;
     createdOn: string;
+    shippingWarehouse: string;
 };