Add:Show selected table info on other pages,Display New/Existing orde…

…rs in take away
ury-erp · Jan 29, 2024 · 62d8e89 · 62d8e89
1 parent 9e26f41
commit 62d8e89
Show file tree

Hide file tree

Showing 21 changed files with 383 additions and 279 deletions.
diff --git a/FEATURES.md b/FEATURES.md
@@ -97,14 +97,15 @@ clicking it will direct to the respective pages
 **Invoice Settlement**
 
 - Click the `Invoice icon` to navigate to the recent order page. Invoices can be settled by selecting individual invoices from the list.
-
+- You need to select the role that you need as a cashier in the POS Profile's "Role Allowed For Billing" field
+- Also can block table order to by selecting particular role in "Role Restricted For Table Order" field
 - Available filters in Recent order 
     - Draft : List POS invoices in draft status that are printed from table orders and those taken from takeaway orders.
     - Unbilled : POS invoices in draft and not billed from the Table Order.
     - Paid : Contains paid POS invoice
     - Consolidated : Shows consolidated POS invoice
     - Return : Shows return POS invoice
-
+- To enables Cashiers to view all statuses (Paid, Consolidated, Return Invoices) in the recent order check "Allow Cashier To View All   Status" field in  POS Profile
 - Available Buttons in Recent order  
     - Edit:To edit draft POS invoice
     - Print Receipt:To print POS invoice

diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -1,7 +1,8 @@
 ## URY POS Installation
 
 **Prerequisite Setup:**
