From 1e38903d6d3a32bdbf515384c065abd94be94e4a Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 17:51:03 +0630 Subject: [PATCH 01/20] CRM - Queue --- app/views/crm/dining_queues/index.html.erb | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 3d186efe..61f972dd 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -1,4 +1,4 @@ -
+
@@ -18,7 +18,7 @@
- + <% @dining_queues.each do |queue| %> <% if queue.status == "Assign" @bg_color = "assign" @@ -27,10 +27,10 @@ else @bg_color = "normal" end - %> + %>
- + Queue No : <%= queue.queue_no %> Seater : <%= queue.seater %>
@@ -39,7 +39,7 @@ Remark : <%= queue.remark %>
- + <% end %>
@@ -48,8 +48,10 @@
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-lg btn-block' %> +
- +
@@ -71,7 +73,7 @@ $(function(){ $("#cancel").val($(this).find(".queue-id").text()); }); //End Click - + }); $('#assign').click(function() { var id = $(this).val(); @@ -90,31 +92,31 @@ function cancel_queue(id,url) { title: 'Confirm!', content: 'Are You Sure to cancel this Queue!', buttons: { - cancel: function () { + cancel: function () { }, confirm: { text: 'Confirm', btnClass: 'btn-green', keys: ['enter', 'shift'], action: function(){ - $.ajax({ - type: "POST", + $.ajax({ + type: "POST", url: url , data: {id:id}, dataType: "json", success: function(data) { if(data.status == true) - { + { location.reload(); } - - } + + } }); } } - + } }); } - \ No newline at end of file + From a83b2c3acd9bf45ed143e0ccc8bf25a5b839fb5a Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 17:55:03 +0630 Subject: [PATCH 02/20] CRM - Queue fix scroll --- app/views/crm/dining_queues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 61f972dd..ace0f703 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -12,7 +12,7 @@
-
+
From fe8e24689845478df3a3a601025314bd89f3fa4b Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 8 Aug 2017 18:12:50 +0630 Subject: [PATCH 03/20] Remove BreadCrumb on CRM --- app/views/crm/customers/index.html.erb | 65 +++++++++++++------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 6f336158..4a4d13b8 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -1,4 +1,4 @@ -
+ +
-
+
-->
- +
- + @@ -25,7 +25,7 @@ <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
- + @@ -48,12 +48,12 @@
<% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - + @@ -62,15 +62,15 @@ - + - + <% end %> - +
- <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> <%= @i += 1 %> <% end %> <%= crm_customer.contact_no %> <%= crm_customer.email %> <%= link_to 'Show', crm_customer_path(crm_customer) %>

