Feat:Cashier order type selection option

ury-erp · Feb 12, 2024 · b000029 · b000029
1 parent c7a7875
commit b000029
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 40 deletions.
diff --git a/...os/public/urypos/assets/Login-2076e7c8.js → ...os/public/urypos/assets/Login-0be4c6c8.js b/...os/public/urypos/assets/Login-2076e7c8.js → ...os/public/urypos/assets/Login-0be4c6c8.js
diff --git a/...s/public/urypos/assets/index-e382f954.css → ...s/public/urypos/assets/index-77a5ece0.css b/...s/public/urypos/assets/index-e382f954.css → ...s/public/urypos/assets/index-77a5ece0.css
diff --git a/...os/public/urypos/assets/index-cecbc315.js → ...os/public/urypos/assets/index-eec4d3a7.js b/...os/public/urypos/assets/index-cecbc315.js → ...os/public/urypos/assets/index-eec4d3a7.js
diff --git a/ury_pos/public/urypos/index.html b/ury_pos/public/urypos/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/assets/ury_pos/urypos/URY.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>URY POS</title>
-    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-cecbc315.js"></script>
-    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-e382f954.css">
+    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-eec4d3a7.js"></script>
+    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-77a5ece0.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/ury_pos/www/urypos.html b/ury_pos/www/urypos.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/assets/ury_pos/urypos/URY.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>URY POS</title>
-    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-cecbc315.js"></script>
-    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-e382f954.css">
+    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-eec4d3a7.js"></script>
+    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-77a5ece0.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/urypos/src/components/Customer.vue b/urypos/src/components/Customer.vue
@@ -227,7 +227,7 @@
           </div>
         </div>
       </div>
-      <div class="relative mb-6 mt-4">
+      <div class="relative mb-4 mt-4" v-if="!this.auth.cashier">
         <div
           class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
         >
@@ -246,39 +246,86 @@
           </svg>
         </div>
         <input
-          type="text"
-          id="input-group-1"
+          type="number"
+          id="numberOfPax"
           class="block w-full rounded-lg border border-gray-300 bg-gray-50 p-2.5 pl-10 text-sm text-gray-900 focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500 md:w-3/5 lg:w-2/5"
           placeholder="Pax"
           required
           v-model="this.customers.numberOfPax"
         />
       </div>
+      <div class="relative mt-5" ref="container" v-if="this.auth.cashier">
+        <div
+          class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
+        >
+          <svg
+            aria-hidden="true"
+            class="h-5 w-5 text-gray-500 dark:text-gray-400"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
+            ></path>
+          </svg>
+        </div>
+        <input
+          type="text"
+          class="block w-full rounded-lg border border-gray-300 bg-gray-50 p-2.5 pl-10 text-sm text-gray-900 focus:border-blue-500 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500 md:w-3/5 lg:w-2/5"
+          placeholder="Order Type"
+          v-model="this.customers.selectedOrderType"
+          @click="this.customers.pickOrderType()"
+          required
+        />
+
+        <div
+          v-if="this.customers.showOrderType"
+          class="absolute left-0 top-full z-10 max-h-64 w-full overflow-y-scroll rounded bg-white shadow md:w-3/5 lg:w-2/5"
+          ref="dropdown"
+        >
+          <div
+            class="p-2 hover:bg-gray-100"
+            v-for="(orderType, index) in this.customers.orderType"
+            :key="index"
+            @click="this.customers.selectOrderType(orderType)"
+          >
+            <h1 class="text-base font-normal leading-normal">
+              {{ orderType.name }}
+            </h1>
+          </div>
+        </div>
+      </div>
+
+
       <h1
-        class="tex mt-10 text-xl font-semibold"
+        class="tex mt-5 text-lg font-medium"
         v-if="this.customers.customerFavouriteItems.length > 0"
       >
         Favourite Items
       </h1>
 
       <div
-        class="cart-item-details mt-1 grid grid-cols-4 gap-2 py-2 sm:w-full md:w-full lg:w-full"
+        class="cart-item-details mt-1 grid grid-cols-2 gap-6 py-2 sm:w-full md:w-full lg:w-full lg:grid-cols-4"
         v-if="this.customers.customerFavouriteItems.length > 0"
       >