-- Before using URY POS, ensure you have URY installed.
+- Before using URY POS, ensure you have URY  and Doppio installed in your bench.
+- Doppio is used to setup and manage  custom desk pages using Vue 3 on URY POS App.
 - Follow the [URY installation guide](https://github.com/ury-erp/ury/blob/main/INSTALLATION.md) for the installation process.
 
 
@@ -13,6 +14,12 @@
 	$ bench new-site sitename
 ```
 
+**Install the Doppio app to your bench:**
+
+```sh 
+	$ bench get-app https://github.com/NagariaHussain/doppio
+```
+
 **Install the URY POS app to your bench:**
 
 ```sh

diff --git a/...os/public/urypos/assets/Login-55f35886.js → ...os/public/urypos/assets/Login-0d8db2ea.js b/...os/public/urypos/assets/Login-55f35886.js → ...os/public/urypos/assets/Login-0d8db2ea.js
diff --git a/ury_pos/public/urypos/assets/index-009f89fa.css b/ury_pos/public/urypos/assets/index-009f89fa.css
diff --git a/ury_pos/public/urypos/assets/index-172c99e4.js b/ury_pos/public/urypos/assets/index-172c99e4.js
diff --git a/ury_pos/public/urypos/assets/index-3bf65572.css b/ury_pos/public/urypos/assets/index-3bf65572.css
diff --git a/ury_pos/public/urypos/assets/index-c5bdbe79.js b/ury_pos/public/urypos/assets/index-c5bdbe79.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-c5bdbe79.js"></script>
-    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-009f89fa.css">
+    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-172c99e4.js"></script>
+    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-3bf65572.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-c5bdbe79.js"></script>
-    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-009f89fa.css">
+    <script type="module" crossorigin src="/assets/ury_pos/urypos/assets/index-172c99e4.js"></script>
+    <link rel="stylesheet" href="/assets/ury_pos/urypos/assets/index-3bf65572.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/urypos/src/components/Cart.vue b/urypos/src/components/Cart.vue
@@ -1,29 +1,34 @@
 <template>
-  <div class="float-right rounded px-4 py-2" v-if="this.menu.cart.length > 0">
-    <button
-      class="mr-4 rounded px-4 py-2 shadow"
-      v-if="this.invoiceData.showUpdateButtton === true"
-      @click="this.invoiceData.invoiceCreation()"
-    >
-      Update
-    </button>
-    <!-- <button
+  <div class="flex">
+    <div class="flex-grow">
+      <orderInfo />
+    </div>
+    <div class="float-right rounded " v-if="this.menu.cart.length > 0">
+      <button
+        class="mr-4 rounded px-4 py-2 shadow"
+        v-if="this.invoiceData.showUpdateButtton === true"
+        @click="this.invoiceData.invoiceCreation()"
+      >
+        Update
+      </button>
+      <!-- <button
       class="mr-4 rounded py-2 px-4 shadow"
       @click="this.invoiceData.kotReprint()"
     >
       KOT Reprint
     </button> -->
-    <button
-      class="rounded px-4 py-2 shadow"
-      v-if="
-        (this.recentOrders.invoicePrinted === 0 ||
-          this.table.invoicePrinted === 0) &&
-        !this.auth.cashier
-      "
-      @click="this.invoiceData.showCancelInvoiceModal()"
-    >
-      Cancel
-    </button>
+      <button
+        class="rounded px-4 py-2 shadow"
+        v-if="
+          (this.recentOrders.invoicePrinted === 0 ||
+            this.table.invoicePrinted === 0) &&
+          !this.auth.cashier
+        "
+        @click="this.invoiceData.showCancelInvoiceModal()"
+      >
+        Cancel
+      </button>
+    </div>
   </div>
   <div
     class="flex h-screen items-center justify-center"
@@ -32,7 +37,7 @@
     <div class="text-center">Nothing to show here</div>
   </div>
 
-  <div class="mt-20 border shadow" v-if="this.menu.cart.length > 0">
+  <div class="mt-5 border shadow" v-if="this.menu.cart.length > 0">
     <div
       class="cart-item-details grid w-full grid-cols-3 gap-4 md:w-full lg:w-full"
     >
@@ -72,7 +77,6 @@
         <button
           class="p-2 text-center"
           type="button"
-
           @click="
             (this.recentOrders.editPrintedInvoice === 0 ||
               this.auth.removeTableOrderItem === 1) &&
@@ -339,6 +343,7 @@
 </template>
 
 <script>
+import orderInfo from "./orderInfo.vue";
 import { useMenuStore } from "@/stores/Menu.js";
 import { useTableStore } from "@/stores/Table.js";
 import { useInvoiceDataStore } from "@/stores/invoiceData.js";
@@ -347,7 +352,9 @@ import { usetoggleRecentOrder } from "@/stores/recentOrder.js";
 
 export default {
   name: "Cart",
- 
+  components: {
+    orderInfo,
+  },
   setup() {
     const menu = useMenuStore();
     const table = useTableStore();

diff --git a/urypos/src/components/Customer.vue b/urypos/src/components/Customer.vue
@@ -1,7 +1,8 @@
 <template>
+  <orderInfo />
   <div class="container m-auto">
     <div class="mb-6 gap-6 md:grid-cols-2">
-      <div class="relative mt-5" ref="container">
+      <div class="relative mt-2" ref="container">
         <div
           class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
         >
@@ -27,7 +28,10 @@
           placeholder="Search Customers"
           v-model="this.customers.search"
           @input="this.customers.handleSearchInput"
-          @click="this.customers.showCustomers = true;this.customers.showAddNewCustomer= true"
+          @click="
+            this.customers.showCustomers = true;
+            this.customers.showAddNewCustomer = true;
+          "
           required
         />
 
@@ -87,7 +91,7 @@
         v-if="this.customers.showModalNewCustomer"
         class="fixed inset-0 z-10 mt-20 overflow-y-auto bg-gray-100"
       >
-        <div class="mt-10 mb-16 flex items-center justify-center">
+        <div class="mb-16 mt-10 flex items-center justify-center">
           <div class="w-full rounded-lg bg-white p-6 shadow-lg md:max-w-md">
             <div class="flex justify-end">
               <span class="sr-only">Close</span>
@@ -223,7 +227,7 @@
           </div>
         </div>
       </div>
-      <div class="relative mb-6 mt-6">
+      <div class="relative mb-6 mt-4">
         <div
           class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
         >
@@ -282,16 +286,17 @@
 </template>
 
 <script>
+import orderInfo from "./orderInfo.vue";
 import { useCustomerStore } from "@/stores/Customer.js";
 
 export default {
   name: "Customer",
+  components: {
+    orderInfo,
+  },
   setup() {
     const customers = useCustomerStore();
     return { customers };
   },
 };
-// mounted() {
-//   this.customers.fetchCustomer();
-//   },
 </script>