- + <%= paginate @crm_customers %>
@@ -98,9 +98,9 @@ $(function() { $('.datepicker').css('cursor','pointer'); // Read Card Reader - $("#member_acc_no").on('click', function(e){ - var cardNo = ""; - $("#sxModal").show(); + $("#member_acc_no").on('click', function(e){ + var cardNo = ""; + $("#sxModal").show(); setTimeout(function(){ getCardNo(); $("#sxModal").hide(); @@ -120,16 +120,16 @@ $(document).on('click',".customer_tr",function(){ // var url = "/"+customer_id; update_sale(customer_id,sale_id); }else{ - + var url = "customers/"+customer_id; } - - $.ajax({ - type: "GET", - url: url, + + $.ajax({ + type: "GET", + url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { $('#customer_id').val(data.id); $('#customer_name').val(data.name); $('#customer_company').val(data.company); @@ -158,7 +158,7 @@ $(document).on('click',".customer_tr",function(){ }else{ $('.mdm').prop( "checked", true ) } - + $('.membership_authentication_code').val(data.membership_authentication_code); $('#update_customer').removeAttr('disabled').val(''); @@ -177,7 +177,7 @@ $(document).on('click',".customer_tr",function(){ } }); // }else{ - + // } }) @@ -186,44 +186,43 @@ $(document).on('click',".customer_tr",function(){ title: 'Confirm!', content: 'Are You Sure to assign this customer!', buttons: { - + cancel: function () { - + }, confirm: { text: 'Confirm', btnClass: 'btn-green', keys: ['enter', 'shift'], action: function(){ - $.ajax({ - type: "POST", + $.ajax({ + type: "POST", url: "update_sale/" , data: {customer_id:customer_id,sale_id:sale_id}, dataType: "json", success: function(data) { if(data.status == true) - { + { window.location.href = '/origami' }else{ alert('Record not found!'); location.reload(); } - - } + + } }); } } - + } }); } $('#reset').click(function() { - + window.location.href = '/crm/customers' return false; }); - \ No newline at end of file From 38a0f787312fc403649fcfd496a99caebe68739c Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:28:17 +0630 Subject: [PATCH 04/20] add Product to account --- lib/tasks/menu_osaka.rake | 179 +++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index b0fc72a9..0acc4a1e 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -10,6 +10,7 @@ namespace :menu do menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) food = Account.create({title: "Food", account_type: "0"}) beverage = Account.create({title: "Beverage", account_type: "1"}) +product = Account.create({title: "Product", account_type: "2"}) # Gyoza menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) #Gyoza 6Pcs @@ -19,11 +20,11 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz #Gyoza 12 Pcs menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) #Gyoza 30 Pcs menu_category1_menu_item20 = SimpleMenuItem.create({name: "Gyoza 30 Pcs", alt_name: "Gyoza 30 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}]) #Green Onion Gyoza 6Pcs menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:3500.0, is_on_promotion:false}]) @@ -32,7 +33,7 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3500.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) @@ -47,22 +48,22 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:0.0, is_on_promotion:false}]) # Gyoza 2pcs # menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) # Gyoza dumpling soup with Udon menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) # # Gyoza dumpling soup with Udon # menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}]) # Gyoza dumpling soup menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}]) # Gyoza dumpling tossed menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling tossed", alt_name: "Gyoza dumpling tossed",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}]) # Gyoza dumpling soup with Ramen menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Ramen", alt_name: "Gyoza dumpling soup with Ramen",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}]) # Salad menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) @@ -77,7 +78,7 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2200.00, is_on_promotion:false}]) # S4-Glass Noodle Salad menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) # Seaweed Salad menu_category1_menu_item28 = SimpleMenuItem.create({name: "S5-Seaweed Salad", alt_name: "S5-Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) @@ -90,16 +91,16 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala # S5-Otsumami Sansyu # menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) - + # Fried Tofu Salad menu_category1_menu_item31 = SimpleMenuItem.create({name: "S7-Fried Tofu Salad", alt_name: "S7-Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) #BBQ Pork Salad menu_category1_menu_item29 = SimpleMenuItem.create({ name: "S8-BBQ Pork Salad", alt_name: "S8-BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) # Seafood Salad menu_category1_menu_item30 = SimpleMenuItem.create({name: "S9-Seafood Salad", alt_name: "S9-Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) # Gyoza Salad # menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) @@ -126,18 +127,18 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # A6 Party Set A menu_category1_menu_item54 = SimpleMenuItem.create({name: "A6-Party Set A", alt_name: "A6-Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:0.00, is_on_promotion:false}]) - # A7 Party Set + # A7 Party Set menu_category1_menu_item55 = SimpleMenuItem.create({name: "A7-Party Set", alt_name: "A7-Party Set",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}]) # A8 Wakatori Spring Chicken menu_category1_menu_item56 = SimpleMenuItem.create({name: "A8-Wakatori Spring Chicken", alt_name: "A8-Wakatori Spring Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}]) # A9 Ohsho Fried Chicken menu_category1_menu_item57 = SimpleMenuItem.create({name: "A9-Ohsho Fried Chicken", alt_name: "A9-Ohsho Fried Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}]) # A10 Fish & Chip menu_category1_menu_item58 = SimpleMenuItem.create({name: "A10-Fish & Chip", alt_name: "A10-Fish & Chip",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}]) # A2 Kushi Katsu # menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) @@ -153,11 +154,11 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # # A6 Vegetable Tempura # menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) - + # # A 10 - Fried Potato # menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) - + # # A12 Chicken Cutlet # menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) @@ -175,7 +176,7 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) # # Grilled Shishamo # menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) # # Party Set A # menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) @@ -208,7 +209,7 @@ menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) # Salad # menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) # A La Carte menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) @@ -242,16 +243,16 @@ menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) # F10 Green Pepper Steak menu_category1_menu_item72 = SimpleMenuItem.create({name: "F10-Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}]) # F11 Fried Eggplant with Pork menu_category1_menu_item68 = SimpleMenuItem.create({name: "F11-Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:0.00, is_on_promotion:false}]) # F12 Spicy Fried Beef menu_category1_menu_item69 = SimpleMenuItem.create({name: "F12-Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) # F13 Fried Egg with Beef menu_category1_menu_item66 = SimpleMenuItem.create({name: "F13-Fried Cabage with Konbu Taste", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) # Curry menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) @@ -285,19 +286,19 @@ menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Cur menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:7900.00, is_on_promotion:false}]) # C10-Fried Chicken Curry Tenshinhan menu_category12_menu_item6 = SimpleMenuItem.create({name: "C10-Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) # Rice menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) # R1-Fried Rice menu_category13_menu_item7 = SimpleMenuItem.create({name: "R1-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) # R2-Kimuchi Fried Rice menu_category13_menu_item8 = SimpleMenuItem.create({name: "R2-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) # R3-Beef Fried Rice menu_category13_menu_item11 = SimpleMenuItem.create({name: "R3-Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) # R4-Mabo Fried Rice menu_category13_menu_item12 = SimpleMenuItem.create({name: "R4-Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) @@ -339,23 +340,23 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) # # R6-Fried Prawn Don # menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) # # R7-Fried Rice # menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # # R9-Crab Tenshinhan # menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) # # R10-Crab Fried Rice # menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) # # Beef Fried Rice # menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) - - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + + # # Mabo Tenshinhan # menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) @@ -367,16 +368,16 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) # # Fried Chicken Curry Tenshinhan # menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) # # Chicken Cutlet Curry Tenshinhan # menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Ramen -menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) +menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) # N1 - Sio Ramen menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1-Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) # N2 Syoyu Ramen menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2-Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) @@ -403,20 +404,20 @@ menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Rame menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}]) # N10 Ramen Tossed menu_category1_menu_item83 = SimpleMenuItem.create({name: "N10-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}]) # N11-Fried Noodle with Thick Sauce menu_category1_menu_item81 = SimpleMenuItem.create({name: "N11-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) # # N6 Spicy Curry Ramen # menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) - + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + # N12 Cold Ramen menu_category1_menu_item79 = SimpleMenuItem.create({name: "N12-Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) # Ramen Topping -menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) +menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) # E1-Bamboo Shoot menu_category1_menu_item89 = SimpleMenuItem.create({name: "E1-Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) @@ -432,13 +433,13 @@ menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_nam # E5-Green Onion menu_category1_menu_item88 = SimpleMenuItem.create({name: "E5-Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:500.00, is_on_promotion:false}]) - + # # Half Egg # menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) # Udon -menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) +menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) # U1 Ebi Ten udon menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1-Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) @@ -472,7 +473,7 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}]) # Grilled Garlic menu_category33_menu_item201 = SimpleMenuItem.create({name: "Y2-Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}]) # Grilled Shishamo menu_category33_menu_item202 = SimpleMenuItem.create({name: "Y3-Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}]) @@ -487,10 +488,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}]) # Yakitori menu_category33_menu_item206 = SimpleMenuItem.create({name: "Y7-Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) - menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}]) # Yakitori Assortment menu_category33_menu_item207 = SimpleMenuItem.create({name: "Y8-Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}]) @@ -499,10 +500,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}]) # Lady finger (1 piece) menu_category33_menu_item209 = SimpleMenuItem.create({name: "Y10-Lady finger", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}]) # Chicken Satay (1 piece) menu_category33_menu_item210 = SimpleMenuItem.create({name: "Y11-Chicken Satay", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}]) #Sushi menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) @@ -574,14 +575,14 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus # # Soft Shell Crab Roll # menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}]) - + # # Apple Salad # menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}]) # # Seaweed Salad # menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}]) - + # set menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) # Set A ( Soup + Gyoza 3 pcs) @@ -610,7 +611,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) - menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # D3-Seasonal Fruits menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) @@ -619,7 +620,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # D5-Red Bean Gyoza menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # D6-Peanuts Butter Gyoza menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}]) @@ -677,7 +678,7 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext # menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs) # menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) # # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs) # menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) @@ -728,17 +729,17 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) # Cafe' latte menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) # Matcha latte menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) # Cafe' Mocha menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) # Flavor latte menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) - menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butter scotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) # Roasted Almond Matchal latte @@ -746,7 +747,7 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) # Coconut Matcha latte menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) # Cold Drinks menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) @@ -800,19 +801,19 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item5, price:1500.00, is_on_promotion:false}]) # Papaya Juice menu_category20_menu_item6 = SimpleMenuItem.create({name: "Papaya Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) # Avocado Juice menu_category20_menu_item7 = SimpleMenuItem.create({name: "Avocado Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) # Kiwi Juice menu_category20_menu_item9 = SimpleMenuItem.create({name: "Kiwi Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) # Mango Juice menu_category20_menu_item10 = SimpleMenuItem.create({name: "Mango Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item10, price:2000.00, is_on_promotion:false}]) # Lime Soda menu_category20_menu_item11 = SimpleMenuItem.create({name: "Lime Soda", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) # # Ice # menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}]) @@ -821,7 +822,7 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}]) # # Snow Tower # menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) #Smoothies menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) @@ -839,7 +840,7 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) # Mango Smoothie menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) # Blueberry smoothie menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) @@ -930,16 +931,16 @@ menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}]) # Kirin Ichiban Draft Beer menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}]) # Myanmar Beer menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}]) # Tuborg Beer menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}]) # # Wine by the Glass # menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) #Japanese Sake menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) @@ -958,9 +959,9 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # Lichiko Silhouette 720ml menu_category25_menu_item200 = SimpleMenuItem.create({name: "Lichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) - + # # Cocktail -# menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) +# menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # # Moscow's Sky # menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) @@ -1035,7 +1036,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) -# menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) # # D6-Seasonal Fruits # menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) @@ -1053,13 +1054,13 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}]) # # D2-Red Bean Gyoza # menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) # # D3-Banana Gyoza # menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) # # Dessert Gyoza 2Pcs # menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) # # Green Tea # menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) @@ -1068,7 +1069,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Green Tea",menu_item: menu_category19_menu_item200, price:1500.00, is_on_promotion:false}]) # # Ice Green Tea # menu_category19_menu_item201 = SimpleMenuItem.create({name: "Ice Green Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}]) # # Chinese Tea # menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name: "Chinese Tea", order_by: 31, created_by: "SYSTEM DEFAULT"}) @@ -1077,7 +1078,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot China Tea",menu_item: menu_category19_menu_item200, price:500.00, is_on_promotion:false}]) # # Cold China Tea # menu_category19_menu_item201 = SimpleMenuItem.create({name: "Cold China Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) -# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}]) # Wine menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) @@ -1086,16 +1087,16 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}]) # Cabernet Sauvignon Viejo Vivedo menu_category32_menu_item201 = SimpleMenuItem.create({name: "Cabernet Sauvignon Viejo Vivedo(Argentina)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) # Church lane (South Australia) menu_category32_menu_item202 = SimpleMenuItem.create({name: "Church lane (South Australia)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}]) # Chardonnay Layer Cake menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chardonnay Layer Cake(Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}]) # Cocktail -menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) +menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # Crane at Lakeside menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside (Sake, Lime, Green, Apple)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) @@ -1116,10 +1117,10 @@ menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) # Kyoto Temptation menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation (Lichiko, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) # Tokyo Sunset menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset (Lichiko, Vodka, Lime, Strawberry)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) # Spirits menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "Spirits", order_by: 32, created_by: "SYSTEM DEFAULT"}) @@ -1128,22 +1129,22 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "S menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}]) # Johanny Walker Double Limited menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Double Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}]) # Johanny Walker Black Limited menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Black Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}]) # Glenffich 12 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 12 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}]) # Glenffich 15 years menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 15 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}]) # Chivas Extra menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chivas Extra", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}]) # Johanny Walker Gold Tin Pack menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Gold Tin Pack", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}]) # Johanny Walker Platinum menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Platinum", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}]) From da690e00b87a2ac7d9fbade849fa5b1eb44ab840 Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:28:46 +0630 Subject: [PATCH 05/20] add s in Points --- app/views/settings/membership_settings/_form.html.erb | 8 ++++---- app/views/settings/membership_settings/index.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 77a189c4..d2a25a29 100644 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -7,10 +7,10 @@ <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> - <%= f.input :discount %> - <%= f.input :rebate %> - <%= f.input :bonus %> - <%= f.input :point %> +
+
+
+
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index fa3b22ba..4ce72b69 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -21,7 +21,7 @@ Discount Rebate Bonus - Point + Points From 7ce5ec93e465a01aecb6c48fade072132c94db64 Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:29:27 +0630 Subject: [PATCH 06/20] Change title for Cashin/Cashout --- app/views/origami/cash_ins/new.html.erb | 2 +- app/views/origami/cash_outs/new.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb index efc8a22b..b2922f63 100644 --- a/app/views/origami/cash_ins/new.html.erb +++ b/app/views/origami/cash_ins/new.html.erb @@ -1,7 +1,7 @@
-

Payment Credit

+

Cash In


diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb index 9d628f24..e4d42b89 100644 --- a/app/views/origami/cash_outs/new.html.erb +++ b/app/views/origami/cash_outs/new.html.erb @@ -2,7 +2,7 @@
-

Payment Debit

+

Cash Out

Payment Reference From 813abe17336c9a505bb773b85fa31adee3cd137e Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 12:30:11 +0630 Subject: [PATCH 07/20] Regrouping Nav bar --- app/views/layouts/_header.html.erb | 40 +++++++++++++++++++----------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 904749e6..99971b63 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -8,22 +8,25 @@
    • +
    • <%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %>
      • +
      +
    • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
    • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
      • -
      -
    • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %>
      • -
      -
    • <%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
      • +
      +
    • <%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
    • <%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %>
    • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
      • -
      +
      +
    • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • @@ -33,7 +36,7 @@
    • <%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %>
    • <%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %>
  • @@ -42,9 +45,9 @@
  • <%= link_to "Daily Sale Report", reports_dailysale_index_path, :tabindex =>"-1" %>
  • <%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %>
  • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
  • @@ -57,7 +60,7 @@
    • - + @@ -66,7 +69,7 @@
      <%if current_login_employee.role !="waiter" %>
    • <%= current_login_employee.name %>
      • - +
    • |
    • <%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
      • @@ -76,3 +79,10 @@ <% end %> + From a03e38179f85d0184810fde99d7d8dd0faeabc2f Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 15:23:55 +0630 Subject: [PATCH 08/20] UpdateHrLine --- app/views/layouts/_header.html.erb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 99971b63..bc5ce498 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -9,24 +9,24 @@
      • <%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
      • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %>
      • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
      • <%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %>
      • <%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %>
      • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
        • -
        +
      • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
      @@ -80,9 +80,8 @@ From 1b14589927627e4db1abb17dd37686ed78621e7b Mon Sep 17 00:00:00 2001 From: yamin Date: Wed, 9 Aug 2017 15:25:16 +0630 Subject: [PATCH 09/20] addCreatedAtInEmployee --- app/views/settings/employees/index.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index 0dbbcfe6..b44a2dcd 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -13,8 +13,9 @@ - - + + + @@ -24,13 +25,14 @@ + <% end %> From 0fc2fb1d9829fe5a7d7300baf218426ccac7db43 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 15:32:33 +0630 Subject: [PATCH 10/20] calc tax by user taxes --- app/models/sale.rb | 120 ++++++++++++++++++++++----------------------- db/seeds.rb | 5 +- 2 files changed, 62 insertions(+), 63 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 9fe8ad8f..672df8d1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -273,28 +273,33 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") + customer = Customer.find(sale.customer_id) # #Creat new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end sale.total_tax = total_tax_amount @@ -312,32 +317,35 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - # #Creat new tax records + customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => self) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => self) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - self.total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - self.total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end - self.total_tax = total_tax_amount - end def product_get_unit_price(item_code) @@ -382,7 +390,6 @@ class Sale < ApplicationRecord end def self.search(filter,from,to) - if filter.blank? keyword = '' else @@ -399,7 +406,6 @@ class Sale < ApplicationRecord end def self.search_credit_sales(customer,filter,from,to) - if filter.blank? keyword = '' else @@ -518,31 +524,25 @@ class Sale < ApplicationRecord end def self.get_by_range_by_saleitems(from,to,status,report_type) + query = Sale.select(" + mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, + SUM(i.qty) as total_item," + + " i.unit_price as unit_price, + mi.name as product_name, + mc.name as menu_category_name, + mc.id as menu_category_id ") + .group('mi.id') + .order("mi.menu_category_id") - query = Sale.select(" - mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, - SUM(i.qty) as total_item," + - " i.unit_price as unit_price, - mi.name as product_name, - mc.name as menu_category_name, - mc.id as menu_category_id ") - .group('mi.id') - .order("mi.menu_category_id") - - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id - JOIN menu_items mi ON i.product_code = mi.item_code" + - " JOIN menu_categories mc ON mc.id = mi.menu_category_id - JOIN employees ea ON ea.id = sales.cashier_id") - - - query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) - - + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN menu_categories mc ON mc.id = mi.menu_category_id + JOIN employees ea ON ea.id = sales.cashier_id") + query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) end - def self.get_by_shiftsales(from,to,shift) if !shift.blank? ShiftSale.where("id =?",shift.id) diff --git a/db/seeds.rb b/db/seeds.rb index 1b63bcb0..1b024797 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,9 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) - +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[2,1]"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[1]"}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 14384745ad2f9ad141299012cebd8649f9a3ce64 Mon Sep 17 00:00:00 2001 From: Phyo Date: Wed, 9 Aug 2017 15:37:28 +0630 Subject: [PATCH 11/20] Payment Methods - Isactive verification --- app/views/origami/others_payments/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 9ca152ac..b547fcda 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -2,7 +2,7 @@
      - <% @payment_method_setting.each do |payment_method|%> + <% @payment_method_setting.where("is_active = true").each do |payment_method|%>
      <%= payment_method.payment_method %>
      <% end %>
      From 2794103e52b45986b5706010751e3f229a270b67 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 17:54:22 +0630 Subject: [PATCH 12/20] update customer tax calc --- .../origami/customers_controller.rb | 4 +- app/models/sale.rb | 7 ++- app/views/crm/customers/_new_form.html.erb | 23 ++++---- app/views/origami/customers/index.html.erb | 57 +++++++++++++------ 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 026e59e3..ec826416 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -37,14 +37,14 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) else - @crm_customers = Customer.search(filter) - + @crm_customers = Customer.search(filter) end #@crm_customers = Customer.all @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50) @crm_customer = Customer.new @count_customer = Customer.count_customer + @taxes = TaxProfile.all.order("order_by asc") # if flash["errors"] # @crm_customer.valid? # end diff --git a/app/models/sale.rb b/app/models/sale.rb index 712584a5..b252fdf1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -277,8 +277,8 @@ class Sale < ApplicationRecord # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -318,10 +318,11 @@ class Sale < ApplicationRecord tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 5f1d1b46..35c3a46d 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -82,17 +82,7 @@
      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> -
      - -
      "> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['card_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end %> -
      +
      @@ -103,10 +93,21 @@ <%end %>
      +
      <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
      +
      "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['card_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end %> +
      +
      diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 3c22c2e4..c41e3cd6 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -81,23 +81,7 @@ <%= f.error_notification %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> -
      "> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
      -
      - -
      - -
      -
      -
      + <%= f.hidden_field :id, :class => "form-control col-md-6 " %>

      @@ -176,6 +160,37 @@ <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
      +
      + + +
      + +
      + <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> +
      + +
      "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
      +
      + +
      + +
      +
      +
      +
      NameRoleNameRoleCreated At Action
      <%= link_to employee.name,settings_employee_path(employee) %> <%= employee.role %><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_employee_path(employee) %> + <%= link_to 'Edit', edit_settings_employee_path(employee) %> <%if employee.role != "administrator"%> - - + + | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %> - <%end%> + <%end%>