Add:Room wise menu,Fix:Print field update

Hafnianusha · Hafnianusha · commit bc144cb6a411 · 2024-01-08T10:01:08.000Z
diff --git a/FEATURES.md b/FEATURES.md
@@ -36,6 +36,12 @@
 
 - Specified rates in the table automatically creates a 'Price list' using the same menu name.
 
+- Default menu is added in URY Restaurant. 
+
+- Room wise menu is handled by enabling room wise menu and adding values in the child table.
+
+- If room wise menu is enabled , ury take menu as per the room defined against each table on table selection.
+
 - Menu Selection tab contain : 
 	- Search bar to quickly locate specific menu items, enhancing speed and accuracy during busy periods.
 
diff --git a/SETUP.md b/SETUP.md
@@ -38,10 +38,12 @@ Follow these steps to set up URY:
 	- **Company**: Specify the company under which the restaurant is being created.
 	- **Default customer** : Set a default customer .
 	- **Invoice Series Prefix**: allows you to define prefix for naming of a Invoice .
-	- **Active Menu** : Select Menu against the restaurant .
-	-  **Branch** : Select the branch associated with the restaurant .
+	- **Branch** : Select the branch associated with the restaurant .
 	- **Default Tax Template** : Mention the [Sales tax](https://docs.erpnext.com/docs/user/manual/en/sales-taxes-and-charges-template) value if applicable .
 	- **Address** : Provide the address of the restaurant.
+	- **Default Menu** : Select Menu against the restaurant .
+	- **Room Wise Menu** : To enable room wise menu .
+	- **Menu For Room** : Add restaurant menu against each room to handle room wise price list. 
 
 
 **Step 5 :**
@@ -66,7 +68,8 @@ Follow these steps to set up URY:
 - Next is to Create Restaurant Room with the following details :
 
 	- **Name** : Specify a unique name to the room.
-	- **Room Type** : Select the type from the list
+	- **Room Type** : Select the type from the list.
+	- **Print Settings** : Choose a network printer.
 
 **Step 8 :**
 
diff --git a/ury/hooks.py b/ury/hooks.py
@@ -265,6 +265,7 @@
                     "POS Profile-section_break_tjhrm",
                     "POS Profile-transfer_role_permissions",
                     "POS Profile-role_allowed_for_billing",
+                    "POS Profile-role_restricted_for_table_order",
                     "POS Profile-restaurant_prefix",
                     "POS Opening Entry-restaurant_info",
                     "POS Opening Entry-restaurant",
diff --git a/ury/public/js/pos_extend.js b/ury/public/js/pos_extend.js
@@ -184,4 +184,5 @@ frappe.pages['point-of-sale'].on_page_load = function (wrapper) {
         wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
         window.cur_pos = wrapper.pos;
     });
-};
+};
+
diff --git a/ury/public/js/pos_print.js b/ury/public/js/pos_print.js
@@ -94,6 +94,7 @@ frappe.ui.form.on('POS Invoice', {
                                                     callback: function (r) {
                                                     }
                                                 });
+                                                cur_frm.set_value('invoice_printed', 1);
                                                 frappe.dom.unfreeze();
                                                 frappe.show_alert({ message: __('Invoice Printed'), indicator: 'green' });
                                             })
@@ -132,10 +133,9 @@ frappe.ui.form.on('POS Invoice', {
                                 if (r.message == "Success") {
                                     $('.standard-actions').addClass('hidden-xs hidden-md');
                                     frappe.show_alert({ message: __('Invoice Printed'), indicator: 'green' });
-                                    setTimeout(function () {
-                                        frappe.dom.unfreeze();
-                                        frappe.ui.toolbar.clear_cache()
-                                    }, 1500)
+                                    cur_frm.set_value('invoice_printed', 1);
+                                    frappe.dom.unfreeze();
+                                    cur_frm.reload_doc();
                                 }
                                 else {
                                     console.error(r.message);
@@ -165,6 +165,7 @@ frappe.ui.form.on('POS Invoice', {
                         },
                         callback: function (r) {
                             $('.standard-actions').addClass('hidden-xs hidden-md');
+                            cur_frm.set_value('invoice_printed', 1);
                             frappe.show_alert({ message: __('Invoice Printed'), indicator: 'green' });
                             frappe.ui.toolbar.clear_cache()
                             frappe.dom.unfreeze();
@@ -175,4 +176,5 @@ frappe.ui.form.on('POS Invoice', {
         })
     }
 
-})
+})
+
diff --git a/ury/ury/api/pos_extend.py b/ury/ury/api/pos_extend.py
@@ -1,29 +1,39 @@
+from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
+    SalesInvoice,
+    update_multi_mode_option,
+)
 import frappe
 from frappe.utils.nestedset import get_root_of
 from frappe.utils import cint
