Feat: Added default room field in 'ury_restaurant' and implemented roomwise table ordering API for 'ury_pos'.

Author: Hafnianusha

ury/fixtures/custom_field.json

@@ -1466,14 +1466,14 @@
   "columns": 0,
   "default": null,
   "depends_on": null,
-  "description": null,
+  "description": "Enables Cashiers to view all statuses (Paid, Consolidated, Return Invoices) in the recent order.",
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "Sales Invoice",
+  "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "order_info",
-  "fieldtype": "Section Break",
+  "fieldname": "view_all_status",
+  "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1484,15 +1484,15 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "amended_from",
+  "insert_after": "role_restricted_for_table_order",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Order Info",
+  "label": "Allow Cashier To View All Status",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2023-09-14 00:31:35.774264",
+  "modified": "2024-01-23 13:30:17.539810",
   "module": null,
-  "name": "Sales Invoice-order_info",
+  "name": "POS Profile-view_all_status",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -1520,14 +1520,14 @@
   "columns": 0,
   "default": null,
   "depends_on": null,
-  "description": "Enables Cashiers to view all statuses (Paid, Consolidated, Return Invoices) in the recent order.",
+  "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "POS Profile",
+  "dt": "Sales Invoice",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "view_all_status",
-  "fieldtype": "Check",
+  "fieldname": "order_info",
+  "fieldtype": "Section Break",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1538,15 +1538,15 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "role_restricted_for_table_order",
+  "insert_after": "amended_from",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Allow Cashier To View All Status",
+  "label": "Order Info",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2024-01-23 13:30:17.539810",
+  "modified": "2023-09-14 00:31:35.774264",
   "module": null,
-  "name": "POS Profile-view_all_status",
+  "name": "Sales Invoice-order_info",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -1626,16 +1626,16 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": "Dine In",
+  "default": null,
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "Sales Invoice",
+  "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "order_type",
-  "fieldtype": "Select",
+  "fieldname": "remove_items",
+  "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1646,18 +1646,18 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "order_info",
+  "insert_after": "view_all_status",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Order Type",
+  "label": "Allow Cashier To Edit And Remove Table Order Items",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2023-09-14 00:31:36.390337",
+  "modified": "2024-01-23 13:32:45.884420",
   "module": null,
-  "name": "Sales Invoice-order_type",
+  "name": "POS Profile-remove_items",
   "no_copy": 0,
   "non_negative": 0,
-  "options": "\nDine In\nTake Away\nDelivery\nPhone In\nAggregators",
+  "options": null,
   "permlevel": 0,
   "precision": "",
   "print_hide": 0,
@@ -1680,16 +1680,16 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": null,
+  "default": "Dine In",
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "POS Profile",
+  "dt": "Sales Invoice",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "remove_items",
-  "fieldtype": "Check",
+  "fieldname": "order_type",
+  "fieldtype": "Select",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1700,18 +1700,18 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "view_all_status",
+  "insert_after": "order_info",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Allow Cashier To Edit And Remove Table Order Items",
+  "label": "Order Type",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2024-01-23 13:32:45.884420",
+  "modified": "2023-09-14 00:31:36.390337",
   "module": null,
-  "name": "POS Profile-remove_items",
+  "name": "Sales Invoice-order_type",
   "no_copy": 0,
   "non_negative": 0,
-  "options": null,
+  "options": "\nDine In\nTake Away\nDelivery\nPhone In\nAggregators",
   "permlevel": 0,
   "precision": "",
   "print_hide": 0,
@@ -1788,16 +1788,16 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": null,
+  "default": "1",
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "Sales Invoice",
+  "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "waiter",
-  "fieldtype": "Data",
+  "fieldname": "show_image",
+  "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1808,15 +1808,15 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "order_type",
+  "insert_after": "remove_items",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Waiter",
+  "label": "Show Item Image In URY Pos",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2023-09-14 00:31:36.754796",
+  "modified": "2024-02-09 19:24:46.076630",
   "module": null,
-  "name": "Sales Invoice-waiter",
+  "name": "POS Profile-show_image",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -1825,7 +1825,7 @@
   "print_hide": 0,
   "print_hide_if_no_value": 0,
   "print_width": null,
