small fixes

2024-12-23 18:10:29 -05:00
parent bf49bf5711
commit 01c448f368
5 changed files with 152 additions and 79 deletions
--- a/src/pages/delivery/edit.vue
+++ b/src/pages/delivery/edit.vue
@@ -143,7 +143,11 @@
            </span>
          </div>

-
+          <div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
+            <label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
+            <input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
+              type="checkbox" />
+          </div>

          <div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
            <label class="block text-white text-sm font-bold cursor-pointer label">Cash</label>
@@ -204,11 +208,7 @@
              {{ v$.CreateCustomerForm.basicInfo.delivery_status.$errors[0].$message }}
            </span>
          </div>
-          <div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
-            <label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
-            <input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
-              type="checkbox" />
-          </div>
+
         
          <div class="mb-4">
            <label class="block text-white text-sm font-bold mb-2">Delivery Created </label>
@@ -598,64 +598,6 @@ export default defineComponent({
        .catch(() => {
        });
    },
-    editOilOrder(payload: {
-      gallons_ordered: string;
-      customer_asked_for_fill: boolean;
-      prime: boolean;
-      same_day: boolean;
-      emergency: boolean;
-      delivery_status: string;
-      expected_delivery_date: string;
-      created_delivery_date: string;
-      dispatcher_notes_taken: string;
-      cash: boolean;
-      credit: boolean;
-      check: boolean;
-      credit_card_id: any;
-      promo_id: any;
-      driver_employee_id: string,
-    }) {
-      let path = import.meta.env.VITE_BASE_URL + "/delivery/edit/" + this.deliveryOrder.id;
-      axios({
-        method: "post",
-        url: path,
-        data: payload,
-        withCredentials: true,
-        headers: authHeader(),
-      })
-        .then((response: any) => {
-          if (response.data.ok) {
-            this.updatestatus()
-            this.$router.push({ name: "deliveryOrder", params: { id: this.deliveryOrder.id } });
-          }
-          if (response.data.error) {
-            this.$router.push("/");
-          }
-        })
-    },
-
-    onSubmit() {
-      let payload = {
-        gallons_ordered: this.CreateOilOrderForm.basicInfo.gallons_ordered,
-        customer_asked_for_fill: this.CreateOilOrderForm.basicInfo.customer_asked_for_fill,
-        expected_delivery_date: this.CreateOilOrderForm.basicInfo.expected_delivery_date,
-        created_delivery_date: this.CreateOilOrderForm.basicInfo.created_delivery_date,
-        dispatcher_notes_taken: this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken,
-        prime: this.CreateOilOrderForm.basicInfo.prime,
-        emergency: this.CreateOilOrderForm.basicInfo.emergency,
-        same_day: this.CreateOilOrderForm.basicInfo.same_day,
-        delivery_status: this.CreateOilOrderForm.basicInfo.delivery_status,
-        driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver,
-        cash: this.CreateOilOrderForm.basicInfo.cash,
-        credit: this.CreateOilOrderForm.basicInfo.card,
-        check: this.CreateOilOrderForm.basicInfo.check,
-        promo_id: this.CreateOilOrderForm.basicInfo.promo_id,
-        credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
-      };
-   
-      this.editOilOrder(payload);
-      
-    },
    updatestatus() {
      let path = import.meta.env.VITE_BASE_URL + '/delivery/updatestatus';
      axios({
@@ -697,6 +639,65 @@ export default defineComponent({
        });
    },

+    editOilOrder(payload: {
+      gallons_ordered: string;
+      customer_asked_for_fill: boolean;
+      prime: boolean;
+      same_day: boolean;
+      emergency: boolean;
+      delivery_status: string;
+      expected_delivery_date: string;
+      created_delivery_date: string;
+      dispatcher_notes_taken: string;
+      cash: boolean;
+      credit: boolean;
+      check: boolean;
+      credit_card_id: any;
+      promo_id: any;
+      driver_employee_id: string,
+    }) {
+      let path = import.meta.env.VITE_BASE_URL + "/delivery/edit/" + this.deliveryOrder.id;
+      axios({
+        method: "post",
+        url: path,
+        data: payload,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          if (response.data.ok === 'true') {
+            this.updatestatus()
+            this.$router.push({ name: "deliveryOrder", params: { id: this.deliveryOrder.id } });
+          }
+          if (response.data.error) {
+            this.$router.push("/");
+          }
+        })
+    },
+
+    onSubmit() {
+      let payload = {
+        gallons_ordered: this.CreateOilOrderForm.basicInfo.gallons_ordered,
+        customer_asked_for_fill: this.CreateOilOrderForm.basicInfo.customer_asked_for_fill,
+        expected_delivery_date: this.CreateOilOrderForm.basicInfo.expected_delivery_date,
+        created_delivery_date: this.CreateOilOrderForm.basicInfo.created_delivery_date,
+        dispatcher_notes_taken: this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken,
+        prime: this.CreateOilOrderForm.basicInfo.prime,
+        emergency: this.CreateOilOrderForm.basicInfo.emergency,
+        same_day: this.CreateOilOrderForm.basicInfo.same_day,
+        delivery_status: this.CreateOilOrderForm.basicInfo.delivery_status,
+        driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver,
+        cash: this.CreateOilOrderForm.basicInfo.cash,
+        credit: this.CreateOilOrderForm.basicInfo.card,
+        check: this.CreateOilOrderForm.basicInfo.check,
+        promo_id: this.CreateOilOrderForm.basicInfo.promo_id,
+        credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
+      };
+   
+      this.editOilOrder(payload);
+      
+    },
+
  },
 })
 </script>