-from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_stock_availability
+from erpnext.accounts.doctype.pos_invoice.pos_invoice import (
+    add_return_modes,
+    get_stock_availability,
+)
 from erpnext.selling.page.point_of_sale.point_of_sale import (
     search_by_term,
     get_conditions,
     get_item_group_condition,
 )
+from erpnext.accounts.party import get_due_date, get_party_account
 
 
 @frappe.whitelist()
 def overrided_past_order_list(search_term, status, limit=20):
     user = frappe.session.user
-    sql_query = """
-        SELECT b.branch
-        FROM `tabURY User` AS a
-        INNER JOIN `tabBranch` AS b ON a.parent = b.name
-        WHERE a.user = %s
-    """
-    branch_array = frappe.db.sql(sql_query, user, as_dict=True)
 
-    if not branch_array:
-        frappe.throw("User is not Associated with any Branch.Please refresh Page")
+    if user != "Administrator":
+        sql_query = """
+            SELECT b.branch
+            FROM `tabURY User` AS a
+            INNER JOIN `tabBranch` AS b ON a.parent = b.name
+            WHERE a.user = %s
+        """
+        branch_array = frappe.db.sql(sql_query, user, as_dict=True)
+
+        if not branch_array:
+            frappe.throw("User is not Associated with any Branch.Please refresh Page")
 