-  "read_only": 1,
+  "read_only": 0,
   "read_only_depends_on": null,
   "report_hide": 0,
   "reqd": 0,
@@ -1842,16 +1842,16 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": "1",
+  "default": null,
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
-  "dt": "POS Profile",
+  "dt": "Sales Invoice",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "show_image",
-  "fieldtype": "Check",
+  "fieldname": "waiter",
+  "fieldtype": "Data",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -1862,15 +1862,15 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "remove_items",
+  "insert_after": "order_type",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Show Item Image In URY Pos",
+  "label": "Waiter",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2024-02-09 19:24:46.076630",
+  "modified": "2023-09-14 00:31:36.754796",
   "module": null,
-  "name": "POS Profile-show_image",
+  "name": "Sales Invoice-waiter",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -1879,7 +1879,7 @@
   "print_hide": 0,
   "print_hide_if_no_value": 0,
   "print_width": null,
-  "read_only": 0,
+  "read_only": 1,
   "read_only_depends_on": null,
   "report_hide": 0,
   "reqd": 0,

ury/ury/doctype/ury_order/ury_order.py

@@ -203,7 +203,9 @@ def sync_order(
         }
         past_item.append(previous_item)
 
-    # conditional checking for ury and for ury pos
+    # Conditional checking for 'items' type:
+    # - 'ury': JSON passed, hence using isinstance
+    # - 'ury_pos': Already formatted list, hence using else
     if isinstance(items, str):
         items = json.loads(items)
         invoice.items = []
@@ -249,11 +251,14 @@ def sync_order(
                 filters={"item_code": item.item_code, "price_list": price_list},
                 fields=["price_list_rate"],
             )
-
-            item.rate = item_prices[0].price_list_rate
-            item.cost_center = frappe.db.get_value(
-                "POS Profile", pos_profile, "cost_center"
-            )
+            
+            if not item_prices:
+                frappe.throw(_("POS Profile Not Found or User permission in POS Profile is not given to this user."))
+            else:
+                item.rate = item_prices[0].price_list_rate
+                item.cost_center = frappe.db.get_value(
+                    "POS Profile", pos_profile, "cost_center"
+                )
 
         invoice.save()
 

ury/ury/doctype/ury_restaurant/ury_restaurant.json

@@ -18,6 +18,8 @@
   "menu_info_section",
   "active_menu",
   "room_wise_menu",
+  "column_break_vo5jt",
+  "default_room",
   "menu_for_room"
  ],
  "fields": [
@@ -88,11 +90,22 @@
    "fieldtype": "Table",
    "label": "Menu For Room",
    "options": "Menu for Room"
+  },
+  {
+   "fieldname": "column_break_vo5jt",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "default_room",
+   "fieldtype": "Link",
+   "label": "Default Room",
+   "options": "URY Room",
+   "reqd": 1
   }
  ],
  "image_field": "image",
  "links": [],
- "modified": "2024-01-08 14:54:48.115520",
+ "modified": "2024-05-01 19:55:53.124596",
  "modified_by": "Administrator",
  "module": "URY",
  "name": "URY Restaurant",

ury/ury/doctype/ury_room/ury_room.json

@@ -8,7 +8,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "branch",
+  "column_break_ahfni",
   "room_type",
+  "section_break_hrqbe",
   "printer_settings"
  ],
  "fields": [
@@ -23,11 +26,27 @@
    "fieldtype": "Table",
    "label": "Printer Settings",
    "options": "URY Printer Settings"
+  },
+  {
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Branch",
+   "options": "Branch",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_ahfni",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_hrqbe",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-08 13:33:41.540961",
+ "modified": "2024-05-01 19:54:10.412708",
  "modified_by": "Administrator",
  "module": "URY",
  "name": "URY Room",

ury/ury_pos/api.py

@@ -2,6 +2,17 @@
 from frappe import _
 
 
+@frappe.whitelist()
+def getTable(room):
+    branch_name = getBranch()   
+    tables = frappe.get_all(
+        "URY Table",
+        fields=["name", "occupied", "latest_invoice_time", "is_take_away", "restaurant_room"],
+        filters={"branch": branch_name,"restaurant_room":room,}
+    )    
+    return tables
+
+
 @frappe.whitelist()
 def getRestaurantMenu(pos_profile, table=None):
     menu_items = []