show count in UI

swapnil-ahlawat · Mar 30, 2021 · e37435c · e37435c
1 parent bda028b
commit e37435c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Backend/controllers/package-controllers.js b/Backend/controllers/package-controllers.js
@@ -29,6 +29,7 @@ const scanPackage = async (req, res, next) => {
     message: 'Tag changed sucessfully!',
     userPhoneNo: userPhoneNo,
     lastPackageTag: lastPackageTag,
+    count: identifiedPackage.count,
   });
 };
 

diff --git a/Backend/database/Package.js b/Backend/database/Package.js
@@ -20,7 +20,7 @@ const package = new mongoose.Schema({
   },
   count: {
     type: Number,
-    default: 1,
+    default: 0,
   },
 });
 

diff --git a/Frontend/screens/Scan.js b/Frontend/screens/Scan.js
@@ -21,13 +21,15 @@ const Scan = ({ route, navigation }) => {
   const [phoneNo, setPhoneNo] = useState(null);
   const [packageTag, setPackageTag] = useState(null);
   const [modeTag, setModeTag] = useState(null);
+  const [count, setCount] = useState(null);
 
   const inFocus = navigation.addListener('focus', () => {
     setScanned(false);
     setSerialNumber(null);
     setOrder(null);
     setPhoneNo(global.user.phoneNo);
     setModeTag(global.modeTag);
+    setCount(null);
     let orderTemp = null;
     if (route.params) {
       setModeTag(route.params.modeTag);
@@ -162,6 +164,9 @@ const Scan = ({ route, navigation }) => {
       if (!response.ok) {
         throw new Error(responseData.message);
       } else {
+        if (responseData.count) {
+          setCount(responseData.count);
+        }
         if (modeTag === 'RestaurantDelivery') {
           deleteOrder();
         } else if (
@@ -326,7 +331,7 @@ const Scan = ({ route, navigation }) => {
     var text;
     if (modeTag === 'Restaurant') {
       text =
-        "Thank you for collecting the package. We will soon collect the package for it's cleaning. ";
+        'Thank you for collecting the package. We will soon collect the package from you for cleaning. ';
     } else if (modeTag === 'RestaurantDelivery') {
       text =
         'Our delivery personnel will shortly collect the package and will deliver it to the customer. Thank you for choosing to be a partner with Uber Eats.';
@@ -336,6 +341,24 @@ const Scan = ({ route, navigation }) => {
       text =
         'Thank you for collecting the package. Please deposit at any collection centre as per your convenience.';
     }
+
+    function renderPackageCount() {
+      if (modeTag === 'Warehouse') {
+        return (
+          <Text
+            style={{
+              color: COLORS.black,
+              marginVertical: SIZES.padding,
+              marginLeft: 3 * SIZES.padding,
+              ...FONTS.body2,
+              width: SIZES.width * 0.8,
+            }}
+          >
+            Fun Fact: This package has been used {count} times till now!.
+          </Text>
+        );
+      } else return <View></View>;
+    }
     return (
       <Modal animationType="slide" transparent={true} visible={modalVisible}>
         <TouchableWithoutFeedback
@@ -401,6 +424,7 @@ const Scan = ({ route, navigation }) => {
               >
                 {text}
               </Text>
+              {renderPackageCount()}
             </View>
           </View>
         </TouchableWithoutFeedback>