From f6b92ad111a6ad61807a711a1ddea74324ba37b1 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 23 Jan 2018 15:02:50 +0630 Subject: [PATCH] change person item code process --- README.md | 4 ++-- app/views/api/orders/view_orders.json.jbuilder | 4 ++-- db/seeds.rb | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index aa292813..7add3b2c 100755 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ Person and Extra Time category_code = SPL... //for menu categories special 1) must create Person in settings/accounts 2) must create Adult and Child in settings/item_attributes - 3) must be P00001 for Adult and P00002 for Child in settings/menu_categories/[cat_id]/simple_menu_items - 3) must be PI0001 for Adult and PI0002 for Child in settings/simple_menu_items/[item_id]/menu_item_instances + 3) must be PSA_[a-z/0-9] for Adult and PSC_[a-z/0-9] for Child in settings/menu_categories/[cat_id]/simple_menu_items + 3) must be PSAI_[a-z/0-9] for Adult and PSCI_[a-z/0-9] for Child in settings/simple_menu_items/[item_id]/menu_item_instances For Extra Time item_instance_code diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder index a7759514..ae3fea84 100755 --- a/app/views/api/orders/view_orders.json.jbuilder +++ b/app/views/api/orders/view_orders.json.jbuilder @@ -37,11 +37,11 @@ if (@booking) json.order_items order_items do |item| # For YGN BBQ - if item.item_code == "P00001" + if item.item_code.include? ("PSA_") adult_count += item.qty adult_spent += (item.price * item.qty) end - if item.item_code == "P00002" + if item.item_code.include? ("PSC_") child_count += item.qty child_spent += (item.price * item.qty) end diff --git a/db/seeds.rb b/db/seeds.rb index 78321b72..1de300a1 100755 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,20 +163,20 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle # menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"}) # menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"}) -# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" }) -# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" }) +# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"PSA_00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" }) +# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PSAI_0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" }) -# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" }) -# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" }) +# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"PSC_00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" }) +# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PSCI_0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" }) # menu_item_attribute_30_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "30 min", value: "30_min"}) # menu_item_attribute_60_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "1 hrs", value: "60_min"}) # menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"Ext30", name: "30 minutes", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['1']", created_by: "System" }) -# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" }) +# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Extim_30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" }) # menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"Ext60", name: "1 hour", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['2']", created_by: "System" }) -# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" }) +# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Extim_60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" }) # END