-    branch_name = branch_array[0].get("branch")
+        branch_name = branch_array[0].get("branch")
 
     fields = [
         "name",
@@ -55,24 +65,46 @@ def overrided_past_order_list(search_term, status, limit=20):
         invoice_list = invoices_by_customer + invoices_by_name
 
     elif status:
-        if status == "To Bill":
-            invoice_list = frappe.db.get_all(
-                "POS Invoice",
-                filters={"status": "Draft", "branch": branch_name},
-                fields=fields,
-            )
-            for invoice in invoice_list:
-                if invoice.restaurant_table and invoice.invoice_printed == 0:
-                    updated_list.append(invoice)
+        if user != "Administrator":
+            if status == "To Bill":
+                invoice_list = frappe.db.get_all(
+                    "POS Invoice",
+                    filters={"status": "Draft", "branch": branch_name},
+                    fields=fields,
+                )
+                for invoice in invoice_list:
+                    if invoice.restaurant_table and invoice.invoice_printed == 0:
+                        updated_list.append(invoice)
+
+            else:
+                invoice_list = frappe.db.get_all(
+                    "POS Invoice",
+                    filters={"status": status, "branch": branch_name},
+                    fields=fields,
+                )
+                for invoice in invoice_list:
+                    if not invoice.restaurant_table or invoice.invoice_printed == 1:
+                        updated_list.append(invoice)
 
         else:
-            invoice_list = frappe.db.get_all(
-                "POS Invoice",
-                filters={"status": status, "branch": branch_name},
-                fields=fields,
-            )
-            for invoice in invoice_list:
-                if not invoice.restaurant_table or invoice.invoice_printed == 1:
-                    updated_list.append(invoice)
+            if status == "To Bill":
+                invoice_list = frappe.db.get_all(
+                    "POS Invoice",
+                    filters={"status": "Draft"},
+                    fields=fields,
+                )
+                for invoice in invoice_list:
+                    if invoice.restaurant_table and invoice.invoice_printed == 0:
+                        updated_list.append(invoice)
+
+            else:
+                invoice_list = frappe.db.get_all(
+                    "POS Invoice",
+                    filters={"status": status},
+                    fields=fields,
+                )
+                for invoice in invoice_list:
+                    if not invoice.restaurant_table or invoice.invoice_printed == 1:
+                        updated_list.append(invoice)
 
     return updated_list
diff --git a/ury/ury/api/ury_print.py b/ury/ury/api/ury_print.py
@@ -81,6 +81,33 @@ def network_printing(
         return f"An error occurred: {str(e)}"
 
 
+@frappe.whitelist()
+def select_network_printer(pos_profile, invoice_id):
+    table = frappe.db.get_value("POS Invoice", invoice_id, "restaurant_table")
+    print_format = frappe.db.get_value("POS Profile", pos_profile, "print_format")
+
+    if table:
+        room = frappe.db.get_value("URY Table", table, "restaurant_room")
+        room_bill_printer = frappe.db.get_value(
+            "URY Printer Settings", {"parent": room, "bill": 1}, "printer"
+        )
+        if room_bill_printer:
+            print = network_printing(
+                "POS Invoice", invoice_id, room_bill_printer, print_format
+            )
+            return print
+
+    else:
+        pos_bill_printer = frappe.db.get_value(
+            "URY Printer Settings", {"parent": pos_profile, "bill": 1}, "printer"
+        )
+        if pos_bill_printer:
+            print = network_printing(
+                "POS Invoice", invoice_id, pos_bill_printer, print_format
+            )
+            return print
+
+
 @frappe.whitelist()
 def qz_print_update(invoice):
     table = frappe.db.get_value("POS Invoice", invoice, "restaurant_table")
diff --git a/ury/ury/doctype/menu_for_room/__init__.py b/ury/ury/doctype/menu_for_room/__init__.py
diff --git a/ury/ury/doctype/menu_for_room/menu_for_room.js b/ury/ury/doctype/menu_for_room/menu_for_room.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Tridz Technologies Pvt. Ltd and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Menu for Room', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/ury/ury/doctype/menu_for_room/menu_for_room.json b/ury/ury/doctype/menu_for_room/menu_for_room.json
@@ -0,0 +1,41 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-01-07 13:11:04.784852",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "menu",
+  "room"
+ ],
+ "fields": [
+  {
+   "fieldname": "menu",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Menu",
+   "options": "URY Menu"
+  },
+  {
+   "fieldname": "room",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Room",
+   "options": "URY Room"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-01-07 13:11:45.463070",
+ "modified_by": "Administrator",
+ "module": "URY",
+ "name": "Menu for Room",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/ury/ury/doctype/menu_for_room/menu_for_room.py b/ury/ury/doctype/menu_for_room/menu_for_room.py
@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Tridz Technologies Pvt. Ltd and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class MenuforRoom(Document):
+	pass
diff --git a/ury/ury/doctype/menu_for_room/test_menu_for_room.py b/ury/ury/doctype/menu_for_room/test_menu_for_room.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Tridz Technologies Pvt. Ltd and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestMenuforRoom(FrappeTestCase):
+	pass
diff --git a/ury/ury/doctype/ury_menu/ury_menu.json b/ury/ury/doctype/ury_menu/ury_menu.json
@@ -8,22 +8,14 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "restaurant",
+  "branch",
   "enabled",
   "column_break_3",
-  "branch",
   "price_list",
   "items_section",
   "items"
  ],
  "fields": [
-  {
-   "fieldname": "restaurant",
-   "fieldtype": "Link",
-   "label": "Restaurant",
-   "options": "URY Restaurant",
-   "reqd": 1
-  },
   {
    "default": "1",
    "fieldname": "enabled",
@@ -35,13 +27,6 @@
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
   },
-  {
-   "fetch_from": "restaurant.branch",
-   "fieldname": "branch",
-   "fieldtype": "Link",
-   "label": "Branch",
-   "options": "Branch"
-  },
   {
    "fieldname": "price_list",
    "fieldtype": "Link",
@@ -60,10 +45,17 @@
    "label": "Items",
    "options": "URY Menu Item",
    "reqd": 1
+  },
+  {
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "label": "Branch",
+   "options": "Branch",
+   "reqd": 1
   }
  ],
  "links": [],
- "modified": "2023-12-19 14:08:40.859677",
+ "modified": "2024-01-08 13:31:46.965352",
  "modified_by": "Administrator",
  "module": "URY",
  "name": "URY Menu",
diff --git a/ury/ury/doctype/ury_order/ury_order.js b/ury/ury/doctype/ury_order/ury_order.js
diff --git a/ury/ury/doctype/ury_order/ury_order.py b/ury/ury/doctype/ury_order/ury_order.py
diff --git a/ury/ury/doctype/ury_restaurant/ury_restaurant.json b/ury/ury/doctype/ury_restaurant/ury_restaurant.json
diff --git a/ury/ury/doctype/ury_room/ury_room.json b/ury/ury/doctype/ury_room/ury_room.json
diff --git a/ury/ury/hooks/ury_pos_invoice.py b/ury/ury/hooks/ury_pos_invoice.py
