Merge pull request #38 from ury-erp/menu-fetch

fix: fetch room-wise menu correctly and correct variable reference in…

Author: shzdb

ury/ury/doctype/ury_order/ury_order.py

@@ -261,7 +261,7 @@ def sync_order(
         )
 
         if not item_prices:
-            frappe.throw(_("No item price found for Item: {0} in Price List: {1}. Please check the price list settings.").format(item.item_code, price_list))
+            frappe.throw(_("No item price found for Item: {0} in Price List: {1}. Please check the price list settings.").format(d.get("item"), price_list))
 
         else:
             invoice.append(

ury/ury_pos/api.py

@@ -30,24 +30,7 @@ def getRestaurantMenu(pos_profile, room=None, order_type=None):
     branch_name = getBranch()
     restaurant = frappe.db.get_value("URY Restaurant", {"branch": branch_name}, "name")
 
-    if cashier and order_type:
-        order_type_wise_menu = frappe.db.get_value(
-            "URY Restaurant", restaurant, "order_type_wise_menu"
-        )
-    
-        if order_type_wise_menu:
-            menu = frappe.db.get_value(
-                "Order Type Menu",
-                {"parent": restaurant, "order_type": order_type},
-                "menu"
-            )
-            if not menu:
-                 menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
-    
-        else:
-            menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
-    
-    elif room:
+    if room:
 
         room_wise_menu = frappe.db.get_value(
             "URY Restaurant", restaurant, "room_wise_menu"
@@ -63,7 +46,24 @@ def getRestaurantMenu(pos_profile, room=None, order_type=None):
                  menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
         else:
             menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
+
+    elif cashier and order_type:
+        order_type_wise_menu = frappe.db.get_value(
+            "URY Restaurant", restaurant, "order_type_wise_menu"
+        )
+    
+        if order_type_wise_menu:
+            menu = frappe.db.get_value(
+                "Order Type Menu",
+                {"parent": restaurant, "order_type": order_type},
+                "menu"
+            )
+            if not menu:
+                 menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
 
+        else:
+            menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")
+
     # Default menu if nothing is selected
     else:
         menu = frappe.db.get_value("URY Restaurant", restaurant, "active_menu")