-        <h3 class="font-semibold">Item Name</h3>
-        <h3 class="font-semibold">Quantity</h3>
+        <h3 class="text-base font-medium">Item Name</h3>
+        <h3 class="text-center text-base font-medium">Quantity</h3>
       </div>
       <div
         v-for="(item, index) in this.customers.customerFavouriteItems"
         :key="index"
       >
-        <img />
         <div
-          class="cart-item-details sm:min-w-none grid w-full min-w-0 grid-cols-4 gap-2 py-2 sm:w-full md:w-full lg:w-full"
+          class="cart-item-details sm:min-w-none grid w-full grid-cols-2 gap-6 py-2 sm:w-full md:w-full lg:w-full lg:grid-cols-4"
         >
-          <h3>{{ item.item_name }}</h3>
+          <span>{{ item.item_name }}</span>
 
-          <h3 class="ml-4">{{ item.qty }}</h3>
+          <span class="text-center">{{ item.qty }}</span>
         </div>
       </div>
     </div>
@@ -288,6 +335,7 @@
 <script>
 import orderInfo from "./orderInfo.vue";
 import { useCustomerStore } from "@/stores/Customer.js";
+import { useAuthStore } from "@/stores/Auth.js";
 
 export default {
   name: "Customer",
@@ -296,7 +344,8 @@ export default {
   },
   setup() {
     const customers = useCustomerStore();
-    return { customers };
+    const auth = useAuthStore();
+    return { customers, auth };
   },
 };
 </script>
diff --git a/urypos/src/stores/Customer.js b/urypos/src/stores/Customer.js
@@ -10,12 +10,15 @@ export const useCustomerStore = defineStore("customers", {
     search: "",
     alert: useAlert(),
     showCustomers: false,
+    showOrderType: false,
     numberOfPax: "",
     selectedCustomerName: "",
+    selectedOrderType: "",
     customerFavouriteItems: [],
     showModalNewCustomer: false,
     newCustomerMobileNo: "",
     newCustomer: "",
+    orderType: [],
     showCustomersGroup: false,
     showCustomersTerritory: false,
     showAddNewCustomer: true,
@@ -46,7 +49,7 @@ export const useCustomerStore = defineStore("customers", {
         })
         .catch((error) => console.error(error));
     },
-    handleSearchInput(event){
+    handleSearchInput(event) {
       this.search = event.target.value;
       this.pickCustomer();
     },
@@ -146,6 +149,21 @@ export const useCustomerStore = defineStore("customers", {
       this.showCustomers = false;
       this.fectchCustomerFavouriteItem();
     },
+    pickOrderType() {
+      this.showOrderType = true;
+      this.call
+        .get("ury.ury_pos.api.get_select_field_options")
+        .then((result) => {
+          this.orderType = result.message.filter(
+            (option) => option.name !== ""
+          );
+        })
+        .catch((error) => console.error(error));
+    },
+    selectOrderType(orderType) {
+      this.showOrderType = false;
+      this.selectedOrderType = orderType.name;
+    },
     async fectchCustomerFavouriteItem() {
       const table = useTableStore();
       if (table.previousOrderdCustomer) {

diff --git a/urypos/src/stores/invoiceData.js b/urypos/src/stores/invoiceData.js
@@ -94,6 +94,7 @@ export const useInvoiceDataStore = defineStore("invoiceData", {
       let cart = this.menu.cart;
       const customers = useCustomerStore();
       const customerName = customers.search;
+      const ordeType = customers.selectedOrderType;
       const numberOfPax = customers.numberOfPax;
       let invoice =
         this.recentOrders.draftInvoice ||
@@ -129,6 +130,7 @@ export const useInvoiceDataStore = defineStore("invoiceData", {
         last_modified_time: this.table.modifiedTime,
         pos_profile: this.posProfile,
         invoice: invoice,
+        order_type: ordeType,
         last_invoice: lastInvoice,
         comments: this.menu.comments,
       };
@@ -142,6 +144,9 @@ export const useInvoiceDataStore = defineStore("invoiceData", {
       } else if (!this.auth.cashier && !selectedTables) {
         this.alert.createAlert("Message", "Please Select a Table", "OK");
         this.showUpdateButtton = true;
+      } else if (this.auth.cashier && !ordeType) {
+        this.alert.createAlert("Message", "Please Select Order Type", "OK");
+        this.showUpdateButtton = true;
       } else {
         this.call
           .post(