cleaned up backend bug

backend/src/routes/doctorOrders.js

@@ -56,15 +56,12 @@ router.post('/api/addRx', async (req, res) => {
  */
 router.patch('/api/updateRx/:id', async (req, res) => {
   try {
+    const dontUpdateStatusBool = req.query.dontUpdateStatus;
     // Finding by id
     const order = await doctorOrder.findById(req.params.id).exec();
     console.log('found by id!');
 
     console.log('order', order);
-    if (order.dispenseStatus === 'Picked Up') {
-      console.log('Do not update prescription if it is picked up, it was verified before');
-      return;
-    }
 
     // Reaching out to REMS Admin finding by pt name and drug name
     // '/etasu/met/patient/:patientFirstName/:patientLastName/:patientDOB/drug/:drugName',
@@ -87,7 +84,13 @@ router.patch('/api/updateRx/:id', async (req, res) => {
     // Saving and updating
     const newOrder = await doctorOrder.findOneAndUpdate(
       { _id: req.params.id },
-      { dispenseStatus: response.data.status, metRequirements: response.data.metRequirements },
+      {
+        dispenseStatus:
+          dontUpdateStatusBool || order.dispenseStatus === 'Picked Up'
+            ? order.dispenseStatus
+            : response.data.status,
+        metRequirements: response.data.metRequirements
+      },
       {
         new: true
       }

frontend/env.json

@@ -36,7 +36,6 @@
   "type" :"number",
   "default" : 5050
 },
-
 "SSL_KEY_FILE": {
   "type": "string",
   "default": "server.key"

frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx

@@ -54,7 +54,7 @@ const EtasuPopUp = (props: any) => {
   const handleClickOpen = () => {
     setOpen(true);
      // call api endpoint to update
-     const url = '/doctorOrders/api/updateRx/' + props.data._id; 
+     const url = '/doctorOrders/api/updateRx/' + props.data._id + '?dontUpdateStatus=true'; 
      axios.patch(url)
      .then(function (response) {
       const DoctorOrders = response.data;

frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx

@@ -42,7 +42,7 @@ const PickedUpButton = (props: any) => {
     };
 
     return (
-        <Button variant="contained" size="small" onClick={verifyOrder}>Mark as Picked</Button>
+        <Button variant="contained" size="small" onClick={verifyOrder}>Mark as Picked Up</Button>
     );
 };