From 02e3ebefda0a98b58600741c5da85ca7fc02473b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 17:56:31 +0630 Subject: [PATCH 01/12] update receipt --- .../origami/payments_controller.rb | 12 ++++--- .../origami/request_bills_controller.rb | 5 +-- app/models/printer/receipt_printer.rb | 4 +-- app/pdf/receipt_bill_pdf.rb | 34 +++++++++++-------- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 0119953f..e1108cfc 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -17,6 +17,8 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) rebate_amount = Customer.get_membership_transactions(customer) + #shop detail + shop_details = Shop.find(1) # get member information member_info = Customer.get_member_account(customer) @@ -26,7 +28,7 @@ class Origami::PaymentsController < BaseOrigamiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount,shop_details) end end @@ -51,8 +53,8 @@ class Origami::PaymentsController < BaseOrigamiController @accountable_type = '' if response["status"]==true response["data"].each do |res| - if res["accountable_type"] == "RebateAccount" - @balance = res["balance"] + if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" + @balance += res["balance"] # @accountable_type = res["accountable_type"] @accountable_type = "Rebate Balance" end @@ -89,6 +91,8 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) + #shop detail + shop_details = Shop.find(1) # get member information member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer) @@ -99,7 +103,7 @@ class Origami::PaymentsController < BaseOrigamiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount,shop_details) end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 95f63e58..bffec79d 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -20,8 +20,9 @@ class Origami::RequestBillsController < BaseOrigamiController end unique_code = "ReceiptBillPdf" + #shop detail + shop_details = Shop.find(1) # customer= Customer.where('customer_id=' +.customer_id) - customer= Customer.find(@sale_data.customer_id) # get member information member_info = Customer.get_member_account(customer) @@ -36,7 +37,7 @@ class Origami::RequestBillsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) # redirect_to origami_path(@sale_data.sale_id) end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 4b7287db..8e389e79 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -65,11 +65,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Bill Receipt Print - def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount=nil) + def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount) + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount,shop_details) pdf.render_file "tmp/receipt_bill.pdf" self.print("tmp/receipt_bill.pdf") diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 4689de9d..b156e2c2 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,6 +1,6 @@ class ReceiptBillPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil) + def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details) self.page_width = 210 self.page_height = 2500 self.margin = 5 @@ -24,7 +24,7 @@ class ReceiptBillPdf < Prawn::Document self.header_font_size = 10 self.item_font_size = 8 - header( "Beauty In the Pot", printer_settings.name) + header( shop_details) stroke_horizontal_rule @@ -44,12 +44,15 @@ class ReceiptBillPdf < Prawn::Document footer end - def header (printer_name, name) - text "#{printer_name}", :left_margin => -10, :size => self.header_font_size,:align => :center + def header (shop_details) + move_down 7 + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center move_down 5 - text "#{name}", :size => self.header_font_size,:align => :center + text "#{shop_details.address}", :size => self.item_font_size,:align => :center # move_down self.item_height move_down 5 + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down 5 stroke_horizontal_rule end @@ -264,22 +267,23 @@ class ReceiptBillPdf < Prawn::Document end end if member_info["status"] == true + balance = 0.0 member_info["data"].each do |res| - if res["accountable_type"]== "RebateAccount" - - move_down 5 - y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Current Balance", :size => self.item_font_size,:align => :left - end - bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "#{ res["balance"] }" , :size => self.item_font_size,:align => :right - end + if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" + balance = balance + res["balance"] end end + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Current Balance", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ balance }" , :size => self.item_font_size,:align => :right + end end end From 1000968a8f8fc2464916404e72748bd1593aa4e7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 18:14:36 +0630 Subject: [PATCH 02/12] update --- app/controllers/transactions/credit_notes_controller.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/controllers/transactions/credit_notes_controller.rb diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb new file mode 100644 index 00000000..e69de29b From cb77c771b88230f011146484f5a9363cbd1942ce Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 18:45:20 +0630 Subject: [PATCH 03/12] oqs update --- app/controllers/oqs/home_controller.rb | 2 +- app/models/order_queue_station.rb | 5 +++-- app/models/printer/order_queue_printer.rb | 8 ++++---- app/pdf/order_item_pdf.rb | 4 ++-- app/pdf/order_summary_pdf.rb | 18 +++++++++++++----- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 9887df6c..692b9c4a 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -118,6 +118,6 @@ class Oqs::HomeController < BaseOqsController left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status}") - .group("odt.order_items_id") + .group("assigned_order_items.assigned_order_item_id") end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 4166f7af..bac229a9 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -45,7 +45,8 @@ class OrderQueueStation < ApplicationRecord end # Auto Printing # ToDo per item per printer - if oqs.auto_print && is_auto_printed == false + if oqs.auto_print && is_auto_printed == false + puts oqs_order_items.length print_slip(oqs, order, oqs_order_items) is_auto_printed = true end @@ -59,7 +60,7 @@ class OrderQueueStation < ApplicationRecord print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_summary(oqs,order.order_id, print_status="") + order_queue_printer.print_order_summary(oqs,order.order_id, order_items, print_status="") AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| # update print status for order items diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 8535bcc2..bbeafecf 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -22,14 +22,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # Query for per order - def print_order_summary(oqs, order_id, print_status) + def print_order_summary(oqs, order_id, order_items, print_status) #Use CUPS service #Generate PDF - #Print + #Print order=print_query('order_summary', order_id) # For Print Per Item if oqs.cut_per_item - order.each do|odi| + order_items.each do|odi| filename = "tmp/order_item_#{odi.item_name}" + ".pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -46,7 +46,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Order Summary else filename = "tmp/order_summary_#{ order_id }" + ".pdf" - pdf = OrderSummaryPdf.new(order, print_status) + pdf = OrderSummaryPdf.new(order, print_status, order_items) pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 5a60b093..6d6346f9 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -18,8 +18,8 @@ class OrderItemPdf < Prawn::Document # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 14 - self.item_font_size = 12 + self.header_font_size = 12 + self.item_font_size = 10 text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 2e9c41ec..d85a5916 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,6 +1,6 @@ class OrderSummaryPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(order, print_status) + def initialize(order, print_status, order_items = nil) self.page_width = 210 self.page_height = 1450 self.margin = 5 @@ -28,8 +28,11 @@ class OrderSummaryPdf < Prawn::Document order_info(order[0].order_id, order[0].order_by,order[0].order_at) # order items - order_items(order) - + if order_items == nil + order_items(order) + else + order_items(order_items) + end end # Write Order Information to PDF @@ -73,6 +76,7 @@ class OrderSummaryPdf < Prawn::Document #Add Order Item add_order_items(order_item) + end # Add order items under order info @@ -89,11 +93,11 @@ class OrderSummaryPdf < Prawn::Document # text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix # } bounding_box([0,y_position], :width => self.item_width) do - text "#{odi.item_name}", :size => self.item_font_size,:align => :left, :height => self.item_height + text "#{odi.item_name}", :size => self.item_font_size,:align => :left end bounding_box([self.item_width,y_position], :width => self.qty_width) do - text "#{odi.qty}", :size => self.item_font_size,:align => :left, :height => self.item_height + text "#{odi.qty}", :size => self.item_font_size,:align => :left end move_down 5 @@ -109,6 +113,10 @@ class OrderSummaryPdf < Prawn::Document move_down 5 end + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, (self.page_width - self.margin) + move_down 5 end end From 79befa4876e773dbf6862e5094b16e654424988d Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 26 Jun 2017 18:49:41 +0630 Subject: [PATCH 04/12] rake task fix --- lib/tasks/menu_import.rake | 313 +++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 152 deletions(-) diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index b533dbb2..8ec56ea6 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -10,215 +10,224 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base" # single pot menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Single Pot",item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:10.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0041", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0051", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0071", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0081", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0061", menu_item: menu_category1_menu_item0, price:17800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0051", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0061", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0071", menu_item: menu_category1_menu_item0, price:17800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0081", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0101", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) # twin pot menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"01002", name: "Twin Pot", alt_name: "Twin Pot",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Twin Pot",item_instance_code:"II0021", menu_item: menu_category1_menu_item1, price:10.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0042", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0052", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0072", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0082", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0062", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0092", menu_item: menu_category1_menu_item1, price:11800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0052", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0062", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0072", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0082", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0092", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0102", menu_item: menu_category1_menu_item1, price:11800.00, is_on_promotion:false}]) # vip room Individual pot menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VIP Room Individual Pot",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:10.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0043", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + # Quart pot + menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Quart Pot", alt_name: "Quart Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + + # Assorted Platter -menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Assorted Platter", alt_name: "Assorted Platter", order_by: 2, created_by: "SYSTEM DEFAULT"}) +menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Specialty Assorted Platter", alt_name: "Assorted Platter", order_by: 2, created_by: "SYSTEM DEFAULT"}) # Pork Platter menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Pork Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0101", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0111", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false}]) # Beef Platter menu_category1_menu_item4 = SimpleMenuItem.create({item_code:"01005", name: "Beef Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Platter",item_instance_code:"II0111", menu_item: menu_category1_menu_item4, price:24000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Platter",item_instance_code:"II0121", menu_item: menu_category1_menu_item4, price:24000.00, is_on_promotion:false}]) # Assorted Seafood Platter menu_category1_menu_item5 = SimpleMenuItem.create({item_code:"01006", name: "Assorted Seafood Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Assorted Seafood Platter",item_instance_code:"II0121", menu_item: menu_category1_menu_item5, price:66000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Assorted Seafood Platter",item_instance_code:"II0131", menu_item: menu_category1_menu_item5, price:66000.00, is_on_promotion:false}]) # Beef & Mutton menu_category3 = MenuCategory.create({menu: menu, code:"C003", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 3,created_by: "SYSTEM DEFAULT"}) # Australia Angus Boneless Short Rib menu_category1_menu_item6 = SimpleMenuItem.create({item_code:"01007", name: "Australia Angus Boneless Short Rib", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0132", menu_item: menu_category1_menu_item5, price:12500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0131", menu_item: menu_category1_menu_item5, price:25000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0142", menu_item: menu_category1_menu_item5, price:12500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0141", menu_item: menu_category1_menu_item5, price:25000.00, is_on_promotion:false}]) # Spain Beef menu_category1_menu_item7 = SimpleMenuItem.create({item_code:"01008", name: "Spain Beef", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0142", menu_item: menu_category1_menu_item7, price:8000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0141", menu_item: menu_category1_menu_item7, price:16000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0152", menu_item: menu_category1_menu_item7, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0151", menu_item: menu_category1_menu_item7, price:16000.00, is_on_promotion:false}]) # Sliced Beef （Thin） menu_category1_menu_item8 = SimpleMenuItem.create({item_code:"01009", name: "Sliced Beef （Thin）", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0152", menu_item: menu_category1_menu_item7, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0151", menu_item: menu_category1_menu_item7, price:12000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0162", menu_item: menu_category1_menu_item8, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0161", menu_item: menu_category1_menu_item8, price:12000.00, is_on_promotion:false}]) # Tender Sliced Beef menu_category1_menu_item9 = SimpleMenuItem.create({item_code:"01010", name: "Tender Sliced Beef", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0162", menu_item: menu_category1_menu_item7, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0161", menu_item: menu_category1_menu_item7, price:12000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0172", menu_item: menu_category1_menu_item9, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0171", menu_item: menu_category1_menu_item9, price:12000.00, is_on_promotion:false}]) # Beef Tripe menu_category1_menu_item10 = SimpleMenuItem.create({item_code:"01011", name: "Beef Tripe", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0172", menu_item: menu_category1_menu_item7, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0171", menu_item: menu_category1_menu_item7, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0182", menu_item: menu_category1_menu_item10, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0181", menu_item: menu_category1_menu_item10, price:7000.00, is_on_promotion:false}]) # Braised Cow's Stomach menu_category1_menu_item11 = SimpleMenuItem.create({item_code:"01012", name: "Braised Cow's Stomach", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0182", menu_item: menu_category1_menu_item11, price:7000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0181", menu_item: menu_category1_menu_item11, price:14000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0192", menu_item: menu_category1_menu_item11, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0191", menu_item: menu_category1_menu_item11, price:14000.00, is_on_promotion:false}]) + # Sliced Lamb + menu_category1_menu_item11 = SimpleMenuItem.create({item_code:"01012", name: "Sliced Lamb", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0202", menu_item: menu_category1_menu_item11, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0201", menu_item: menu_category1_menu_item11, price:14000.00, is_on_promotion:false}]) + # Pork menu_category4 = MenuCategory.create({menu: menu, code:"C004", name: "Pork", alt_name: "Pork", order_by: 4,created_by: "SYSTEM DEFAULT"}) - # Sliced Lamb - menu_category1_menu_item12 = SimpleMenuItem.create({item_code:"01013", name: "Sliced Lamb", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0192", menu_item: menu_category1_menu_item12, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0191", menu_item: menu_category1_menu_item12, price:12000.00, is_on_promotion:false}]) # Sliced Tenderloin Pork menu_category1_menu_item13 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0202", menu_item: menu_category1_menu_item13, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0201", menu_item: menu_category1_menu_item13, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", menu_item: menu_category1_menu_item13, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0211", menu_item: menu_category1_menu_item13, price:8000.00, is_on_promotion:false}]) # Sliced Pork Belly menu_category1_menu_item14 = SimpleMenuItem.create({item_code:"01015", name: "Sliced Pork Belly", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", menu_item: menu_category1_menu_item14, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0211", menu_item: menu_category1_menu_item14, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0222", menu_item: menu_category1_menu_item14, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0221", menu_item: menu_category1_menu_item14, price:8000.00, is_on_promotion:false}]) # Sliced Pork Collar menu_category1_menu_item15 = SimpleMenuItem.create({item_code:"01016", name: "Sliced Pork Collar", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0222", menu_item: menu_category1_menu_item15, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0221", menu_item: menu_category1_menu_item15, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0232", menu_item: menu_category1_menu_item15, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0231", menu_item: menu_category1_menu_item15, price:8000.00, is_on_promotion:false}]) # Pork Jawl menu_category1_menu_item16 = SimpleMenuItem.create({item_code:"01017", name: "Pork Jawl", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0232", menu_item: menu_category1_menu_item16, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0231", menu_item: menu_category1_menu_item16, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0242", menu_item: menu_category1_menu_item16, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0241", menu_item: menu_category1_menu_item16, price:8000.00, is_on_promotion:false}]) # Tender Sliced Tenderloin Pork menu_category1_menu_item17 = SimpleMenuItem.create({item_code:"01018", name: "Tender Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0242", menu_item: menu_category1_menu_item17, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0241", menu_item: menu_category1_menu_item17, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0252", menu_item: menu_category1_menu_item17, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0251", menu_item: menu_category1_menu_item17, price:8000.00, is_on_promotion:false}]) # Spicy Sliced Pork menu_category1_menu_item18 = SimpleMenuItem.create({item_code:"01019", name: "Spicy Sliced Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0252", menu_item: menu_category1_menu_item18, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0251", menu_item: menu_category1_menu_item18, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0262", menu_item: menu_category1_menu_item18, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0261", menu_item: menu_category1_menu_item18, price:8000.00, is_on_promotion:false}]) # Pig's Tongue menu_category1_menu_item19 = SimpleMenuItem.create({item_code:"01020", name: "Pig's Tongue", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0262", menu_item: menu_category1_menu_item19, price:60000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0261", menu_item: menu_category1_menu_item19, price:12000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0272", menu_item: menu_category1_menu_item19, price:60000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0271", menu_item: menu_category1_menu_item19, price:12000.00, is_on_promotion:false}]) # Luncheon Meat menu_category1_menu_item20 = SimpleMenuItem.create({item_code:"01021", name: "Luncheon Meat", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0272", menu_item: menu_category1_menu_item20, price:2500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0271", menu_item: menu_category1_menu_item20, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0282", menu_item: menu_category1_menu_item20, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0281", menu_item: menu_category1_menu_item20, price:5000.00, is_on_promotion:false}]) # Pig's Liver menu_category1_menu_item21 = SimpleMenuItem.create({item_code:"01022", name: "Pig's Liver", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0282", menu_item: menu_category1_menu_item21, price:2500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0281", menu_item: menu_category1_menu_item21, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0292", menu_item: menu_category1_menu_item21, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0291", menu_item: menu_category1_menu_item21, price:5000.00, is_on_promotion:false}]) # Pig's Intestine menu_category1_menu_item22 = SimpleMenuItem.create({item_code:"01023", name: "Pig's Intestine", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0292", menu_item: menu_category1_menu_item22, price:3000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0291", menu_item: menu_category1_menu_item22, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0302", menu_item: menu_category1_menu_item22, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0301", menu_item: menu_category1_menu_item22, price:6000.00, is_on_promotion:false}]) # Chicken menu_category5 = MenuCategory.create({menu: menu, code:"C005", name: "Chicken", alt_name: "Chicken", order_by: 5, created_by: "SYSTEM DEFAULT"}) # Sliced Chicken Breast menu_category1_menu_item23 = SimpleMenuItem.create({item_code:"01024", name: "Sliced Chicken Breast", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0302", menu_item: menu_category1_menu_item23, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0301", menu_item: menu_category1_menu_item23, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0312", menu_item: menu_category1_menu_item23, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0311", menu_item: menu_category1_menu_item23, price:7000.00, is_on_promotion:false}]) # Sliced Chicken Thigh menu_category1_menu_item24 = SimpleMenuItem.create({item_code:"01025", name: "Sliced Chicken Thigh", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0312", menu_item: menu_category1_menu_item24, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0311", menu_item: menu_category1_menu_item24, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0322", menu_item: menu_category1_menu_item24, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0321", menu_item: menu_category1_menu_item24, price:7000.00, is_on_promotion:false}]) # Crunchy Gourmet Chicken Sausage menu_category1_menu_item25 = SimpleMenuItem.create({item_code:"01026", name: "Crunchy Gourmet Chicken Sausage", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0322", menu_item: menu_category1_menu_item25, price:4000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0321", menu_item: menu_category1_menu_item25, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0332", menu_item: menu_category1_menu_item25, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0331", menu_item: menu_category1_menu_item25, price:8000.00, is_on_promotion:false}]) # Cheesy Chicken Sausage menu_category1_menu_item26 = SimpleMenuItem.create({item_code:"01027", name: "Cheesy Chicken Sausage", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0332", menu_item: menu_category1_menu_item26, price:4800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0331", menu_item: menu_category1_menu_item26, price:9600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0342", menu_item: menu_category1_menu_item26, price:4800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0341", menu_item: menu_category1_menu_item26, price:9600.00, is_on_promotion:false}]) # Chicken Feet Skin menu_category1_menu_item27 = SimpleMenuItem.create({item_code:"01028", name: "Chicken Feet Skin", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0342", menu_item: menu_category1_menu_item27, price:2500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0341", menu_item: menu_category1_menu_item27, price:5000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0352", menu_item: menu_category1_menu_item27, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0351", menu_item: menu_category1_menu_item27, price:5000.00, is_on_promotion:false}]) # Chinese Wine Kampong Chicken menu_category1_menu_item28 = SimpleMenuItem.create({item_code:"01029", name: "Chinese Wine Kampong Chicken", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0352", menu_item: menu_category1_menu_item28, price:8000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0351", menu_item: menu_category1_menu_item28, price:16000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0362", menu_item: menu_category1_menu_item28, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0361", menu_item: menu_category1_menu_item28, price:16000.00, is_on_promotion:false}]) # Handmade Balls menu_category6 = MenuCategory.create({menu: menu, code:"C006", name: "Handmade Balls", alt_name: "Soup_base", order_by: 6,created_by: "SYSTEM DEFAULT"}) # Soft Bone Pork Meatball menu_category1_menu_item29 = SimpleMenuItem.create({item_code:"01030", name: "Soft Bone Pork Meatball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0362", menu_item: menu_category1_menu_item29, price:3000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0361", menu_item: menu_category1_menu_item29, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0372", menu_item: menu_category1_menu_item29, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0371", menu_item: menu_category1_menu_item29, price:6000.00, is_on_promotion:false}]) # Fish Ball menu_category1_menu_item30 = SimpleMenuItem.create({item_code:"01031", name: "Fish Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0372", menu_item: menu_category1_menu_item30, price:3000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0371", menu_item: menu_category1_menu_item30, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0382", menu_item: menu_category1_menu_item30, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0381", menu_item: menu_category1_menu_item30, price:6000.00, is_on_promotion:false}]) # Beef Ball menu_category1_menu_item31 = SimpleMenuItem.create({item_code:"01032", name: "Beef Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0382", menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0381", menu_item: menu_category1_menu_item31, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0392", menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0391", menu_item: menu_category1_menu_item31, price:7000.00, is_on_promotion:false}]) # Mushroom Ball - menu_category1_menu_item32 = SimpleMenuItem.create({item_code:"01033", name: "Mushroom Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0392", menu_item: menu_category1_menu_item32, price:3000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0391", menu_item: menu_category1_menu_item32, price:7000.00, is_on_promotion:false}]) + menu_category1_menu_item32 = SimpleMenuItem.create({item_code:"01033", name: "Mushroom Pork Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0402", menu_item: menu_category1_menu_item32, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0401", menu_item: menu_category1_menu_item32, price:7000.00, is_on_promotion:false}]) # Cuttlefish Ball menu_category1_menu_item33 = SimpleMenuItem.create({item_code:"01034", name: "Cuttlefish Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0402", menu_item: menu_category1_menu_item33, price:3000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0401", menu_item: menu_category1_menu_item33, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0412", menu_item: menu_category1_menu_item33, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0411", menu_item: menu_category1_menu_item33, price:7000.00, is_on_promotion:false}]) # Cheesy Pork Ball menu_category1_menu_item34 = SimpleMenuItem.create({item_code:"01035", name: "Cheesy Pork Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0412", menu_item: menu_category1_menu_item34, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0411", menu_item: menu_category1_menu_item34, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0422", menu_item: menu_category1_menu_item34, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0421", menu_item: menu_category1_menu_item34, price:7000.00, is_on_promotion:false}]) # Assorted Ball Platter menu_category1_menu_item35 = SimpleMenuItem.create({item_code:"01036", name: "Assorted Ball Platter", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0421", menu_item: menu_category1_menu_item35, price:7800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0431", menu_item: menu_category1_menu_item35, price:7800.00, is_on_promotion:false}]) # Specialty Homemade Paste menu_category7 = MenuCategory.create({menu: menu, code:"C007", name: "Specialty Homemade Paste", alt_name: "Beef_and_mutton", order_by: 7,created_by: "SYSTEM DEFAULT"}) # Fish Paste menu_category1_menu_item36 = SimpleMenuItem.create({item_code:"01037", name: "Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0431", menu_item: menu_category1_menu_item36, price:4800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item36, price:4800.00, is_on_promotion:false}]) # Century Egg Fish Paste menu_category1_menu_item37 = SimpleMenuItem.create({item_code:"01038", name: "Century Egg Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0441", menu_item: menu_category1_menu_item37, price:5800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item37, price:5800.00, is_on_promotion:false}]) # Pork Paste menu_category1_menu_item38 = SimpleMenuItem.create({item_code:"01039", name: " Pork Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0451", menu_item: menu_category1_menu_item38, price:5800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item38, price:5800.00, is_on_promotion:false}]) # Dried Scallop Fish Paste menu_category1_menu_item39 = SimpleMenuItem.create({item_code:"01040", name: "Dried Scallop Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0461", menu_item: menu_category1_menu_item39, price:8800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", menu_item: menu_category1_menu_item39, price:8800.00, is_on_promotion:false}]) # Ebiko Prawn Paste menu_category1_menu_item40 = SimpleMenuItem.create({item_code:"01041", name: "Ebiko Prawn Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0471", menu_item: menu_category1_menu_item40, price:11800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", menu_item: menu_category1_menu_item40, price:11800.00, is_on_promotion:false}]) # Seafood -menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", alt_name: "Pork", order_by: 8,created_by: "SYSTEM DEFAULT"}) +menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", alt_name: "Seafood", order_by: 8,created_by: "SYSTEM DEFAULT"}) # Promfret menu_category1_menu_item41 = SimpleMenuItem.create({item_code:"01042", name: "Promfret", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0481", menu_item: menu_category1_menu_item41, price:30.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0492", menu_item: menu_category1_menu_item41, price:30.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0491", menu_item: menu_category1_menu_item41, price:30.00, is_on_promotion:false}]) # Garoupa menu_category1_menu_item42 = SimpleMenuItem.create({item_code:"01043", name: "Garoupa", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Small",item_instance_code:"II0491", menu_item: menu_category1_menu_item42, price:13800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Medium",item_instance_code:"II0492", menu_item: menu_category1_menu_item42, price:18800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Large",item_instance_code:"II0493", menu_item: menu_category1_menu_item42, price:23900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Small",item_instance_code:"II0501", menu_item: menu_category1_menu_item42, price:13800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Medium",item_instance_code:"II0502", menu_item: menu_category1_menu_item42, price:18800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Large",item_instance_code:"II0503", menu_item: menu_category1_menu_item42, price:23900.00, is_on_promotion:false}]) # Sliced Fish menu_category1_menu_item43 = SimpleMenuItem.create({item_code:"01044", name: "Sliced Fish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0502", menu_item: menu_category1_menu_item43, price:4800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0501", menu_item: menu_category1_menu_item43, price:9600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0512", menu_item: menu_category1_menu_item43, price:4800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0511", menu_item: menu_category1_menu_item43, price:9600.00, is_on_promotion:false}]) # Fresh Sea Prawns menu_category1_menu_item44 = SimpleMenuItem.create({item_code:"01045", name: "Fresh Sea Prawns", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0512", menu_item: menu_category1_menu_item44, price:9800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0511", menu_item: menu_category1_menu_item44, price:19600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0522", menu_item: menu_category1_menu_item44, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0521", menu_item: menu_category1_menu_item44, price:19600.00, is_on_promotion:false}]) # Drunken Prawns menu_category1_menu_item45 = SimpleMenuItem.create({item_code:"01046", name: "Drunken Prawns", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0522", menu_item: menu_category1_menu_item45, price:11000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0521", menu_item: menu_category1_menu_item45, price:22000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0532", menu_item: menu_category1_menu_item45, price:11000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0531", menu_item: menu_category1_menu_item45, price:22000.00, is_on_promotion:false}]) # Fish Maw menu_category1_menu_item46 = SimpleMenuItem.create({item_code:"01047", name: "Fish Maw", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0532", menu_item: menu_category1_menu_item46, price:11000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0531", menu_item: menu_category1_menu_item46, price:22000.00, is_on_promotion:false}]) - # Fresh Cittlefish - menu_category1_menu_item47 = SimpleMenuItem.create({item_code:"01048", name: "Fresh Cittlefish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0542", menu_item: menu_category1_menu_item47, price:4700.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0541", menu_item: menu_category1_menu_item47, price:9400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0542", menu_item: menu_category1_menu_item46, price:11000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0541", menu_item: menu_category1_menu_item46, price:22000.00, is_on_promotion:false}]) # Sea Cucumber menu_category1_menu_item48 = SimpleMenuItem.create({item_code:"01049", name: "Sea Cucumber", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0552", menu_item: menu_category1_menu_item48, price:28800.00, is_on_promotion:false}]) @@ -232,7 +241,7 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0572", menu_item: menu_category1_menu_item50, price:4400.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0571", menu_item: menu_category1_menu_item50, price:8800.00, is_on_promotion:false}]) # Fish Head - menu_category1_menu_item51 = SimpleMenuItem.create({item_code:"01052", name: "Fish Head", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item51 = SimpleMenuItem.create({item_code:"01052", name: "Fresh Fish Head", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0582", menu_item: menu_category1_menu_item51, price:2800.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0581", menu_item: menu_category1_menu_item51, price:5600.00, is_on_promotion:false}]) # 10-Head Abalone @@ -249,15 +258,15 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0611", menu_item: menu_category1_menu_item54, price:38000.00, is_on_promotion:false}]) # Baby Octopus menu_category1_menu_item55 = SimpleMenuItem.create({item_code:"01056", name: "Baby Octopus", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0622", menu_item: menu_category1_menu_item55, price:2900.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0621", menu_item: menu_category1_menu_item55, price:58000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0622", menu_item: menu_category1_menu_item55, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0621", menu_item: menu_category1_menu_item55, price:6000.00, is_on_promotion:false}]) # Fresh Cuttlefish menu_category1_menu_item56 = SimpleMenuItem.create({item_code:"01057", name: "Fresh Cuttlefish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0632", menu_item: menu_category1_menu_item56, price:10.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0631", menu_item: menu_category1_menu_item56, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0632", menu_item: menu_category1_menu_item56, price:4700.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0631", menu_item: menu_category1_menu_item56, price:9400.00, is_on_promotion:false}]) # Squid Rings menu_category1_menu_item57 = SimpleMenuItem.create({item_code:"01058", name: "Squid Rings", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0042", menu_item: menu_category1_menu_item57, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0642", menu_item: menu_category1_menu_item57, price:3400.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0641", menu_item: menu_category1_menu_item57, price:6800.00, is_on_promotion:false}]) # Green Mussels menu_category1_menu_item58 = SimpleMenuItem.create({item_code:"01059", name: "Green Mussels", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -265,16 +274,16 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0651", menu_item: menu_category1_menu_item58, price:13000.00, is_on_promotion:false}]) # Live Crab menu_category1_menu_item59 = SimpleMenuItem.create({item_code:"01060", name: "Live Crab", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0661", menu_item: menu_category1_menu_item59, price:60.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0661", menu_item: menu_category1_menu_item59, price:10.00, is_on_promotion:false}]) # Fresh Flower Crabs menu_category1_menu_item60 = SimpleMenuItem.create({item_code:"01061", name: "Fresh Flower Crabs", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0671", menu_item: menu_category1_menu_item60, price:60.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0671", menu_item: menu_category1_menu_item60, price:10.00, is_on_promotion:false}]) # Live Lobster menu_category1_menu_item61 = SimpleMenuItem.create({item_code:"01062", name: "Live Lobster", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0681", menu_item: menu_category1_menu_item61, price:150.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0681", menu_item: menu_category1_menu_item61, price:10.00, is_on_promotion:false}]) # Live Mantis menu_category1_menu_item62 = SimpleMenuItem.create({item_code:"01063", name: "Live Mantis", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0691", menu_item: menu_category1_menu_item62, price:150.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:" ",item_instance_code:"II0691", menu_item: menu_category1_menu_item62, price:10.00, is_on_promotion:false}]) # Dumpling menu_category9 = MenuCategory.create({menu: menu, code:"C009", name: "Dumpling", alt_name: "Chicken", order_by: 9, created_by: "SYSTEM DEFAULT"}) # Pork and Chives Dumpling @@ -295,12 +304,12 @@ menu_category9 = MenuCategory.create({menu: menu, code:"C009", name: "Dumpling", menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0731", menu_item: menu_category1_menu_item66, price:5000.00, is_on_promotion:false}]) # Assorted Dumpling Platter menu_category1_menu_item67 = SimpleMenuItem.create({item_code:"01068", name: "Assorted Dumpling Platter", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0741", menu_item: menu_category1_menu_item67, price:7800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0741", menu_item: menu_category1_menu_item67, price:7800.00, is_on_promotion:false}]) # Tofu & Beancurd menu_category10 = MenuCategory.create({menu: menu, code:"C0010", name: "Tofu & Beancurd", alt_name: "Soup_base", order_by: 10,created_by: "SYSTEM DEFAULT"}) # Signature Homemade Fish Tofu menu_category1_menu_item68 = SimpleMenuItem.create({item_code:"01069", name: "Signature Homemade Fish Tofu ", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0751", menu_item: menu_category1_menu_item68, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0751", menu_item: menu_category1_menu_item68, price:1500.00, is_on_promotion:false}]) # SilkenTofu menu_category1_menu_item69 = SimpleMenuItem.create({item_code:"01070", name: "SilkenTofu", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0762", menu_item: menu_category1_menu_item69, price:1000.00, is_on_promotion:false}]) @@ -337,7 +346,7 @@ menu_category12 = MenuCategory.create({menu: menu, code:"C0012", name: "Mushroom menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0831", menu_item: menu_category1_menu_item76, price:4600.00, is_on_promotion:false}]) # Enoki Mushroom menu_category1_menu_item77 = SimpleMenuItem.create({item_code:"01078", name: "Enoki Mushroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0824", menu_item: menu_category1_menu_item77, price:2300.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0842", menu_item: menu_category1_menu_item77, price:2300.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0841", menu_item: menu_category1_menu_item77, price:4600.00, is_on_promotion:false}]) # Fresh Mushroom menu_category1_menu_item78 = SimpleMenuItem.create({item_code:"01079", name: "Fresh Mushroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -353,7 +362,7 @@ menu_category12 = MenuCategory.create({menu: menu, code:"C0012", name: "Mushroom menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0871", menu_item: menu_category1_menu_item80, price:3600.00, is_on_promotion:false}]) # Assorted Mushroom Platter menu_category1_menu_item81 = SimpleMenuItem.create({item_code:"01082", name: "Assorted Mushroom Platter", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0881", menu_item: menu_category1_menu_item81, price:10000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0881", menu_item: menu_category1_menu_item81, price:10000.00, is_on_promotion:false}]) # Vegetables menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetables", alt_name: "Beef_and_mutton", order_by: 12,created_by: "SYSTEM DEFAULT"}) # Baby Chinese Spinach @@ -381,7 +390,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0942", menu_item: menu_category1_menu_item87, price:1800.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0941", menu_item: menu_category1_menu_item87, price:3600.00, is_on_promotion:false}]) # Sliced Potato - menu_category1_menu_item88 = SimpleMenuItem.create({item_code:"01089", name: "Sliced Potato ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item88 = SimpleMenuItem.create({item_code:"01089", name: "Sliced Potato ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0952", menu_item: menu_category1_menu_item88, price:1300.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0951", menu_item: menu_category1_menu_item88, price:2600.00, is_on_promotion:false}]) # Sliced Winter Melon @@ -389,7 +398,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0962", menu_item: menu_category1_menu_item89, price:1200.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0961", menu_item: menu_category1_menu_item89, price:2400.00, is_on_promotion:false}]) # Fried Yam - menu_category1_menu_item90 = SimpleMenuItem.create({item_code:"01091", name: "Fried Yam ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item90 = SimpleMenuItem.create({item_code:"01091", name: "Golden Taro", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0972", menu_item: menu_category1_menu_item90, price:1800.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0971", menu_item: menu_category1_menu_item90, price:3600.00, is_on_promotion:false}]) # Pearl Sweet Corn @@ -452,32 +461,32 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl menu_category1_menu_item105 = SimpleMenuItem.create({item_code:"01106", name: "Kangkung", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1122", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1121", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) +# Bamboo Shoot + menu_category1_menu_item105 = SimpleMenuItem.create({item_code:"01106", name: "Kangkung", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1132", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1131", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) # Others menu_category14 = MenuCategory.create({menu: menu, code:"C0013", name: "Others", alt_name: "Pork", order_by: 13,created_by: "SYSTEM DEFAULT"}) # Quail’s Egg menu_category1_menu_item106 = SimpleMenuItem.create({item_code:"01107", name: "Quail’s Egg", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1132", menu_item: menu_category1_menu_item106, price:1500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1131", menu_item: menu_category1_menu_item106, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1142", menu_item: menu_category1_menu_item106, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1141", menu_item: menu_category1_menu_item106, price:3000.00, is_on_promotion:false}]) # Sliced Kelp menu_category1_menu_item107 = SimpleMenuItem.create({item_code:"01108", name: "Sliced Kelp", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1142", menu_item: menu_category1_menu_item107, price:1800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1141", menu_item: menu_category1_menu_item107, price:3600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1152", menu_item: menu_category1_menu_item107, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1151", menu_item: menu_category1_menu_item107, price:3600.00, is_on_promotion:false}]) # Crystal Vermicelli menu_category1_menu_item108 = SimpleMenuItem.create({item_code:"01109", name: "Crystal Vermicelli", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1152", menu_item: menu_category1_menu_item108, price:1800.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1151", menu_item: menu_category1_menu_item108, price:3600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1162", menu_item: menu_category1_menu_item108, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1161", menu_item: menu_category1_menu_item108, price:3600.00, is_on_promotion:false}]) # Duck Blood menu_category1_menu_item109 = SimpleMenuItem.create({item_code:"01110", name: "Duck Blood", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1162", menu_item: menu_category1_menu_item109, price:1200.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1161", menu_item: menu_category1_menu_item109, price:2400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1172", menu_item: menu_category1_menu_item109, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1171", menu_item: menu_category1_menu_item109, price:2400.00, is_on_promotion:false}]) # HK Fried Fish Skin menu_category1_menu_item110 = SimpleMenuItem.create({item_code:"01111", name: "HK Fried Fish Skin", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1172", menu_item: menu_category1_menu_item110, price:7000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1171", menu_item: menu_category1_menu_item110, price:14000.00, is_on_promotion:false}]) -# Bamboo Shoot - menu_category1_menu_item111 = SimpleMenuItem.create({item_code:"01112", name: "Bamboo Shoot", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1182", menu_item: menu_category1_menu_item111, price:2300.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1181", menu_item: menu_category1_menu_item111, price:4600.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1182", menu_item: menu_category1_menu_item110, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1181", menu_item: menu_category1_menu_item110, price:14000.00, is_on_promotion:false}]) # Fried Dough Sticks menu_category1_menu_item112 = SimpleMenuItem.create({item_code:"01113", name: "Fried Dough Sticks", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1192", menu_item: menu_category1_menu_item112, price:1000.00, is_on_promotion:false}]) @@ -498,59 +507,59 @@ menu_category15 = MenuCategory.create({menu: menu, code:"C0014", name: "Noodles" menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1221", menu_item: menu_category1_menu_item115, price:3800.00, is_on_promotion:false}]) # La Mian menu_category1_menu_item116 = SimpleMenuItem.create({item_code:"01117", name: "La Mian", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1231", menu_item: menu_category1_menu_item116, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1231", menu_item: menu_category1_menu_item116, price:1800.00, is_on_promotion:false}]) # Glass Noodle menu_category1_menu_item117 = SimpleMenuItem.create({item_code:"01118", name: "Glass Noodle ", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1242", menu_item: menu_category1_menu_item117, price:1200.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1241", menu_item: menu_category1_menu_item117, price:2400.00, is_on_promotion:false}]) # Rice menu_category1_menu_item118 = SimpleMenuItem.create({item_code:"01119", name: "Rice", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1251", menu_item: menu_category1_menu_item118, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1251", menu_item: menu_category1_menu_item118, price:1000.00, is_on_promotion:false}]) # Drinks menu_category16 = MenuCategory.create({menu: menu, code:"C0015", name: "Drinks", alt_name: "Soup_base", order_by: 15,created_by: "SYSTEM DEFAULT"}) # Hot Homemade Fruit Tea menu_category1_menu_item119 = SimpleMenuItem.create({item_code:"01120", name: "Hot Homemade Fruit Tea", alt_name: "Twin Pot",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1261", menu_item: menu_category1_menu_item119, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1261", menu_item: menu_category1_menu_item119, price:1500.00, is_on_promotion:false}]) # Chinese Tea menu_category1_menu_item120 = SimpleMenuItem.create({item_code:"01121", name: "Chinese Tea", alt_name: "Twin Pot",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1271", menu_item: menu_category1_menu_item120, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1271", menu_item: menu_category1_menu_item120, price:1500.00, is_on_promotion:false}]) # Juice menu_category17 = MenuCategory.create({menu: menu, code:"C0016", name: "Juice", alt_name: "Beef_and_mutton", order_by: 16,created_by: "SYSTEM DEFAULT"}) # Orange Juice menu_category1_menu_item121 = SimpleMenuItem.create({item_code:"01122", name: "Orange Juice", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1281", menu_item: menu_category1_menu_item121, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1281", menu_item: menu_category1_menu_item121, price:2000.00, is_on_promotion:false}]) # Watermelon Juice menu_category1_menu_item122 = SimpleMenuItem.create({item_code:"01123", name: "Watermelon Juice ", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1291", menu_item: menu_category1_menu_item122, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1291", menu_item: menu_category1_menu_item122, price:2000.00, is_on_promotion:false}]) # Lime Juice menu_category1_menu_item123 = SimpleMenuItem.create({item_code:"01124", name: "Lime Juice", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1301", menu_item: menu_category1_menu_item123, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1301", menu_item: menu_category1_menu_item123, price:2000.00, is_on_promotion:false}]) # Sour Plum Juice - menu_category1_menu_item124 = SimpleMenuItem.create({item_code:"01125", name: "Sour Plum Juice ", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1311", menu_item: menu_category1_menu_item124, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item124 = SimpleMenuItem.create({item_code:"01125", name: "Sour Plum Juice ", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1311", menu_item: menu_category1_menu_item124, price:2000.00, is_on_promotion:false}]) # Canned Drinks menu_category18 = MenuCategory.create({menu: menu, code:"C0017", name: "Canned Drinks", alt_name: "Pork", order_by: 17,created_by: "SYSTEM DEFAULT"}) # Coke menu_category1_menu_item125 = SimpleMenuItem.create({item_code:"01126", name: "Coke ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1321", menu_item: menu_category1_menu_item125, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1321", menu_item: menu_category1_menu_item125, price:1000.00, is_on_promotion:false}]) # Coke Light menu_category1_menu_item126 = SimpleMenuItem.create({item_code:"01127", name: "Coke Light ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1331", menu_item: menu_category1_menu_item126, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1331", menu_item: menu_category1_menu_item126, price:1000.00, is_on_promotion:false}]) # Sprite menu_category1_menu_item127 = SimpleMenuItem.create({item_code:"01128", name: "Sprite ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1341", menu_item: menu_category1_menu_item127, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1341", menu_item: menu_category1_menu_item127, price:1000.00, is_on_promotion:false}]) # Red Bull menu_category1_menu_item128 = SimpleMenuItem.create({item_code:"01129", name: "Red Bull ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1351", menu_item: menu_category1_menu_item128, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1351", menu_item: menu_category1_menu_item128, price:1000.00, is_on_promotion:false}]) # 100 Plus menu_category1_menu_item129 = SimpleMenuItem.create({item_code:"01130", name: "100 Plus ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1361", menu_item: menu_category1_menu_item129, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1361", menu_item: menu_category1_menu_item129, price:1000.00, is_on_promotion:false}]) # POP Soda menu_category1_menu_item130 = SimpleMenuItem.create({item_code:"01131", name: "POP Soda ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1371", menu_item: menu_category1_menu_item130, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1371", menu_item: menu_category1_menu_item130, price:1000.00, is_on_promotion:false}]) # Mineral Water menu_category1_menu_item131 = SimpleMenuItem.create({item_code:"01132", name: "Mineral Water ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1381", menu_item: menu_category1_menu_item131, price:500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1381", menu_item: menu_category1_menu_item131, price:500.00, is_on_promotion:false}]) # Beer menu_category19 = MenuCategory.create({menu: menu, code:"C0018", name: "Beer", alt_name: "Chicken", order_by: 18, created_by: "SYSTEM DEFAULT"}) # Myanmar Beer From 376af85c64b4360f1941981b481a3121bf7e422b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:02:36 +0630 Subject: [PATCH 05/12] update credit --- .../transactions/credit_notes_controller.rb | 18 +++++ app/models/sale.rb | 2 +- app/views/layouts/_header.html.erb | 1 + .../transactions/credit_notes/index.html.erb | 70 +++++++++++++++++++ config/routes.rb | 1 + 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 app/views/transactions/credit_notes/index.html.erb diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb index e69de29b..0f370c96 100644 --- a/app/controllers/transactions/credit_notes_controller.rb +++ b/app/controllers/transactions/credit_notes_controller.rb @@ -0,0 +1,18 @@ +class Transactions::CreditNotesController < ApplicationController + before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy] + + # GET /transactions/sales + # GET /transactions/sales.json + def index + + @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING) + + + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @sales } + end + + end + end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 6b5efbb3..8f7f17d8 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -22,7 +22,7 @@ class Sale < ApplicationRecord "monthly" => 1, "yearly" => 2 } - + SALE_STATUS_OUTSTANDING = "outstanding" SALE_STATUS_COMPLETED = "completed" def generate_invoice_from_booking(booking_id, requested_by) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 5505bad7..05b74b7a 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -33,6 +33,7 @@
  • <%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %>
  • <%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %>
    • +
  • diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb new file mode 100644 index 00000000..fba0b52f --- /dev/null +++ b/app/views/transactions/credit_notes/index.html.erb @@ -0,0 +1,70 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Credit Note +
      3. + +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + <% @sales.each do |sale| %> + + + + + + + + + <% end %> + + +
    Sale Id Receipt no Credit AmountCashierCustomer NameReceipt Date
    <%= link_to sale.sale_id, transactions_sale_path(sale) %><%= sale.receipt_no %><%credit = SalePayment.where('sale_id = ? AND payment_method=?', sale.sale_id,"creditnote").first %> + <%= credit.payment_amount rescue '-' %> + <%= sale.cashier_name rescue '-' %><%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %> <%= sale.receipt_date.strftime("%d-%m-%Y") %>
    +
    + +
    +
    + +
    +
    + + + + + + diff --git a/config/routes.rb b/config/routes.rb index 39b9aca5..1f5ae75a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -225,6 +225,7 @@ Rails.application.routes.draw do namespace :transactions do resources :sales resources :orders + resources :credit_notes get "/sales/:sale_id/manual_complete_sale" =>"manual_sales#manual_complete_sale", :as => "manual_complete_sale" get "/sales/:sale_id/void" =>"manual_sales#void", :as => "void" From 60fe3b9a6744a6f8e27925af18262c06943c394c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:22:16 +0630 Subject: [PATCH 06/12] update crmad ability --- app/models/ability.rb | 23 +++++++++++++++++++--- app/views/crm/customers/index.html.erb | 2 +- app/views/origami/customers/index.html.erb | 2 +- config/application.rb | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index f3e8da5c..5e5fb4f3 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -20,9 +20,9 @@ class Ability can :manage, Zone can :manage, CashierTerminal can :manage, Employee - can :manage, MembershipSetting - can :manage, MembershipAction - can :manage, PaymentMethodSetting + # can :manage, MembershipSetting + # can :manage, MembershipAction + # can :manage, PaymentMethodSetting can :manage, TaxProfile can :manage, PrintSetting can :manage, Account @@ -30,9 +30,26 @@ class Ability can :manage, Order can :manage, Sale + can :manage, Customer + can :index, :dailysale can :index, :saleitem + can :add_customer, Customer + can :update_sale_by_customer, Customer + + can :index, :discount + can :create, :discount + + can :show, :payment + can :create, :payment + can :reprint, :payment + + can :move_dining, :movetable + can :moving, :movetable + + can :move_dining, :moveroom + elsif user.role == "cashier" can :read, Order diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a5ce8550..b3c1fce7 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -47,7 +47,7 @@ <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-00001" && crm_customer.customer_id != "CUS-000000000" %> diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index d1886423..489487ab 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -41,7 +41,7 @@ <% if @crm_customers.count > 0 %> <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-00000" && crm_customer.customer_id != "CUS-00000000" %> diff --git a/config/application.rb b/config/application.rb index 2a47de48..0e323d22 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,6 +13,7 @@ module SXRestaurants # -- all .rb files in that directory are automatically loaded. config.active_record.time_zone_aware_types = [:datetime, :time] config.active_job.queue_adapter = :sidekiq + config.time_zone = 'Asia/Rangoon' end end From 99ac82c888bbfa869b9ae01b8ab80f3096e697fe Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 19:28:02 +0630 Subject: [PATCH 07/12] update seed for shop and oqs --- app/models/order_queue_station.rb | 7 ++++--- db/seeds.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index bac229a9..bd2e85ca 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -46,9 +46,10 @@ class OrderQueueStation < ApplicationRecord # Auto Printing # ToDo per item per printer if oqs.auto_print && is_auto_printed == false - puts oqs_order_items.length - print_slip(oqs, order, oqs_order_items) - is_auto_printed = true + if oqs_order_items.length > 0 + print_slip(oqs, order, oqs_order_items) + is_auto_printed = true + end end end end diff --git a/db/seeds.rb b/db/seeds.rb index a00fd48f..64192b19 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -131,7 +131,7 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) -shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.3, 23 street', township:"Yankin",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"09 99988888, 0912374734",reservation_no:"111",license:"123", +shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 9a5656c5e669867998f65b0e2d2639ce5b430f0e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 20:13:56 +0630 Subject: [PATCH 08/12] update crm customer --- app/views/crm/customers/show.html.erb | 5 ++--- config/application.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 5c4bf7c8..3cf08856 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -55,9 +55,8 @@
    - <% puts "'''''''''''''''''''" - puts @response - if @response["status"] == true %> + <% + if @response["data"].present? %> <% if @response["status"] == true %> diff --git a/config/application.rb b/config/application.rb index 0e323d22..5ce0a92a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,7 +13,7 @@ module SXRestaurants # -- all .rb files in that directory are automatically loaded. config.active_record.time_zone_aware_types = [:datetime, :time] config.active_job.queue_adapter = :sidekiq - config.time_zone = 'Asia/Rangoon' + # config.time_zone = 'Asia/Rangoon' end end From 25967b82d35912cb55d2a3b1a39976cf787a8099 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 20:44:15 +0630 Subject: [PATCH 09/12] update home link --- app/views/reports/daily_sale/index.html.erb | 2 +- app/views/reports/daily_sales/index.html.erb | 2 +- app/views/reports/receipt_no/index.html.erb | 2 +- app/views/reports/sale_item/index.html.erb | 2 +- app/views/reports/sale_items/index.html.erb | 6 +++--- db/seeds.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/daily_sale/index.html.erb index 7c2a8c61..7b790148 100644 --- a/app/views/reports/daily_sale/index.html.erb +++ b/app/views/reports/daily_sale/index.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/reports/daily_sales/index.html.erb b/app/views/reports/daily_sales/index.html.erb index 7c2a8c61..7b790148 100644 --- a/app/views/reports/daily_sales/index.html.erb +++ b/app/views/reports/daily_sales/index.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 86307066..dc7d05ee 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/reports/sale_item/index.html.erb b/app/views/reports/sale_item/index.html.erb index a3b460fc..7b0d6f38 100644 --- a/app/views/reports/sale_item/index.html.erb +++ b/app/views/reports/sale_item/index.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/reports/sale_items/index.html.erb b/app/views/reports/sale_items/index.html.erb index a3b460fc..26ad560e 100644 --- a/app/views/reports/sale_items/index.html.erb +++ b/app/views/reports/sale_items/index.html.erb @@ -1,6 +1,6 @@
    @@ -11,13 +11,13 @@
    -
    +
    diff --git a/db/seeds.rb b/db/seeds.rb index 64192b19..841495d4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -131,7 +131,7 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) -shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", +shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road, Bahan, Yangon', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From a236c94910571843dc33c72477bd6f8e798ca1a6 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 20:58:12 +0630 Subject: [PATCH 10/12] mobile bill updated --- app/controllers/api/bill_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 09d75f70..f7a4070d 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -29,7 +29,12 @@ class Api::BillController < Api::ApiController @sale_items = SaleItem.where("sale_id=?",@sale_id) unique_code = "ReceiptBillPdf" + #shop detail + shop_details = Shop.find(1) + customer= Customer.where('customer_id=' + @sale_data.customer_id) + # get member information + member_info = Customer.get_member_account(customer) # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -38,7 +43,7 @@ class Api::BillController < Api::ApiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) end From b60715403777062679da62dadc1a6a5af3de7f2e Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 26 Jun 2017 21:56:13 +0630 Subject: [PATCH 11/12] New Login form --- Gemfile.lock | 2 - app/assets/images/profile-1.png | Bin 0 -> 23136 bytes app/assets/images/profile-2.png | Bin 0 -> 18806 bytes app/assets/images/profile-3.png | Bin 0 -> 25843 bytes app/controllers/application_controller.rb | 4 +- app/controllers/home_controller.rb | 26 ++++++++- app/helpers/application_helper.rb | 9 +++ app/models/employee.rb | 4 +- app/views/home/index.html.erb | 40 ++++++++++++- app/views/home/show.html.erb | 68 ++++++++++++++++++++++ app/views/layouts/application.html.erb | 11 ++-- config/routes.rb | 9 ++- 12 files changed, 154 insertions(+), 19 deletions(-) create mode 100644 app/assets/images/profile-1.png create mode 100644 app/assets/images/profile-2.png create mode 100644 app/assets/images/profile-3.png create mode 100644 app/views/home/show.html.erb diff --git a/Gemfile.lock b/Gemfile.lock index e4b905ea..5c0f8a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,6 @@ GEM nokogiri (1.8.0) mini_portile2 (~> 2.2.0) pdf-core (0.7.0) - pg (0.21.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -261,7 +260,6 @@ DEPENDENCIES kaminari (~> 1.0.1) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/assets/images/profile-1.png b/app/assets/images/profile-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bc020542f3000959af6ab2dfdafc7a52ef681134 GIT binary patch literal 23136 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/profile-2.png b/app/assets/images/profile-2.png new file mode 100644 index 0000000000000000000000000000000000000000..b56112e225d22ba151beb3b6b9b1d50a9dcb9e9e GIT binary patch literal 18806 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/profile-3.png b/app/assets/images/profile-3.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f65cc6d02337a48a53e92d95485f0550e3d5bb GIT binary patch literal 25843 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 "Invalid PIN for Employee. Please try again!" + end + end + def create @login_form = LoginForm.new() @login_form.emp_id = params[:login_form][:emp_id] @@ -21,9 +41,9 @@ class HomeController < ApplicationController else render :index end - else + else redirect_to origami_root_path, :notice => "Username and Password dosn't match!" - end + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be794..96956958 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,11 @@ module ApplicationHelper + + def flash_class(level) + case level + when :notice then "alert alert-info fade-in" + when :success then "alert alert-success fade-in" + when :error then "alert alert-error fade-in" + when :alert then "alert alert-error fade-in" + end +end end diff --git a/app/models/employee.rb b/app/models/employee.rb index 98b8380b..69eb3fae 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -13,9 +13,9 @@ class Employee < ApplicationRecord def self.login(emp_id, password) user = Employee.find_by_emp_id(emp_id) if (user) - user.authenticate(password) + #user.authenticate(password) - if (user) + if (user.authenticate(password)) user.generate_token user.session_expiry = DateTime.now.utc + 30.minutes user.session_last_login = DateTime.now.utc diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 35eb6481..87bf3f50 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,7 +1,7 @@ - + +
    +
    +
    + + <% @employees.each do |employee| %> + +
    +
    +
    +

    + <%= employee.name %> +

    +
    + (<%= employee.emp_id%>) +
    +
    + <%= employee.role %> +
    +
    +
    + <% end %> +
    +
    + + diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb new file mode 100644 index 00000000..84b6f199 --- /dev/null +++ b/app/views/home/show.html.erb @@ -0,0 +1,68 @@ + + +
    +
    + <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %> +
    +
    +
    + <%= f.input :emp_id,as: :hidden, label: "Access PIN", required: false, class: "form-control" %> + + <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> +
    +
    +
    + + + + + + + + + + + + + +
    +
    + +
    + +
    + + <% end %> +
    +
    + + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1d4991e6..a4c62ce3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,12 +17,11 @@ <%= render 'layouts/header' %>
    - <% flash.each do |type, message| %> -
    - - <%= message %> -
    - <% end %> + <% flash.each do |key, value| %> +
    + <%= value %> +
    + <% end %> <%= yield %>
    diff --git a/config/routes.rb b/config/routes.rb index c93beb92..efb9ca5d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :membership_actions - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -16,6 +13,9 @@ Rails.application.routes.draw do post 'install' => 'install#create' #--------- Login/Authentication ------------# + get 'emp_login/:emp_id' => 'home#show' , as: :emp_login + patch "emp_login/:emp_id" => 'home#update', as: :emp_login_update + post 'login' => 'home#create' delete 'logout' => 'home#destroy' get 'dashboard' => 'home#dashboard' @@ -196,6 +196,8 @@ Rails.application.routes.draw do resources :payment_method_settings #membership_settings resources :membership_settings + resources :membership_actions + #zones resources :zones do #tables @@ -205,6 +207,7 @@ Rails.application.routes.draw do end end + #--------- Transactions Sections ------------# namespace :transactions do resources :sales From c1646b812e199a7967207ae93b38ec53dc10f073 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Tue, 27 Jun 2017 01:15:40 +0630 Subject: [PATCH 12/12] route update --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index d009de8f..b6535034 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,8 +13,8 @@ Rails.application.routes.draw do post 'install' => 'install#create' #--------- Login/Authentication ------------# - get 'emp_login/:emp_id' => 'home#show' , as: :emp_login - patch "emp_login/:emp_id" => 'home#update', as: :emp_login_update + get 'auth/:emp_id' => 'home#show' , as: :emp_login + patch "auth/:emp_id" => 'home#update', as: :emp_login_update post 'login' => 'home#create' delete 'logout' => 'home#destroy'
    Membership Transactions