--- a/src/pages/delivery/view.vue
+++ b/src/pages/delivery/view.vue
@@ -99,13 +99,13 @@
          </div>
          <div class="grid grid-cols-12 p-5">
            <div class="col-span-12 font-bold">
-              Status
+              Status 
            </div>
            <div class="col-span-12 text-sm mb-5 text-gray-500">
              <div v-if="deliveryOrder.delivery_status == 0">waiting</div>
              <div v-else-if="deliveryOrder.delivery_status == 1">delivered</div>
              <div v-else-if="deliveryOrder.delivery_status == 2">Out for Delivery</div>
-              <div v-else-if="deliveryOrder.delivery_status == 3">Cancelled</div>
+              <div v-else-if="deliveryOrder.delivery_status == 3">tommorrow</div>
              <div v-else-if="deliveryOrder.delivery_status == 4">Partial Delivery</div>
              <div v-else-if="deliveryOrder.delivery_status == 5">misdelivery</div>
              <div v-else-if="deliveryOrder.delivery_status == 6">unknown</div>
@@ -156,6 +156,7 @@
              <div v-if="deliveryOrder.prime == 0">
                Prime Required: No
              </div>
+             
            </div>
            <div class="col-span-12 text-gray-500">
              <div v-if="deliveryOrder.same_day == 1">
@@ -165,7 +166,14 @@
                Same Day: No
              </div>
            </div>
-
+            <div class="col-span-12 text-gray-500">
+              <div v-if="deliveryOrder.emergency == 1">
+                Emergency: Yes
+              </div>
+              <div v-if="deliveryOrder.emergency == 0">
+                Emergency: No
+              </div>
+            </div>



@@ -290,7 +298,7 @@
                      {{ userCard.name_on_card }}
                    </div>
                    <div class="flex p-1 pl-4">
-                      ****-****-****-{{ userCard.last_four_digits }}
+                      {{ userCard.card_number }}
                    </div>
                    <div class="flex p-1 pl-4">
                      {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
@@ -311,7 +319,7 @@
                      {{ userCard.name_on_card }}
                    </div>
                    <div class="flex p-1 pl-4">
-                      ****-****-****-{{ userCard.last_four_digits }}
+                      {{ userCard.card_number }}
                    </div>
                    <div class="flex p-1 pl-4">
                      {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
@@ -332,7 +340,7 @@
                      {{ userCard.name_on_card }}
                    </div>
                    <div class="flex p-1 pl-4">
-                      ****-****-****-{{ userCard.last_four_digits }}
+                      {{ userCard.card_number }}
                    </div>
                    <div class="flex p-1 pl-4">
                      {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
@@ -602,8 +610,7 @@ export default defineComponent({
          withCredentials: true,
        })
          .then((response: any) => {
-
-            if (response.data.userCard.card_number === '') {
+            if (response.data.card_number === '') {
              this.userCard === null;
              this.userCardfound = false;
            }
--- a/src/pages/delivery/viewstatus/tommorrow.vue
+++ b/src/pages/delivery/viewstatus/tommorrow.vue
@@ -88,6 +88,9 @@
                <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
                  <button class="btn btn-secondary btn-sm">Edit Delivery</button>
                </router-link>
+                <router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
+                    <button class="btn btn-secondary btn-sm">Finalize</button>
+                  </router-link>
                <router-link :to="{ name: 'Ticket', params: { id: oil['id'] } }">
                <button  class="btn btn-success btn-sm  ">
                  Print Ticket