From 1b0bcbffeaa3e33a20a02f2da19d740300628225 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 14:56:05 +0630 Subject: [PATCH 01/76] update for shift and deving member dis --- app/controllers/origami/void_controller.rb | 5 ++ app/models/sale_payment.rb | 1 + app/models/shift_sale.rb | 3 +- app/views/origami/discounts/index.html.erb | 29 ++++++++ app/views/origami/home/index.html.erb | 3 +- config/routes.rb | 3 + .../20170626191519_create_shift_sales.rb | 2 + db/migrate/20170701101420_create_sales.rb | 1 + lib/tasks/menu_import.rake | 68 +++++++++---------- 9 files changed, 78 insertions(+), 37 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 687d9fa5..0c41115f 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -9,6 +9,11 @@ class Origami::VoidController < BaseOrigamiController sale.sale_status = 'void' sale.save + # update count for shift sale + shift = ShiftSale.current_open_shift(sale.cashier_id) + shift.total_void = shift.total_void + 1 + shift.save + bookings = sale.bookings bookings.each do |booking| orders = booking.orders diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b3455e27..300935d9 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -288,6 +288,7 @@ class SalePayment < ApplicationRecord end + # update for cashier shift def update_shift shift = ShiftSale.current_open_shift(self.sale.cashier_id) if !shift.nil? diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index b9c5aa28..5716ed7d 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -52,8 +52,9 @@ class ShiftSale < ApplicationRecord self.cash_sales = self.cash_sales.to_f + cash.to_f self.credit_sales = self.credit_sales.to_i + credit.to_f self.other_sales = self.other_sales.to_i + other_sales.to_f - self.nett_sales = self.grand_total.to_i - self.commercial_taxes + self.nett_sales = saleobj.total_amount.to_f #self.grand_total.to_i - self.commercial_taxes self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f + self.total_receipt = self.total_receipt + 1 self.save end diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 5eb4afe6..879dd7ae 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -190,6 +190,8 @@ +
+ @@ -418,6 +420,33 @@ $(document).ready(function(){ } }); }); + + // Pay Discount for membership + $("#member-discount").on('click', function(e){ + e.preventDefault(); + var sale_id = $('#sale-id').text(); + var sub_total = $('#order-sub-total').text(); + var ajax_url = "/origami/" + sale_id + "/member_discount"; + + // Selected Account + var account_types = JSON.stringify(get_selected_account_types()); + var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + success:function(result){ + alert("Successfully Discount!"); + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + }); + }); }); /* Remove Selection */ diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 68fb80e4..6bdadd85 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -105,8 +105,7 @@
- - +
diff --git a/config/routes.rb b/config/routes.rb index 2b7db5eb..f4dd5b13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,6 +104,9 @@ Rails.application.routes.draw do get "/:id/remove_all_discount" => "discounts#remove_all_discount" post "/:id/remove_discount_items" => "discounts#remove_discount_items" + # Discount for Member + post "/:id/member_discount" => "discounts#member_discount" + get "/:id/request_bills" => "request_bills#print",:as => "request_bill" get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb index 18323c9d..405e497b 100644 --- a/db/migrate/20170626191519_create_shift_sales.rb +++ b/db/migrate/20170626191519_create_shift_sales.rb @@ -21,6 +21,8 @@ class CreateShiftSales < ActiveRecord::Migration[5.1] t.integer :dining_count, :default => 0 t.integer :takeaway_count, :default => 0 t.integer :member_count, :default => 0 + t.integer :total_receipt, :default => 0 + t.integer :total_void, :default => 0 t.timestamps end end diff --git a/db/migrate/20170701101420_create_sales.rb b/db/migrate/20170701101420_create_sales.rb index 6d3f33f9..d0e70287 100644 --- a/db/migrate/20170701101420_create_sales.rb +++ b/db/migrate/20170701101420_create_sales.rb @@ -13,6 +13,7 @@ class CreateSales < ActiveRecord::Migration[5.1] t.string :payment_status, :null => false, :default => "outstanding" t.string :sale_status, :null => false, :default => "new" t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.string :discount_type, :default => "overall" t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.string :tax_type, :null => false , :dfault => "exclusive_tax" diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index 2ff305fd..50ffe256 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -8,47 +8,47 @@ beverage = Account.create({title: "Beverage", account_type: "1"}) # soup base menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1,created_by: "SYSTEM DEFAULT"}) # single pot - menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "小辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item01 = SimpleMenuItem.create({item_code:"010010", name: "Beauty Collagen Broth", alt_name: "胶原蛋白养颜美容锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item02 = SimpleMenuItem.create({item_code:"010011", name: "Spicy Nourishing Broth", alt_name: "滋补养生香辣锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item03 = SimpleMenuItem.create({item_code:"010012", name: "Herbal Drunken Chicken Broth", alt_name: "养生药膳醉鸡锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item04 = SimpleMenuItem.create({item_code:"010013", name: "Cooling Coconut Broth", alt_name: "清凉解热雪耳椰子锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item05 = SimpleMenuItem.create({item_code:"010014", name: "Lonevity Wild Pine Mushroom Broth", alt_name: "长生抗癌松茸菌锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_category1_menu_item06 = SimpleMenuItem.create({item_code:"010015", name: "Vitamin C Tomato Sweet Corn Broth", alt_name: "维他命C番茄玉米锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + 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_category1_menu_item01 = SimpleMenuItem.create({item_code:"010010", name: "Beauty Collagen Broth", alt_name: "胶原蛋白养颜美容锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_category1_menu_item02 = SimpleMenuItem.create({item_code:"010011", name: "Spicy Nourishing Broth", alt_name: "滋补养生香辣锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_category1_menu_item03 = SimpleMenuItem.create({item_code:"010012", name: "Herbal Drunken Chicken Broth", alt_name: "养生药膳醉鸡锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_category1_menu_item04 = SimpleMenuItem.create({item_code:"010013", name: "Cooling Coconut Broth", alt_name: "清凉解热雪耳椰子锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_category1_menu_item05 = SimpleMenuItem.create({item_code:"010014", name: "Lonevity Wild Pine Mushroom Broth", alt_name: "长生抗癌松茸菌锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_category1_menu_item06 = SimpleMenuItem.create({item_code:"010015", name: "Vitamin C Tomato Sweet Corn Broth", alt_name: "维他命C番茄玉米锅",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:0.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_item01, 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_item02, 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_item03, 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_item04, 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_item05, 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_item06, 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: "中辣",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + 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:0.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_item01, 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_item02, 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_item03, 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_item04, 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_item05, 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_item06, 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: "VIP 小辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "VIP",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:0.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_item01, 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_item02, 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_item03, price:8000.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_item04, 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_item05, 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_item06, 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:8000.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: "大辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + 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:0.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_item01, 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_item02, 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_item03, price:8000.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_item04, price:6000.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_item05, 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_item06, price:6000.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:8000.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:6000.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 From 3fe0f708bd2e8a158390ee682926d2c69534ec67 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 17:19:14 +0630 Subject: [PATCH 02/76] add req and fix for shift --- app/controllers/origami/void_controller.rb | 7 ++-- app/models/sale.rb | 2 +- app/models/shift_sale.rb | 25 +++++++++++- app/pdf/close_cashier_pdf.rb | 38 +++++++++++++++++++ app/views/origami/discounts/index.html.erb | 2 +- app/views/origami/sales/show.html.erb | 16 ++++++++ .../20170626191519_create_shift_sales.rb | 3 +- db/seeds.rb | 2 +- lib/tasks/clear_data.rake | 34 ++++++++--------- 9 files changed, 104 insertions(+), 25 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 0c41115f..c0245dc3 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -10,9 +10,10 @@ class Origami::VoidController < BaseOrigamiController sale.save # update count for shift sale - shift = ShiftSale.current_open_shift(sale.cashier_id) - shift.total_void = shift.total_void + 1 - shift.save + if(sale.sale_status == "completed") + shift = ShiftSale.current_open_shift(sale.cashier_id) + shift.calculate(sale, "void") + end bookings = sale.bookings bookings.each do |booking| diff --git a/app/models/sale.rb b/app/models/sale.rb index 0e767ea0..c1c81685 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -604,7 +604,7 @@ end def get_commerical_tax tax = 0.0 self.sale_taxes.each do |taxobj| - if taxobj.tax_name == "Commerical Tax" + if taxobj.tax_name == "Commercial Tax" tax += taxobj.tax_payable_amount end end diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 5716ed7d..c9a05561 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -52,11 +52,34 @@ class ShiftSale < ApplicationRecord self.cash_sales = self.cash_sales.to_f + cash.to_f self.credit_sales = self.credit_sales.to_i + credit.to_f self.other_sales = self.other_sales.to_i + other_sales.to_f - self.nett_sales = saleobj.total_amount.to_f #self.grand_total.to_i - self.commercial_taxes + self.nett_sales = self.nett_sales + saleobj.total_amount.to_f #self.grand_total.to_i - self.commercial_taxes self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f + self.total_rounding = self.total_rounding + saleobj.rounding_adjustment self.total_receipt = self.total_receipt + 1 self.save + end + # Calculate by type and update + def calculate(sale, type) + saleobj = Sale.find_by_sale_id(sale) + cash = saleobj.get_cash_amount + credit = saleobj.get_credit_amount + other_sales = saleobj.get_other_amount + tax = saleobj.get_commerical_tax + if type == "void" + self.total_revenue = self.total_revenue.to_f - saleobj.total_amount.to_f + self.total_discounts = self.total_discounts - saleobj.total_discount + self.total_taxes = self.total_taxes - saleobj.total_tax + self.grand_total = self.grand_total - saleobj.grand_total + self.cash_sales = self.cash_sales.to_f - cash.to_f + self.credit_sales = self.credit_sales.to_i - credit.to_f + self.other_sales = self.other_sales.to_i - other_sales.to_f + self.nett_sales = self.nett_sales - saleobj.total_amount.to_f #self.grand_total.to_i - self.commercial_taxes + self.commercial_taxes = self.commercial_taxes.to_i - tax.to_f + self.total_rounding = self.total_rounding - saleobj.rounding_adjustment + self.total_void = self.total_void + saleobj.grand_total + self.save + end end def get_closing_balance(shift) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index fc04b6cc..2a4b365a 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -68,6 +68,22 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do text "#{ shift_sale.cashier_terminal.name}" , :size => self.item_font_size,:align => :left end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Opening Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Closing Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left + end y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do @@ -88,6 +104,12 @@ class CloseCashierPdf < Prawn::Document move_down 10 + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Shift Sale Summary", :size => self.header_font_size, :align => :center + end + move_down 10 + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do text "Received Amount :", :size => self.item_font_size, :align => :right @@ -168,6 +190,22 @@ class CloseCashierPdf < Prawn::Document text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Receipts :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.total_receipt}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Void:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right + end + move_down 5 stroke_horizontal_rule move_down 5 diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 879dd7ae..6e8b26a8 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -191,7 +191,7 @@
- + diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index ad8a73aa..9a8dc95d 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -222,6 +222,22 @@ $('#pay').on('click',function() { $('#back').on('click',function(){ window.location.href = '/origami/'; }) + +$('#void').on('click',function () { + var sure = confirm("Are you sure want to Void"); + if (sure == true) { + var sale_id = $('#sale_id').val(); + var ajax_url = "/origami/sale/" + sale_id + '/void'; + $.ajax({ + type: 'POST', + url: ajax_url, + success: function () { + window.location.href = '/origami/'; + } + }); + } + }); + $('#re-print').click(function() { var sale_id = $('#sale_id').val(); window.location.href = '/origami/'+ sale_id + "/reprint" diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb index 405e497b..d16449d7 100644 --- a/db/migrate/20170626191519_create_shift_sales.rb +++ b/db/migrate/20170626191519_create_shift_sales.rb @@ -21,8 +21,9 @@ class CreateShiftSales < ActiveRecord::Migration[5.1] t.integer :dining_count, :default => 0 t.integer :takeaway_count, :default => 0 t.integer :member_count, :default => 0 + t.integer :total_rounding, :default => 0 t.integer :total_receipt, :default => 0 - t.integer :total_void, :default => 0 + t.decimal :total_void, :default => 0 t.timestamps end end diff --git a/db/seeds.rb b/db/seeds.rb index 3bff75a0..8fe62bde 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -103,7 +103,7 @@ customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contac # room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Tax Profile -tax_profiles = TaxProfile.create({id:1, name: "Commerical Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"}) +tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"}) #Account for Menu Item Type (eg: Food, Beverage) # food = Account.create({title: "Food", account_type: "0"}) diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index d0bf6ceb..affe76ff 100644 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -1,19 +1,19 @@ namespace :clear do - # desc "Clear Data" - # task :data => :environment do - # BookingOrder.delete_all - # Booking.delete_all - # OrderItem.delete_all - # AssignedOrderItem.delete_all - # Order.delete_all - # SaleOrder.delete_all - # SaleItem.delete_all - # Sale.delete_all - # SaleAudit.delete_all - # SalePayment.delete_all - # ShiftSale.delete_all - # PaymentJournal.delete_all - # DiningFacility.update_all(status:'available') - # puts "Clear Data Done." - # end + desc "Clear Data" + task :data => :environment do + BookingOrder.delete_all + Booking.delete_all + OrderItem.delete_all + AssignedOrderItem.delete_all + Order.delete_all + SaleOrder.delete_all + SaleItem.delete_all + Sale.delete_all + SaleAudit.delete_all + SalePayment.delete_all + ShiftSale.delete_all + PaymentJournal.delete_all + DiningFacility.update_all(status:'available') + puts "Clear Data Done." + end end From 09e202bb7095bd5b1750770f6801ec4c67b7f762 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 17:33:14 +0630 Subject: [PATCH 03/76] remove deving member dis --- app/views/origami/discounts/index.html.erb | 50 +++++++++++----------- config/routes.rb | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 6e8b26a8..d2fd5db8 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -190,8 +190,8 @@ -
- + @@ -422,31 +422,31 @@ $(document).ready(function(){ }); // Pay Discount for membership - $("#member-discount").on('click', function(e){ - e.preventDefault(); - var sale_id = $('#sale-id').text(); - var sub_total = $('#order-sub-total').text(); - var ajax_url = "/origami/" + sale_id + "/member_discount"; + // $("#member-discount").on('click', function(e){ + // e.preventDefault(); + // var sale_id = $('#sale-id').text(); + // var sub_total = $('#order-sub-total').text(); + // var ajax_url = "/origami/" + sale_id + "/member_discount"; - // Selected Account - var account_types = JSON.stringify(get_selected_account_types()); - var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + // // Selected Account + // var account_types = JSON.stringify(get_selected_account_types()); + // var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; - $.ajax({ - type: "POST", - url: ajax_url, - data: params, - success:function(result){ - alert("Successfully Discount!"); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - }); - }); + // $.ajax({ + // type: "POST", + // url: ajax_url, + // data: params, + // success:function(result){ + // alert("Successfully Discount!"); + // if(result.table_type == "Table"){ + // window.location.href = "/origami/table/" + result.table_id + // } + // else { + // window.location.href = "/origami/room/" + result.table_id + // } + // } + // }); + // }); }); /* Remove Selection */ diff --git a/config/routes.rb b/config/routes.rb index f4dd5b13..eb07de30 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,7 +105,7 @@ Rails.application.routes.draw do post "/:id/remove_discount_items" => "discounts#remove_discount_items" # Discount for Member - post "/:id/member_discount" => "discounts#member_discount" + # post "/:id/member_discount" => "discounts#member_discount" get "/:id/request_bills" => "request_bills#print",:as => "request_bill" get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } From b8b3a7e0a703307ae5aef568f076f95e9e1ecfea Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 20:47:45 +0630 Subject: [PATCH 04/76] deving dis --- app/controllers/origami/discounts_controller.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 16590320..cf66d0e9 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -115,6 +115,13 @@ class Origami::DiscountsController < BaseOrigamiController render :json => dining.to_json end + # Member Discount + def member_discount + sale_id = params[:sale_id] + account_types = JSON.parse(params[:account_types]) + sub_total = params[:sub_total] + end + #discount for selected order # def create # sale_id = params[:sale_id] From 2226d59140327d8aec5bbce95f7d749c6c659311 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 20:51:24 +0630 Subject: [PATCH 05/76] re-fixed in production --- app/models/sale.rb | 2 +- app/pdf/receipt_bill_pdf.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index c1c81685..037dc8bb 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -493,7 +493,7 @@ def self.get_by_range_by_saleitems(from,to,status,report_type) JOIN employees ea ON ea.id = sales.cashier_id") - query = query.where("receipt_date between ? and ? and sale_status=?",from,to,status) + query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index bd65ed20..c17fe605 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -386,10 +386,10 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor item_price_by_accounts.each do |ipa| y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.label_width) do text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left end - bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end end From 89853935355d1a35d7e40df3a403842c8861b60f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sat, 8 Jul 2017 10:25:22 +0630 Subject: [PATCH 06/76] update receipt repoert --- .../reports/dailysale_controller.rb | 3 + .../reports/receipt_no_controller.rb | 262 ++++++++++++++++- app/models/sale.rb | 42 ++- app/pdf/receipt_bill_pdf.rb | 18 +- app/views/origami/payments/show.html.erb | 2 +- .../_shift_sale_report_filter.html.erb | 12 +- app/views/reports/dailysale/index.html.erb | 4 +- .../_shift_sale_report_filter.html.erb | 57 ++-- app/views/reports/receipt_no/index.html.erb | 269 ++++++++++++------ app/views/reports/receipt_no/index.xls.erb | 128 ++++++--- .../reports/receipt_no/indexback.html.erb | 115 ++++++++ .../reports/receipt_no/indexback.xls.erb | 43 +++ config/routes.rb | 4 +- 13 files changed, 751 insertions(+), 208 deletions(-) create mode 100644 app/views/reports/receipt_no/indexback.html.erb create mode 100644 app/views/reports/receipt_no/indexback.xls.erb diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index 27e812ab..14013a1b 100644 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -5,6 +5,9 @@ class Reports::DailysaleController < BaseReportController from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @tax = SaleTax.get_tax(from,to) + puts from + puts to + puts "sssssssss" respond_to do |format| format.html format.xls diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index e4157c4e..8e92ebb6 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -1,13 +1,34 @@ class Reports::ReceiptNoController < BaseReportController authorize_resource :class => false def index - from, to = get_date_range_from_params - puts "from..." - puts from - puts "to..." - puts to - @sale_data = Sale.get_receipt_no_list(from,to) - @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) + from, to, report_type = get_date_range_from_params + # if to.blank? + # @shift = ShiftSale.where('shift_started_at <= ? and shift_closed_at is NULL',from).take + # else + # @shift = ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to).take + # end + puts "2017-07-07T10:46:09.000Z - 2017-07-07T11:12:51.000Z" + puts "2017-06-25 17:30:00 UTC 2017-07-02 17:29:59 UTC" +puts params[:shift_name] +puts from.utc +puts to.utc + + if params[:shift_name].to_i != 0 + @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at =?',from,to).take + puts @shift.to_json + @sale_data = Sale.where('shift_sale_id = ? ',@shift.id) + @sale_taxes = Sale.get_separate_tax(from,to) + else + @sale_data = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from.utc,to.utc) + @sale_taxes = Sale.get_separate_tax(from.utc,to.utc) + end + + + if @shift.present? + @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + end + respond_to do |format| format.html format.xls @@ -15,6 +36,231 @@ authorize_resource :class => false end def show - + from, to, report_type = get_date_range_from_params + + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) +puts "hhhhhhhhhhhhhhhhhhhhh" +puts @sale_data.to_json +puts from +puts to +puts report_type +puts params[:shift_name] + + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end end + + + def get_date_range_from_params + + period_type = params[:period_type] + period = params[:period] + + branch = params[:branch] + report_type = params[:report_type] + + shift_name = params[:shift_name] + unless shift_name.nil? + shift_arr = shift_name.split(' - ') + shift_from = shift_arr[0] + shift_to = shift_arr[1] + end + + day_ref = day_ref = Time.now.utc.getlocal + + if period_type.to_i == 1 + + ### =>search by from and to + unless shift_name.nil? + if shift_name.to_s == '0' + ### => all shift + f_date = DateTime.parse(params[:from]) + t_date = DateTime.parse(params[:to]) + f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + from = f_time.beginning_of_day.utc.getlocal + to = t_time.end_of_day.utc.getlocal + + else + unless shift_from == '-' + f_date = DateTime.parse(shift_from) + from = f_date + else + from = '' + end + + unless shift_to == '-' + t_date = DateTime.parse(shift_to) + to = t_date + else + to = '' + end + end + else + f_date = DateTime.parse(params[:from]) + t_date = DateTime.parse(params[:to]) + f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + from = f_time.beginning_of_day.utc.getlocal + to = t_time.end_of_day.utc.getlocal + end + else + ### => search by Today or yesterday + + unless shift_name.nil? + if shift_name.to_s == '0' + ### => all shift + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + + else + unless shift_from == '-' + f_date = DateTime.parse(shift_from) + #f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + from = f_date.utc + else + from = '' + end + + unless shift_to == '-' + t_date = DateTime.parse(shift_to) + #t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + to = t_date.utc + else + to = '' + end + end + else + if params[:report_type].to_i != 0 + r_type = params[:report_type].to_s + + if r_type == 'shift_item' + + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + else + ### => report not shift + case period.to_i + when PERIOD["today"] + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + end + + end + + return from, to,report_type + end + + end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 0e767ea0..266644be 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -445,6 +445,7 @@ class Sale < ApplicationRecord total_sale = Sale.select("IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0) as grand_total, IFNULL(SUM(case when (sale_status='completed') then old_grand_total else 0 end),0) as old_grand_total, IFNULL(SUM(case when (sale_status='completed') then total_discount else 0 end),0) as total_discount, + IFNULL(SUM(case when (sale_status='completed') then amount_changed else 0 end),0) as total_change_amount, IFNULL(SUM(case when (sale_status='void') then grand_total else 0 end),0) as void_amount, IFNULL(SUM(case when (sale_status='completed') then rounding_adjustment else 0 end),0) as rounding_adj") .where("(sale_status = ? OR sale_status = ?) AND receipt_date between ? and ? AND total_amount != 0", 'completed', 'void', from_date, to_date) @@ -454,6 +455,7 @@ class Sale < ApplicationRecord old_grand_total = sale.old_grand_total total_discount = sale.total_discount void_amount = sale.void_amount + total_change_amount = sale.total_change_amount total = {:sale_date => pay.sale_date, :mpu_amount => pay.mpu_amount, :master_amount => pay.master_amount, @@ -464,6 +466,7 @@ class Sale < ApplicationRecord :credit_amount => pay.credit_amount, :foc_amount => pay.foc_amount, :total_discount => total_discount, + :total_change_amount => total_change_amount, :grand_total => grand_total, :old_grand_total => old_grand_total, :void_amount => void_amount, @@ -514,7 +517,7 @@ def self.get_by_shiftsales(from,to) return ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to) end -# def self.get_by_shiftsales(employee,from,to) +# def self.get_by_shiftsales(from,to) # shift_sales = ShiftSale.select('shift_sales.id, cs.name as cashier_station_name, shift_sales.shift_started_at as opening_date, shift_sales.shift_closeed_at as closing_date') # .joins(" INNER JOIN cashier_terminals cs ON cs.id = shift_sales.cashier_terminal_id") # .where("shift_sales.employee_id = ? and (shift_sales.shift_started_at between ? and ? OR shift_sales.shift_closeed_at between ? and ? )", employee, from, to, from, to) @@ -529,23 +532,23 @@ end # void = Sale.select("SUM(sales.grand_total) AS grand_total") # .joins("join shift_sales sh on sh.id = sales.shift_sale_id") -# .where('sales.sales_status = "void" and sales.total_amount != 0 and sales.shift_sale_id = ?', shift.id) +# .where('sales.sale_status = "void" and sales.total_amount != 0 and sales.shift_sale_id = ?', shift.id) # .sum(:grand_total) # cash = all_total.select('sr.payment_type') # .where('sr.payment_type = "cash"') # .sum(:amount) -# credit = all_total.where('sr.payment_type = "credit"') +# credit = all_total.where('sr.payment_type = "creditnote"') # .sum(:amount) # accept_credit = all_total.select('ci.amout') # .joins("INNER JOIN credit_items ci ON ci.sale_id = sales.id") -# .where('sr.payment_type = "credit"') +# .where('sr.payment_type = "creditnote"') # .sum(:amout) -# foc = all_total.where('sales.payment_type = "foc" and sales.sales_status = "completed"') +# foc = all_total.where('sales.payment_type = "foc" and sales.sale_status = "completed"') # .sum(:grand_total) # card = all_total.select('payment_type') @@ -571,6 +574,31 @@ end # return sale_arr # end +# def self.get_receipt_no_list(from,to) +# sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + +def self.get_by_shift_sale(from,to,status) + query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,shift_closed_at As closing_date," + + " grand_total AS grand_total, cash_sales AS cash," + + "total_taxes AS total_tax,total_discounts As total_discount") + .order("shift_sales.id DESC") + return query = query.where("shift_sales.shift_started_at between ? and ?" + " or shift_sales.shift_closed_at between ? and ?",from,to ,from,to ) +end + +def self.get_separate_tax(from,to,payment_type=nil) + + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("INNER JOIN sales ON sales.id = sale_taxes.sale_id") + .group("sale_taxes.tax_name") + + return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +end + +def grand_total_after_rounding + return self.grand_total.to_f + self.rounding_adjustment.to_f +end + def get_cash_amount cash = 0.0 self.sale_payments.each do |pay| @@ -616,8 +644,4 @@ end def generate_custom_id self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") end - - def self.get_receipt_no_list(from,to) - sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to) - end end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index bd65ed20..b6c5416b 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -317,16 +317,16 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right end - # old = balance + redeem + old = balance + redeem - # move_down 5 - # y_position = cursor - # bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - # text "Old Balance", :size => self.item_font_size,:align => :left - # end - # bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - # text "#{number_with_precision(old, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right - # end + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Old Balance", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(old, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right + end end end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 9b04e38e..505050eb 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -119,7 +119,7 @@
<%= @other %>
<% else %> -
+
Other Payments
<% end %> diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index 9b89858a..28706731 100644 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -19,17 +19,7 @@
- +
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 64565fb5..d01463b7 100644 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -70,7 +70,7 @@ <% visa += sale[:visa_amount] %> <% jcb += sale[:jcb_amount] %> <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount] %> + <% cash += sale[:cash_amount]-sale[:total_change_amount] %> <% credit += sale[:credit_amount] %> <% foc += sale[:foc_amount] %> <% discount += sale[:total_discount] %> @@ -86,7 +86,7 @@ <%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%> (<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>) diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb index 1b4082f5..d8e91393 100644 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -18,6 +18,7 @@
+
-
+
-
+
-
+
+ + +
+
@@ -70,11 +75,7 @@ <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> <% end %> - <% if defined? shift_name %> - - <% end %> + <% if defined? cashiers %> <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> @@ -116,22 +117,6 @@
- \ No newline at end of file + diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index dc7d05ee..d87fcccf 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,13 +1,13 @@
-
    -
  • Home
    • -
  • Receipt List Report
    • -
+
    +
  • Home
    • +
  • Receipt List Report
    • +
- <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %> + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_receipt_no_index_path} %>
@@ -21,95 +21,182 @@
- - - - - - - - - - <% TaxProfile.all.each do |r|%> - - <% end %> - - - +
DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
+ + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift.employee %> + <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> + <% end %> + + + <% end %> - - <% total_sales = 0 %> - <% net_sales = 0 %> - <% @sale_data.each do |sale| %> - <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> - <% net_sales = total_sales.to_f + sale.total_tax.to_f%> - - - - - - - - <% sale.sale_taxes.each do |sale|%> - - <% end %> - - - - <% end %> - -
From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
<%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
-
+ + Recipt No + Cashier Name + Total Amount + Discount Amount + Tax Amount + + Grand Total + Rounding Adj. + Grand Total +
+ Rounding Adj. + + + + + <% grand_total = 0 %> + <% total_tax = 0 %> + <% guest_count = 0 %> + <% total_sum = 0 %> + <% discount_amt = 0 %> + <% other_amt = 0 %> + <% total_nett = 0 %> + <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> + + <% @sale_data.each do |result| %> + + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + <%= result.receipt_no rescue '-' %> + <%= result.cashier_name rescue '-' %> + <%= result.total_amount rescue '-' %> + <%= result.total_discount rescue '-' %> + <%= sprintf "%.2f",result.total_tax rescue '-' %> + + + <%= result.grand_total %> + <%= result.rounding_adjustment.to_f rescue '-' %> + <%= result.grand_total_after_rounding() rescue '-'%> + + + <% end %> + +   + <%= total_sum rescue '-'%> + <%= discount_amt rescue '-'%> + <%= sprintf "%.2f",total_tax rescue '-'%> + + <%= grand_total.to_f.round(2) rescue '-'%> + <%= rounding_adj rescue '-'%> + <%= grand_total.to_f.round + rounding_adj %> + + +   + Total Amount + Discount Amount + Tax Amount + Grand Total + Rounding Adj. + Grand Total +
+ Rounding Adj. + + + + +
-<%= paginate @sale_data %> - \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index 5befb18a..b55a40c4 100644 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -1,43 +1,91 @@ -
-
+
+
+ + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift.employee %> + <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> + <% end %> + + + <% end %> -
From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
- - - - - - - - - <% TaxProfile.all.each do |r|%> - - <% end %> - - - + + + + + + + + + + + + + + <% grand_total = 0 %> + <% total_tax = 0 %> + <% guest_count = 0 %> + <% total_sum = 0 %> + <% discount_amt = 0 %> + <% other_amt = 0 %> + <% total_nett = 0 %> + <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - - <% total_sales = 0 %> - <% net_sales = 0 %> - <% @sale_data.each do |sale| %> - <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> - <% net_sales = total_sales.to_f + sale.total_tax.to_f%> - - - - - - - - <% sale.sale_taxes.each do |sale|%> - - <% end %> - - - - <% end %> - -
DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
Recipt NoCashier NameTotal AmountDiscount Amount Tax AmountGrand TotalRounding Adj.Grand Total +
+ Rounding Adj. +
<%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
-
+ <% @sale_data.each do |result| %> + + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + <%= result.receipt_no rescue '-' %> + <%= result.cashier_name rescue '-' %> + <%= result.total_amount rescue '-' %> + <%= result.total_discount rescue '-' %> + <%= sprintf "%.2f",result.total_tax rescue '-' %> + + + <%= result.grand_total %> + <%= result.rounding_adjustment.to_f rescue '-' %> + <%= result.grand_total_after_rounding() rescue '-'%> + + + <% end %> + +   + <%= total_sum rescue '-'%> + <%= discount_amt rescue '-'%> + <%= sprintf "%.2f",total_tax rescue '-'%> + + <%= grand_total.to_f.round(2) rescue '-'%> + <%= rounding_adj rescue '-'%> + <%= grand_total.to_f.round + rounding_adj %> + + +   + Total Amount + Discount Amount + Tax Amount + Grand Total + Rounding Adj. + Grand Total +
+ Rounding Adj. + + + +
+
\ No newline at end of file diff --git a/app/views/reports/receipt_no/indexback.html.erb b/app/views/reports/receipt_no/indexback.html.erb new file mode 100644 index 00000000..dc7d05ee --- /dev/null +++ b/app/views/reports/receipt_no/indexback.html.erb @@ -0,0 +1,115 @@ +
+
    +
  • Home
    • +
  • Receipt List Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+ + + + + + + + + + <% TaxProfile.all.each do |r|%> + + <% end %> + + + + + + <% total_sales = 0 %> + <% net_sales = 0 %> + <% @sale_data.each do |sale| %> + <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> + <% net_sales = total_sales.to_f + sale.total_tax.to_f%> + + + + + + + + <% sale.sale_taxes.each do |sale|%> + + <% end %> + + + + <% end %> + +
DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
<%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
+
+
+ +<%= paginate @sale_data %> + + \ No newline at end of file diff --git a/app/views/reports/receipt_no/indexback.xls.erb b/app/views/reports/receipt_no/indexback.xls.erb new file mode 100644 index 00000000..5befb18a --- /dev/null +++ b/app/views/reports/receipt_no/indexback.xls.erb @@ -0,0 +1,43 @@ +
+
+ + + + + + + + + + + <% TaxProfile.all.each do |r|%> + + <% end %> + + + + + + <% total_sales = 0 %> + <% net_sales = 0 %> + <% @sale_data.each do |sale| %> + <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> + <% net_sales = total_sales.to_f + sale.total_tax.to_f%> + + + + + + + + <% sale.sale_taxes.each do |sale|%> + + <% end %> + + + + <% end %> + +
DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
<%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
+
+
diff --git a/config/routes.rb b/config/routes.rb index 2b7db5eb..98943507 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -268,10 +268,12 @@ Rails.application.routes.draw do #--------- Reports Controller Sections ------------# namespace :reports do - resources :receipt_no, :only => [:index, :show] + resources :receipt_no resources :dailysale, :only => [:index, :show] resources :saleitem, :only => [:index, :show] resources :shiftsale, :only => [:index, :show] + + get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date" # resources :sales, :only => [:index, :show] # resources :orders, :only => [:index, :show] # resources :customers, :only => [:index, :show] From 9608dc96a0515a9debf1d9a2f3451e35c372f450 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sat, 8 Jul 2017 10:39:14 +0630 Subject: [PATCH 07/76] update receipt repoert --- .../_shift_sale_report_filter.html.erb | 16 ++++------------ app/views/reports/receipt_no/index.html.erb | 4 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb index d8e91393..8e1de8e2 100644 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -150,20 +150,12 @@ $(function(){ } }); -//Reset the form to pervious values -$("#branch").val(<%=params[:branch] rescue '-'%>); -$("#waiter").val("<%=params[:waiter] rescue '-'%>"); -$("#cashier").val(<%=params[:cashier] rescue '-'%>); -$("#product").val(<%=params[:product] rescue '-'%>); -$("#singer").val(<%=params[:singer] rescue '-'%>); -$("#item").val('<%=params[:item] rescue '-'%>'); -$("#guest_role").val('<%=params[:guest_role] rescue '-'%>'); -$("#from").val("<%=params[:from] rescue '-'%>"); -$("#to").val("<%=params[:to] rescue '-'%>"); -$("#sel_period").val(<%=params[:period] rescue '-'%>); -$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); +// $("#from").val("<%=params[:from] rescue '-'%>"); +// $("#to").val("<%=params[:to] rescue '-'%>"); +// $("#sel_period").val(<%=params[:period] rescue '-'%>); +// $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); <% if params[:period_type] == 1 || params[:period_type] == "1" %> $("#rd_period_type_1").attr("checked","checked"); diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index d87fcccf..cf04c5aa 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -11,13 +11,13 @@
-
+
From 94555bc325006f176f5839ff7d867d56367d56c9 Mon Sep 17 00:00:00 2001 From: Yan Date: Sat, 8 Jul 2017 18:20:42 +0630 Subject: [PATCH 08/76] updated for receipt rpt for shift --- .../reports/receipt_no_controller.rb | 20 ++++++++++--------- app/models/sale.rb | 2 +- app/views/reports/receipt_no/index.html.erb | 9 +++++++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 8e92ebb6..fd203791 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -7,17 +7,19 @@ authorize_resource :class => false # else # @shift = ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to).take # end - puts "2017-07-07T10:46:09.000Z - 2017-07-07T11:12:51.000Z" - puts "2017-06-25 17:30:00 UTC 2017-07-02 17:29:59 UTC" -puts params[:shift_name] -puts from.utc -puts to.utc + # puts "2017-07-07T10:46:09.000Z - 2017-07-07T11:12:51.000Z" + # puts "2017-06-25 17:30:00 UTC 2017-07-02 17:29:59 UTC" +# puts params[:shift_name] +# puts from.utc +# puts to.utc if params[:shift_name].to_i != 0 - @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at =?',from,to).take - puts @shift.to_json - @sale_data = Sale.where('shift_sale_id = ? ',@shift.id) - @sale_taxes = Sale.get_separate_tax(from,to) + @shift = ShiftSale.where('shift_started_at >= ? and shift_closed_at <= ?',from,to).take + # puts @shift.to_json + if @shift.present? + @sale_data = Sale.where('shift_sale_id = ? ',@shift.id) + @sale_taxes = Sale.get_separate_tax(from,to) + end else @sale_data = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from.utc,to.utc) @sale_taxes = Sale.get_separate_tax(from.utc,to.utc) diff --git a/app/models/sale.rb b/app/models/sale.rb index 36ca6f31..2ffa5afd 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -583,7 +583,7 @@ def self.get_by_shift_sale(from,to,status) " grand_total AS grand_total, cash_sales AS cash," + "total_taxes AS total_tax,total_discounts As total_discount") .order("shift_sales.id DESC") - return query = query.where("shift_sales.shift_started_at between ? and ?" + " or shift_sales.shift_closed_at between ? and ?",from,to ,from,to ) + return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to) end def self.get_separate_tax(from,to,payment_type=nil) diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index cf04c5aa..aa117624 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -61,7 +61,9 @@ <% total_nett = 0 %> <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <% @sale_data.each do |result| %> + <% + if @sale_data!=nil + @sale_data.each do |result| %> <% grand_total = grand_total.to_f + result.grand_total.to_f %> <% total_tax += result.total_tax.to_f %> @@ -83,7 +85,10 @@ <%= result.grand_total_after_rounding() rescue '-'%> - <% end %> + <% + end + end + %>   <%= total_sum rescue '-'%> From 1666cb3d0c6ed1dac5c544055b1c81bd386eef42 Mon Sep 17 00:00:00 2001 From: Yan Date: Sat, 8 Jul 2017 21:46:13 +0630 Subject: [PATCH 09/76] fix discount and edit title confirm borx --- app/views/origami/discounts/index.html.erb | 78 +++++++++++----------- app/views/origami/payments/show.html.erb | 4 +- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index d2fd5db8..07d67b84 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -578,24 +578,25 @@ function calculate_item_discount(type, amount, sale_items, account_types){ } } - if(account_types.length > 0){ - var item_rows=get_item_rows(); - if(item_rows.length > 0){ - for(var k=0; k < item_rows.length; k++){ - for(var j=0; j < account_types.length; j++){ - if(item_rows[k].account_id == account_types[j].id){ - // Discount Items - var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + amount; - } - } - } - } - else { - alert("No Items!"); - } - } + // No Needs For Auto Selected + // if(account_types.length > 0){ + // var item_rows=get_item_rows(); + // if(item_rows.length > 0){ + // for(var k=0; k < item_rows.length; k++){ + // for(var j=0; j < account_types.length; j++){ + // if(item_rows[k].account_id == account_types[j].id){ + // // Discount Items + // var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount); + // $("#order-items-table tbody").append(discount_item_row); + // total_discount = total_discount + amount; + // } + // } + // } + // } + // else { + // alert("No Items!"); + // } + // } sub_total = origin_sub_total - total_discount; } @@ -631,27 +632,28 @@ function calculate_item_discount(type, amount, sale_items, account_types){ } } + // No Needs For Auto Selected // Check account types exists - if(account_types.length > 0){ - var item_rows=get_item_rows(); - console.log(account_types); - if(item_rows.length > 0){ - for(var k=0; k < item_rows.length; k++){ - for(var j=0; j < account_types.length; j++){ - if(item_rows[k].account_id == account_types[j].id){ - // Discount Items - dis_amount = 0 - ((item_rows[k].price * amount)/100); - var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + dis_amount; - } - } - } - } - else { - alert("No Items!"); - } - } + // if(account_types.length > 0){ + // var item_rows=get_item_rows(); + // console.log(account_types); + // if(item_rows.length > 0){ + // for(var k=0; k < item_rows.length; k++){ + // for(var j=0; j < account_types.length; j++){ + // if(item_rows[k].account_id == account_types[j].id){ + // // Discount Items + // dis_amount = 0 - ((item_rows[k].price * amount)/100); + // var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount); + // $("#order-items-table tbody").append(discount_item_row); + // total_discount = total_discount + dis_amount; + // } + // } + // } + // } + // else { + // alert("No Items!"); + // } + // } sub_total = origin_sub_total + total_discount; } diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 505050eb..120f0203 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -360,7 +360,7 @@ $( document ).ready(function() { if($('#balance').text() < 0){ $.confirm({ - title: 'Hi!', + title: 'Infomation!', content: 'Changed amount ' + $('#balance').text() * (-1), buttons: { confirm: { @@ -377,7 +377,7 @@ $( document ).ready(function() { $('#pay').text("Pay") $.confirm({ - title: 'Hi!', + title: 'Infomation!', content: 'Thank you !', buttons: { confirm: { From c73cfa4c2da9f35ae698930595cfd4a7b3f9f78e Mon Sep 17 00:00:00 2001 From: Yan Date: Sat, 8 Jul 2017 23:29:31 +0630 Subject: [PATCH 10/76] control to req bill and discount ui update --- .../origami/discounts_controller.rb | 27 +-- .../origami/request_bills_controller.rb | 29 +-- app/views/origami/discounts/index.html.erb | 185 +++++++++++++----- app/views/origami/home/show.html.erb | 20 +- .../origami/request_bills/print.json.jbuilder | 8 +- app/views/origami/rooms/show.html.erb | 20 +- 6 files changed, 207 insertions(+), 82 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 16590320..ae53c5b3 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -49,11 +49,14 @@ class Origami::DiscountsController < BaseOrigamiController end # Re-calc All Amount in Sale - sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f) + sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f) + result = {:status=> "Success", :table_id => table_id, :table_type => table_type } + else + result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type } end - dining = {:table_id => table_id, :table_type => table_type } - render :json => dining.to_json + + render :json => result.to_json end # Remove selected discount Items @@ -78,11 +81,12 @@ class Origami::DiscountsController < BaseOrigamiController # sale.save # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) - end + result = {:status=> "Success", :table_id => table_id, :table_type => table_type } + else + result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type } + end - dining = {:table_id => table_id, :table_type => table_type } - - render :json => dining.to_json + render :json => result.to_json end # Remove all discount Items @@ -108,11 +112,12 @@ class Origami::DiscountsController < BaseOrigamiController # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, 0) - end + result = {:status=> "Success", :table_id => table_id, :table_type => table_type } + else + result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type } + end - dining = {:table_id => table_id, :table_type => table_type } - - render :json => dining.to_json + render :json => result.to_json end #discount for selected order diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index cfea9d37..687c872f 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,19 +5,24 @@ class Origami::RequestBillsController < BaseOrigamiController @sale = Sale.new sale_order=SaleOrder.new - order_id = params[:id] # order_id - bk_order = BookingOrder.find_by_order_id(order_id) - check_booking = Booking.find_by_booking_id(bk_order.booking_id) - if check_booking.sale_id.nil? - # Create Sale if it doesn't exist - # puts "current_login_employee" - # puts current_login_employee.name - @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) - @sale_data = Sale.find_by_sale_id(@sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_id) + if ShiftSale.current_open_shift(current_user.id) + order_id = params[:id] # order_id + bk_order = BookingOrder.find_by_order_id(order_id) + check_booking = Booking.find_by_booking_id(bk_order.booking_id) + if check_booking.sale_id.nil? + # Create Sale if it doesn't exist + # puts "current_login_employee" + # puts current_login_employee.name + @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) + @sale_data = Sale.find_by_sale_id(@sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_id) + else + @sale_data = Sale.find_by_sale_id(check_booking.sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) + end else - @sale_data = Sale.find_by_sale_id(check_booking.sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) + @status = false + @error_message = "No Current Open Shift for This Employee" end # Not Use for these printed bill cannot give customer diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 07d67b84..a75a6dad 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -352,13 +352,24 @@ $(document).ready(function(){ url: ajax_url, data: params, success:function(result){ - alert("Successfully Discount!"); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } + $.confirm({ + title: 'Infomation!', + content: result.status, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); } }); }); @@ -372,8 +383,19 @@ $(document).ready(function(){ // Selected Items var sale_items = get_selected_sale_items(); if(sale_items.length == 0){ - alert("You have no selected item!"); - return; + $.confirm({ + title: 'Infomation!', + content: "You have no selected item!", + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + return; + } + } + } + }); } for(var i=0;i < sale_items.length;i++){ @@ -381,8 +403,19 @@ $(document).ready(function(){ discount_items.push(sale_items[i]); } else { - alert("You have selected no discount item!"); - return; + $.confirm({ + title: 'Infomation!', + content: "You have selected no discount item!!", + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + return; + } + } + } + }); } } @@ -392,13 +425,24 @@ $(document).ready(function(){ url: "/origami/" + sale_id + "/remove_discount_items", data: params, success: function(result){ - alert('Removed Discount'); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } + $.confirm({ + title: 'Infomation!', + content: result.status, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); } }); }); @@ -410,13 +454,24 @@ $(document).ready(function(){ type: "GET", url: "/origami/" + sale_id + "/remove_all_discount", success: function(result){ - alert('Removed All Discount'); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } + $.confirm({ + title: 'Infomation!', + content: result.status, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); } }); }); @@ -540,10 +595,23 @@ function calculate_overall_discount(type, amount){ // For Percentage Pay if(type == 1){ if(amount > 100 ){ - aler("Percentage Value over 100!"); - return; + $.confirm({ + title: 'Infomation!', + content: "Percentage Value over 100!", + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + return; + } + } + } + }); + } + else{ + total_discount = (origin_sub_total * amount)/100; } - total_discount = (origin_sub_total * amount)/100; } $("#order-discount").text(total_discount); @@ -562,7 +630,7 @@ function calculate_item_discount(type, amount, sale_items, account_types){ for(var i=0;i < sale_items.length;i++){ if(account_types.length > 0){ for(var j=0; j < account_types.length; j++){ - if(sale_items[i].account_id != account_types[j].id){ + if(sale_items[i].account_id == account_types[j].id){ // Discount Items var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount); $("#order-items-table tbody").append(discount_item_row); @@ -604,34 +672,45 @@ function calculate_item_discount(type, amount, sale_items, account_types){ // For Percentage Pay if(type == 1){ if(amount > 100 ){ - aler("Percentage Value over 100!"); - return; + $.confirm({ + title: 'Infomation!', + content: "Percentage Value over 100!", + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + return; + } + } + } + }); } - - // Check sale items exists - if(sale_items.length > 0){ - for(var i=0;i < sale_items.length;i++){ - if(account_types.length > 0){ - for(var j=0; j < account_types.length; j++){ - if(sale_items[i].account_id != account_types[j].id){ - // Discount Items - dis_amount = 0 - ((sale_items[i].price * amount)/100); - var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + dis_amount; + else{ + // Check sale items exists + if(sale_items.length > 0){ + for(var i=0;i < sale_items.length;i++){ + if(account_types.length > 0){ + for(var j=0; j < account_types.length; j++){ + if(sale_items[i].account_id == account_types[j].id){ + // Discount Items + dis_amount = 0 - ((sale_items[i].price * amount)/100); + var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); + $("#order-items-table tbody").append(discount_item_row); + total_discount = total_discount + dis_amount; + } } } + else { + dis_amount = 0 - ((sale_items[i].price * amount)/100); + var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); + $("#order-items-table tbody").append(discount_item_row); + total_discount = total_discount + dis_amount; + } } - else { - dis_amount = 0 - ((sale_items[i].price * amount)/100); - var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + dis_amount; - - } + sub_total = origin_sub_total + total_discount; } } - // No Needs For Auto Selected // Check account types exists // if(account_types.length > 0){ @@ -653,9 +732,7 @@ function calculate_item_discount(type, amount, sale_items, account_types){ // else { // alert("No Items!"); // } - // } - - sub_total = origin_sub_total + total_discount; + // } } $("#order-sub-total").text(sub_total); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8b613409..73959b5b 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -469,8 +469,24 @@ $('#request_bills').click(function() { url: ajax_url, // data: 'order_id='+ order_id, success:function(result){ - - location.reload(); + if(!result.status){ + $.confirm({ + title: 'Infomation!', + content: result.error_message, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami'; + } + } + } + }); + } + else { + location.reload(); + } } }); }); diff --git a/app/views/origami/request_bills/print.json.jbuilder b/app/views/origami/request_bills/print.json.jbuilder index 08bf292c..332a9cec 100644 --- a/app/views/origami/request_bills/print.json.jbuilder +++ b/app/views/origami/request_bills/print.json.jbuilder @@ -1 +1,7 @@ -json.status true +if @status == true + #show invoice number and stuff + json.status @status +else + json.status @status + json.error_message @error_message +end diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 9b681fe1..66a48522 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -457,8 +457,24 @@ $('#request_bills').click(function() { url: ajax_url, // data: 'order_id='+ order_id, success:function(result){ - - location.reload(); + if(!result.status){ + $.confirm({ + title: 'Infomation!', + content: result.error_message, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami'; + } + } + } + }); + } + else { + location.reload(); + } } }); }); From 292c8ff5638d017912cad3e5921b4300e2dd0384 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 9 Jul 2017 11:02:32 +0630 Subject: [PATCH 11/76] update view --- app/views/reports/dailysale/index.html.erb | 4 +--- app/views/reports/receipt_no/index.html.erb | 9 ++------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index d01463b7..996393ac 100644 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -24,11 +24,9 @@
- <% if params[:from]%> - + - <% end %> diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index aa117624..cf04c5aa 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -61,9 +61,7 @@ <% total_nett = 0 %> <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <% - if @sale_data!=nil - @sale_data.each do |result| %> + <% @sale_data.each do |result| %> <% grand_total = grand_total.to_f + result.grand_total.to_f %> <% total_tax += result.total_tax.to_f %> @@ -85,10 +83,7 @@ - <% - end - end - %> + <% end %> From 003130094704d624c9e20e58790e420306f08ad2 Mon Sep 17 00:00:00 2001 From: Yan Date: Sun, 9 Jul 2017 11:04:43 +0630 Subject: [PATCH 12/76] dis ui calc fix and update for shift --- .../origami/payments_controller.rb | 6 +- app/pdf/close_cashier_pdf.rb | 17 +++++ app/views/origami/discounts/index.html.erb | 63 ++++++++++-------- .../origami/payments/create.json.jbuilder | 1 + app/views/origami/payments/show.html.erb | 10 +-- dump.rdb | Bin 785 -> 873 bytes 6 files changed, 59 insertions(+), 38 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index c956f7f9..9918266a 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -67,10 +67,8 @@ class Origami::PaymentsController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_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, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid") - - - end + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid") + end end def show diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 2a4b365a..82507e67 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -118,6 +118,23 @@ class CloseCashierPdf < Prawn::Document text "#{shift_sale.closing_balance}", :size => self.item_font_size, :align => :right end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Cash In:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.cash_in}", :size => self.item_font_size, :align => :right + end + + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Cash Out:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.cash_out}", :size => self.item_font_size, :align => :right + end + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do text "Net Sales:", :size => self.item_font_size, :align => :right diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index a75a6dad..ee63f2d3 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -283,7 +283,7 @@ $(document).ready(function(){ $("#net").on('click', function(e){ e.preventDefault(); var sale_id = $('#sale-id').text(); - var discount_value = $('#discount-amount').val(); + var discount_value = parseFloat($('#discount-amount').val()); var ajax_url = "/origami/" + sale_id + "/discount"; // Selected Items @@ -330,10 +330,15 @@ $(document).ready(function(){ // Remove selected discount items $("#remove-item").on('click', function(e){ e.preventDefault(); + var origin_sub_total = parseFloat($("#order-sub-total").text()); + var total = 0; $('.discount-item-row.selected-item').each(function(i){ + var amount = parseFloat($(this).find('#item-total-price').text()); + total = total + Math.abs(amount); $(this).remove(); }); + $("#order-sub-total").text(origin_sub_total + total); }); // Pay Discount for Payment @@ -628,21 +633,21 @@ function calculate_item_discount(type, amount, sale_items, account_types){ dis_amount = (0 - amount); if(sale_items.length > 0){ for(var i=0;i < sale_items.length;i++){ - if(account_types.length > 0){ - for(var j=0; j < account_types.length; j++){ - if(sale_items[i].account_id == account_types[j].id){ - // Discount Items - var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + amount; - } - } - } - else { - var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + amount; - } + // if(account_types.length > 0){ + // for(var j=0; j < account_types.length; j++){ + // if(sale_items[i].account_id == account_types[j].id){ + // // Discount Items + // var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount); + // $("#order-items-table tbody").append(discount_item_row); + // total_discount = total_discount + amount; + // } + // } + // } + // else { + var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); + $("#order-items-table tbody").append(discount_item_row); + total_discount = total_discount + amount; + // } } } @@ -690,23 +695,23 @@ function calculate_item_discount(type, amount, sale_items, account_types){ // Check sale items exists if(sale_items.length > 0){ for(var i=0;i < sale_items.length;i++){ - if(account_types.length > 0){ - for(var j=0; j < account_types.length; j++){ - if(sale_items[i].account_id == account_types[j].id){ - // Discount Items - dis_amount = 0 - ((sale_items[i].price * amount)/100); - var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); - $("#order-items-table tbody").append(discount_item_row); - total_discount = total_discount + dis_amount; - } - } - } - else { + // if(account_types.length > 0){ + // for(var j=0; j < account_types.length; j++){ + // if(sale_items[i].account_id == account_types[j].id){ + // // Discount Items + // dis_amount = 0 - ((sale_items[i].price * amount)/100); + // var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); + // $("#order-items-table tbody").append(discount_item_row); + // total_discount = total_discount + dis_amount; + // } + // } + // } + // else { dis_amount = 0 - ((sale_items[i].price * amount)/100); var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); $("#order-items-table tbody").append(discount_item_row); total_discount = total_discount + dis_amount; - } + // } } sub_total = origin_sub_total + total_discount; } diff --git a/app/views/origami/payments/create.json.jbuilder b/app/views/origami/payments/create.json.jbuilder index 08bf292c..f1dd8cad 100644 --- a/app/views/origami/payments/create.json.jbuilder +++ b/app/views/origami/payments/create.json.jbuilder @@ -1 +1,2 @@ json.status true + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 120f0203..7c608fcb 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -351,10 +351,11 @@ $( document ).ready(function() { url: "<%= origami_payment_cash_path %>", data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ - localStorage.removeItem("cash"); + localStorage.removeItem("cash"); if (result.status) { var msg = result.message; - }else{ + } + else{ var msg = ''; } @@ -372,10 +373,9 @@ $( document ).ready(function() { } } }); - }else{ - + } + else{ $('#pay').text("Pay") - $.confirm({ title: 'Infomation!', content: 'Thank you !', diff --git a/dump.rdb b/dump.rdb index 3ac76616489702d977f385c88e55f5c87c543053..8ad94b1504af633cf43a4c93df8a551a46c2bfcd 100644 GIT binary patch delta 436 zcmbQp_L6Oafua4T#K>P9rNyZ!y1A*jhc?KHF#KcqEy~CsR$P);VwIMdnUk7gWn^Gz zu4`bTYh-X>@Q?d!BD0@GI|SDV;LD3SVSum^Q??5EG?}p%nehLjFQbv(+tg7Sdvl` zON0zfEG@m#?0@ zkx^OF)ZD<##6-``#MA<)OGl|7Gerq(#pJh);)=Y<`FY8uMMbH3$(2f0MhXV}5VtB> zMJs__J6VlM#{k(eO0`U!1x5MEsl~-WFJX7^@r7zH1L+BQ_A;o_KC`Ir#xzR$K)+84!D&pcOhO7=c z=qkFnCU$mkb#rtPbW~A8T-^Qx=R4p3!iMar$UU7j*FVOHkL^kqckh>)qu?8SPE*kZ zU5FlOj@2uo5|`6h%<1uR_*RS-a`Q8y5o0j!2PiNd)b3zAS&h!=A|t8Eb%^G|*AlB# zWHIJbaP}}e0hr4AeXnO>KNThk{WW~Pn%tlOVDbaxnucCC%o?^F)N*VI$qvJ`Fbbw6 zrCyhGS=F?vVaU2-C?h+hje`*fb$raUU8gr}+%)dWdvLqw2QKPjXu@<63NUp>XVlb+ zq{>oVtkxt=)>TP>{k9D=p#TE}wsVb>Z!Q&t7ILomTU zG@H=I4k94>q=cFO-@*f?Mf^dy$%pTS@PUu|G{ Date: Mon, 10 Jul 2017 09:59:26 +0630 Subject: [PATCH 13/76] fix grand total in receipt no --- app/models/sale.rb | 2 +- app/views/reports/receipt_no/index.html.erb | 4 +++- dump.rdb | Bin 873 -> 838 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 2ffa5afd..661222bc 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -596,7 +596,7 @@ def self.get_separate_tax(from,to,payment_type=nil) end def grand_total_after_rounding - return self.grand_total.to_f + self.rounding_adjustment.to_f + return self.old_grand_total.to_f + self.rounding_adjustment.to_f end def get_cash_amount diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index aa117624..d30d6154 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -53,6 +53,7 @@ <% grand_total = 0 %> + <% old_grand_total = 0 %> <% total_tax = 0 %> <% guest_count = 0 %> <% total_sum = 0 %> @@ -66,6 +67,7 @@ @sale_data.each do |result| %> <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> <% total_tax += result.total_tax.to_f %> <% total_sum += result.total_amount.to_f %> <% discount_amt += result.total_discount.to_f %> @@ -98,7 +100,7 @@ - + diff --git a/dump.rdb b/dump.rdb index 8ad94b1504af633cf43a4c93df8a551a46c2bfcd..abdaadff833a9b4eeb9249b09d54c42a8aae4722 100644 GIT binary patch delta 107 zcmV-x0F?jf2F3=EFc^aSVOjbJb#rB8Ep26O!mwKh0R8~`6akZ=0u+&4u>k^;4gn$w zhDyICT>$_91d~Am7L!i_1`-i5G&wmnIWsjmHZD0fH8?mqlV}0Wk?|LkZUQj@!;_!_ N!3dqaLVU4u`OBrIB!B<_ delta 139 zcmX@c_L6OafrS00#K>P9rNyZ!y1A*jhc?KHF#KcqEy_4KkV#}>%tl6r$$X4TEHZiv zRVSM;Dhdl3npj$znwwadnCTe<8HVO2lhYZ`Dlu^u6y+zU78j=$Gm2Iw=2;nASXx?H qm>Z@f86}&UrWu+~{3t%zo5_&rAQQ;w$&;AYa0oMSWc;sEzXJfuvMM|P From f1f1253bde0d034656511b18f93b353d8a0a76dd Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 10 Jul 2017 13:57:18 +0630 Subject: [PATCH 14/76] member dis pending --- app/views/origami/discounts/index.html.erb | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index ee63f2d3..d643b2e7 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -190,8 +190,8 @@ - +
+ @@ -482,31 +482,31 @@ $(document).ready(function(){ }); // Pay Discount for membership - // $("#member-discount").on('click', function(e){ - // e.preventDefault(); - // var sale_id = $('#sale-id').text(); - // var sub_total = $('#order-sub-total').text(); - // var ajax_url = "/origami/" + sale_id + "/member_discount"; + $("#member-discount").on('click', function(e){ + e.preventDefault(); + var sale_id = $('#sale-id').text(); + var sub_total = $('#order-sub-total').text(); + var ajax_url = "/origami/" + sale_id + "/member_discount"; - // // Selected Account - // var account_types = JSON.stringify(get_selected_account_types()); - // var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + // Selected Account + var account_types = JSON.stringify(get_selected_account_types()); + var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; - // $.ajax({ - // type: "POST", - // url: ajax_url, - // data: params, - // success:function(result){ - // alert("Successfully Discount!"); - // if(result.table_type == "Table"){ - // window.location.href = "/origami/table/" + result.table_id - // } - // else { - // window.location.href = "/origami/room/" + result.table_id - // } - // } - // }); - // }); + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + success:function(result){ + alert("Successfully Discount!"); + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + }); + }); }); /* Remove Selection */ From b1b9b5a93f025f0efef1e7937e9be2455de32fe4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 10 Jul 2017 14:32:57 +0630 Subject: [PATCH 15/76] update report --- .../reports/bksaleitem_controller.rb | 19 + .../reports/dailysale_controller.rb | 4 +- .../reports/receipt_no_controller.rb | 46 +-- .../reports/saleitem_controller.rb | 274 ++++++++++++- app/models/sale.rb | 104 ++++- .../_shift_sale_report_filter.html.erb | 194 ++++++++++ .../reports/saleitem (copy)/index.html.erb | 141 +++++++ .../reports/saleitem (copy)/index.xls.erb | 104 +++++ .../_shift_sale_report_filter.html.erb | 6 +- app/views/reports/saleitem/index.html.erb | 359 ++++++++++++------ 10 files changed, 1097 insertions(+), 154 deletions(-) create mode 100644 app/controllers/reports/bksaleitem_controller.rb create mode 100644 app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/saleitem (copy)/index.html.erb create mode 100644 app/views/reports/saleitem (copy)/index.xls.erb diff --git a/app/controllers/reports/bksaleitem_controller.rb b/app/controllers/reports/bksaleitem_controller.rb new file mode 100644 index 00000000..0f91681d --- /dev/null +++ b/app/controllers/reports/bksaleitem_controller.rb @@ -0,0 +1,19 @@ +class Reports::SaleitemController < BaseReportController + authorize_resource :class => false + def index + + from, to, report_type = get_date_range_from_params + + @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) + + respond_to do |format| + format.html + format.xls + end + end + + def show + + end + +end diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index 14013a1b..280f497c 100644 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -5,9 +5,7 @@ class Reports::DailysaleController < BaseReportController from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @tax = SaleTax.get_tax(from,to) - puts from - puts to - puts "sssssssss" + respond_to do |format| format.html format.xls diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index fd203791..e71df43e 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -2,16 +2,6 @@ class Reports::ReceiptNoController < BaseReportController authorize_resource :class => false def index from, to, report_type = get_date_range_from_params - # if to.blank? - # @shift = ShiftSale.where('shift_started_at <= ? and shift_closed_at is NULL',from).take - # else - # @shift = ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to).take - # end - # puts "2017-07-07T10:46:09.000Z - 2017-07-07T11:12:51.000Z" - # puts "2017-06-25 17:30:00 UTC 2017-07-02 17:29:59 UTC" -# puts params[:shift_name] -# puts from.utc -# puts to.utc if params[:shift_name].to_i != 0 @shift = ShiftSale.where('shift_started_at >= ? and shift_closed_at <= ?',from,to).take @@ -40,29 +30,23 @@ authorize_resource :class => false def show from, to, report_type = get_date_range_from_params - @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) -puts "hhhhhhhhhhhhhhhhhhhhh" -puts @sale_data.to_json -puts from -puts to -puts report_type -puts params[:shift_name] + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) - date_arr = Array.new - @sale_data.each do |sale| - local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") - local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") - opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc - closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc - str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} - date_arr.push(str) - end + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end - out = {:status => 'ok', :message => date_arr} - - respond_to do |format| - format.json { render json: out } - end + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end end diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index 0f91681d..80bd8b93 100644 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -2,9 +2,38 @@ class Reports::SaleitemController < BaseReportController authorize_resource :class => false def index - from, to, report_type = get_date_range_from_params + from, to, report_type = get_date_range_from_params + shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) - @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) + shift = '' + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',from) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',from, to) + end + + @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED, report_type) + + @account_cate_count = Hash.new {|hash, key| hash[key] = 0} + + + @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} + + @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|cate| @menu_cate_count[cate.menu_category_id] += 1} + + + @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + + + if !shift.nil? + shift.each do |sh| + @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = sh + end + end respond_to do |format| format.html @@ -13,7 +42,246 @@ class Reports::SaleitemController < BaseReportController end def show - + from, to, report_type = get_date_range_from_params + + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end + + def get_date_range_from_params + period_type = params[:period_type] + period = params[:period] + from = params[:from] + to = params[:to] + branch = params[:branch] + report_type = params[:report_type] + + shift_name = params[:shift_name] + unless shift_name.nil? + shift_arr = shift_name.split(' - ') + shift_from = shift_arr[0] + shift_to = shift_arr[1] + end + + day_ref = Time.now + + if period_type.to_i == 1 + ### =>search by from and to + unless shift_name.nil? + if shift_name.to_s == '0' + ### => all shift + #f_date = DateTime.parse(from) + #t_date = DateTime.parse(to) + if params[:from] && params[:to] + if params[:from] != "" && params[:to] !="" + f_date = DateTime.strptime(from, "%m/%d/%Y") + t_date = DateTime.strptime(to, "%m/%d/%Y") + + f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + from = f_time.beginning_of_day.utc + to = t_time.end_of_day.utc + end + else + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + end + else + unless shift_from == '-' + f_date = DateTime.parse(shift_from) + from = f_date + else + from = '' + end + + unless shift_to == '-' + t_date = DateTime.parse(shift_to) + to = t_date + else + to = '' + end + end + else + # f_date = DateTime.parse(from) + # t_date = DateTime.parse(to) + if params[:from] && params[:to] + if params[:from] != "" && params[:to] !="" + f_date = DateTime.strptime(from, "%m/%d/%Y") + t_date = DateTime.strptime(to, "%m/%d/%Y") + f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + from = f_time.beginning_of_day.utc + to = t_time.end_of_day.utc + end + else + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + end + end + else + ### => search by Today or yesterday + unless shift_name.nil? + if shift_name.to_s == '0' + ### => all shift + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + + end + + else + unless shift_from == '-' + f_date = DateTime.parse(shift_from) + # f_date = DateTime.strptime(shift_from, "%m/%d/%Y") + #f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) + from = f_date + else + from = '' + end + + unless shift_to == '-' + t_date = DateTime.parse(shift_to) + # t_date = DateTime.strptime(shift_to, "%m/%d/%Y") + + #t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) + to = t_date + else + to = '' + end + end + else + if params[:report_type].to_i != 0 + r_type = params[:report_type].to_s + + if r_type == 'shift_item' + + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + + end + end + else + ### => report not shift + case period.to_i + when PERIOD["today"] + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + end + + + + end + + return from, to,report_type end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 2ffa5afd..f0f068cc 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -534,25 +534,25 @@ end # .joins("join shift_sales sh on sh.id = sales.shift_sale_id") # .where('sales.sale_status = "void" and sales.total_amount != 0 and sales.shift_sale_id = ?', shift.id) # .sum(:grand_total) -# cash = all_total.select('sr.payment_type') -# .where('sr.payment_type = "cash"') +# cash = all_total.select('sr.payment_method') +# .where('sr.payment_method = "cash"') # .sum(:amount) -# credit = all_total.where('sr.payment_type = "creditnote"') +# credit = all_total.where('sr.payment_method = "creditnote"') # .sum(:amount) # accept_credit = all_total.select('ci.amout') # .joins("INNER JOIN credit_items ci ON ci.sale_id = sales.id") -# .where('sr.payment_type = "creditnote"') +# .where('sr.payment_method = "creditnote"') # .sum(:amout) -# foc = all_total.where('sales.payment_type = "foc" and sales.sale_status = "completed"') +# foc = all_total.where('sales.payment_method = "foc" and sales.sale_status = "completed"') # .sum(:grand_total) -# card = all_total.select('payment_type') -# .where('sr.payment_type = "card"') +# card = all_total.select('payment_method') +# .where('sr.payment_method = "card"') # .sum(:amount).to_f # rounding_adj = all_total.sum(:rounding_adjustment) @@ -586,10 +586,96 @@ def self.get_by_shift_sale(from,to,status) return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to) end -def self.get_separate_tax(from,to,payment_type=nil) +def self.get_item_query() + query = Sale.select("acc.title as account_name,mi.account_id, mi.item_code as item_code, " + + "(SUM(i.qty * i.unit_price)) as grand_total,SUM(i.qty) as total_item," + + " i.unit_price as unit_price,mi.name as product_name, mc.name as" + + " menu_category_name,mc.id as menu_category_id ") + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id JOIN menu_categories mc ON mc.id = mi.menu_category_id ") + # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ") + + query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") + query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id") + end + + + def self.get_by_shift_items(shift_sale_range, shift, from, to, status, report_type) + + # date_type_selection = get_sql_function_for_report_type(report_type) + + query = self.get_item_query() + discount_query = 0 + total_card_amount = 0 + total_cash_amount = 0 + total_credit_amount = 0 + total_foc_amount = 0 + total_grand_total = 0 + + if shift == '[]' + ### => get all sales range in shift_sales + query = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a) + discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount) + sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_ - sales.amount_changed) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) and sale_status = 'completed' ", shift_sale_range.to_a) + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + end + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + elsif shift_sale_range == '[]' + query = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount) + sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) and sale_status = 'completed' ", shift.to_a) + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + end + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + else + query = query.where("receipt_date between ? and ? and sale_status=?",from,to,'completed') + sale_cash = Sale.select("sales.total_discount as total_discount, + SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) and sale_status = 'completed' ", shift.to_a) + + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + discount_query = s_c.total_discount.to_f + end + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + end + + return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total + end + +def self.get_separate_tax(from,to,payment_method=nil) query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") - .joins("INNER JOIN sales ON sales.id = sale_taxes.sale_id") + .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") .group("sale_taxes.tax_name") return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) diff --git a/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..c57c8be9 --- /dev/null +++ b/app/views/reports/saleitem (copy)/_shift_sale_report_filter.html.erb @@ -0,0 +1,194 @@ +
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
+
+ + +
+ + +
+ + + +
+
+ + +
+
+ +
+
+ <% end %> + + + +
+
+ <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> + <% end %> + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% end %> +
+
+ + + + <% end %> +
+
+ \ No newline at end of file diff --git a/app/views/reports/saleitem (copy)/index.html.erb b/app/views/reports/saleitem (copy)/index.html.erb new file mode 100644 index 00000000..b6482271 --- /dev/null +++ b/app/views/reports/saleitem (copy)/index.html.erb @@ -0,0 +1,141 @@ +
+
    +
  • Home
    • +
  • Daily Sale Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_saleitem_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+
+
Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>) Sale (<%= from rescue '-' %> - <%= to rescue '-'%>)
Sr.no Date<%= result.grand_total_after_rounding() rescue '-'%>
  <%= total_sum rescue '-'%>
<%= grand_total.to_f.round(2) rescue '-'%> <%= rounding_adj rescue '-'%><%= grand_total.to_f.round + rounding_adj %><%= old_grand_total.to_f.round + rounding_adj %>
 
+ + + + + + + + + + + + + + + + + +
Date
Menu CategoryCodeProductTotal ItemUnit PriceRevenue
+
+
+
+ + \ No newline at end of file diff --git a/app/views/reports/saleitem (copy)/index.xls.erb b/app/views/reports/saleitem (copy)/index.xls.erb new file mode 100644 index 00000000..3773619b --- /dev/null +++ b/app/views/reports/saleitem (copy)/index.xls.erb @@ -0,0 +1,104 @@ + + + + + + + +
+<% unless @sale_data.blank? %> + + + + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + <% acc_arr = Array.new %> + <% cate_arr = Array.new %> + + <% sub_total = 0.0 %> + <% count = 0%> + <% total_price = 0.0 %> + <% cate_count = 0 %> + <% acc_count = 0%> + <% grand_total = 0%> + <% total_discount = 0.0 %> + + <% @sale_data.order("total_item desc").each do |sale| %> + + + + <% if !cate_arr.include?(sale.menu_category_id) %> + + <% cate_arr.push(sale.menu_category_id) %> + <% else %> + + <% end %> + + <% if @item_table == 'sale' %> + <% if sale.item_remark == 'FOC' %> + + <% elsif sale.item_remark == 'FOC ITEM' %> + + <% elsif sale.item_remark == 'DISCOUNT' %> + + <% else %> + + <% end %> + <% if sale.item_remark == 'DISCOUNT' %> + + + + <% total_price += sale.total_price %> + <% else %> + + + + <% end %> + <% else %> + + + + + <% end %> + + + + + + <% grand_total += sale.grand_total%> + <% end %> + + + + + + +
From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
 Menu CategoryCodeProductTotal ItemUnit PriceRevenue
 <%= sale.menu_category_name %> <%= sale.code rescue '-' %><%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %><%= sale.product_name.to_s rescue '-' %> - - <%= sale.total_price.abs rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %><%= sale.product_name.to_s rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %>
 Grand Total<%= grand_total + total_discount %>
+<% end %> +
+ + \ No newline at end of file diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index c57c8be9..5c8c47b1 100644 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -18,7 +18,7 @@
- + + <% @menu_cate_count.each do |key,value| %> + <% if sale.menu_category_id == key %> + + <% count = count + 1 %> + <% sub_total += sale.grand_total %> + <% if count == value %> + +   + Sub Total + <%= sub_total %> + + + <% sub_total = 0.0%> + <% count = 0%> + <% end %> + <% end %> + <% end %> + + + + <% end %> + + +   + Total Item + <%= total_qty%> + Total Amount + <%= grand_total%> + + <% end %> + + + + + + + - \ No newline at end of file From 082627018f2f780228acc210b704d530716a5621 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 10 Jul 2017 16:23:37 +0630 Subject: [PATCH 16/76] dis fix --- app/controllers/origami/discounts_controller.rb | 1 + app/models/sale_item.rb | 2 +- app/views/origami/discounts/index.html.erb | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index ae53c5b3..2a89cd28 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -42,6 +42,7 @@ class Origami::DiscountsController < BaseOrigamiController sale_item.unit_price = di["price"] sale_item.taxable_price = di["price"] sale_item.is_taxable = 0 + sale_item.account_id = origin_sale_item.account_id sale_item.price = di["price"] sale_item.save diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 3cc0eb43..a0bc1ae2 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -57,7 +57,7 @@ class SaleItem < ApplicationRecord # Check for actual sale items sale_items.where("is_taxable = false AND remark = 'Discount'").find_each do |si| if si.account_id == a.id - discount_account[:price] = (discount_account[:price] + si.price) * -1 + discount_account[:price] = (discount_account[:price].abs + si.price.abs) * -1 end end discount_accounts.push(discount_account) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index ee63f2d3..5dfcb0a1 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -138,7 +138,7 @@
-
15%
+
15%
7
@@ -149,7 +149,7 @@
-
20%
+
20%
0
@@ -160,7 +160,7 @@
-
30%
+
30%
From 152af3a3cb800391ae6db5eed916e049e6ea1370 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 10 Jul 2017 17:17:22 +0630 Subject: [PATCH 17/76] add table no and cus id in payment ui --- app/controllers/origami/payments_controller.rb | 7 +++++++ app/views/origami/payments/show.html.erb | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 9918266a..f2919cce 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -85,6 +85,7 @@ class Origami::PaymentsController < BaseOrigamiController @sale_data = Sale.find_by_sale_id(sale_id) @balance = 0.00 @accountable_type = '' + @table_no = '' #get customer amount @customer = Customer.find(@sale_data.customer_id) @@ -105,6 +106,12 @@ class Origami::PaymentsController < BaseOrigamiController #end customer amount + @sale_data.bookings.each do |sbk| + df = DiningFacility.find(sbk.dining_facility_id) + @table_no = df.type + ' ' + df.name + break + end + @sale_data.sale_payments.each do |spay| if spay.payment_method == "cash" @cash = spay.payment_amount diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 7c608fcb..1a325800 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -10,11 +10,12 @@ Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> - Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %> + Table No - <%=@table_no%> Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %> - Customer : <%= @sale_data.customer.name%> + Customer : <%= @sale_data.customer.name%> + Customer ID : <%= @sale_data.customer.customer_id%>
From a713bf3b0edae9ab63315332372c7e5845aac1a4 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 10 Jul 2017 18:24:57 +0630 Subject: [PATCH 18/76] fix --- app/models/sale.rb | 2 +- app/views/reports/receipt_no/index.html.erb | 2 +- app/views/reports/saleitem/index.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 661222bc..8e7b0677 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -427,7 +427,7 @@ class Sale < ApplicationRecord SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount, SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount, SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount, - SUM(case when (sale_payments.payment_method='credit') then sale_payments.payment_amount else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id") .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to) diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index d30d6154..d5f2cafc 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -79,7 +79,7 @@ <%= result.cashier_name rescue '-' %> <%= result.total_amount rescue '-' %> <%= result.total_discount rescue '-' %> - <%= sprintf "%.2f",result.total_tax rescue '-' %> + <%= result.total_tax rescue '-' %> <%= result.grand_total %> diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index b6482271..23b3a582 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -1,7 +1,7 @@
  • Home
    • -
  • Daily Sale Report
    • +
  • Sale Item Report
From a06f5515fc4ba6baae6b36cb7419a64baeded3bb Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 11 Jul 2017 10:18:08 +0630 Subject: [PATCH 19/76] added menu osaka --- app/models/menu_category.rb | 14 +- app/models/menu_item.rb | 19 +- app/models/menu_item_instance.rb | 9 +- dump.rdb | Bin 17902 -> 17902 bytes lib/tasks/menu_import.rake | 2 +- lib/tasks/menu_osaka.rake | 460 +++++++++++++++++++++++++++++++ 6 files changed, 494 insertions(+), 10 deletions(-) create mode 100644 lib/tasks/menu_osaka.rake diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index e660b4b5..af934b2c 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,4 +1,7 @@ class MenuCategory < ApplicationRecord + + before_create :generate_menu_category_code + belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true @@ -12,7 +15,7 @@ class MenuCategory < ApplicationRecord # find the sub menu item of current item sub_menu_cat = MenuCategory.where("menu_category_id=?",menu_category.id) if sub_menu_cat.length != 0 - sub_menu_cat.each do |sub| + sub_menu_cat.each do |sub| if destroyCategory(sub) end end @@ -20,17 +23,22 @@ class MenuCategory < ApplicationRecord items = MenuItem.where("menu_category_id=?",menu_category.id) items.each do |item| abc = MenuItem.deleteRecursive(item) - end + end menu_category.destroy return true else items = MenuItem.where("menu_category_id=?",menu_category.id) items.each do |item| abc = MenuItem.deleteRecursive(item) - end + end menu_category.destroy return false end end + private + + def generate_menu_category_code + self.code = SeedGenerator.generate_id(self.class.name, "C") + end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 50b70e66..dfeaeb21 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,5 +1,7 @@ class MenuItem < ApplicationRecord + before_create :generate_menu_item_code + belongs_to :menu_category, :optional => true has_many :menu_item_instances belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true @@ -11,7 +13,7 @@ class MenuItem < ApplicationRecord default_scope { order('item_code asc') } scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') } - scope :set_menu_item, -> { where(type: 'SetMenuItem') } + scope :set_menu_item, -> { where(type: 'SetMenuItem') } def self.collection MenuItem.select("id, name").map { |e| [e.name, e.id] } @@ -46,7 +48,7 @@ class MenuItem < ApplicationRecord # find the sub menu item of current item sub_menu_items = MenuItem.where("menu_item_id=?",menu_item.id) if sub_menu_items.length != 0 - sub_menu_items.each do |subitem| + sub_menu_items.each do |subitem| if deleteRecursive(subitem) end end @@ -54,17 +56,24 @@ class MenuItem < ApplicationRecord instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) instances.each do |instance| instance.destroy - end + end menu_item.destroy return true else instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) instances.each do |instance| instance.destroy - end + end menu_item.destroy return false end - end + end + + private + + def generate_menu_item_code + self.item_code = SeedGenerator.generate_id(self.class.name, "I") + end + end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index 09225a23..319e5293 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,7 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - + before_create :generate_menu_item_instance_code + def self.findParentCategory(item) if item.menu_category_id return item.menu_category_id @@ -9,4 +10,10 @@ class MenuItemInstance < ApplicationRecord findParentCategory(parentitem) end end + + private + + def generate_menu_item_instance_code + self.item_instance_code = SeedGenerator.generate_id(self.class.name, "II") + end end diff --git a/dump.rdb b/dump.rdb index e6612cd4d745c3a266a4b581523a7577e82df134..d1bd330f1237192e576c3d31411b3647c05bdc00 100644 GIT binary patch delta 413 zcmXw#-z$T06vjR8m#vi_u||vaZut=zy+*T^WG~6B-#=iv zaXro-VE7A&D4JYjw%obE*RRXxoaa2}b50?RLK=Gt%WO;27hVv|fONiC`Ak~yqJ zrjrW^wzQ&i1NO=uZ_dRk;#wlUD$`5g6{LC#VAtvx->n+udG`?Q4~D@m)e%wHq^Z_0 zxYd!Oy6OmMz55At*7gQ=^Vff_odewuzoOzi@TdlVW{OG@2=RyEExNSLf)w97j^z?? z&mnJ9v^fTTWJ%FSO%z;`x5(W&2i)*tV28*b0s9YH8`8l`&J-OsE`mx) delta 486 zcmaFY&G@dHae@K!gBbUT#yXQf*sx2A6_+HISfwRq=A@=r85tOw>l&Ep8k!xDpS;#p zk{`%WWI!mH7^XY*h9MRr*xw!+fX($r!m_LS7L#L}D+=KR89X4azAlA=oa z$q%GEHqSB*W!_xK@rH4-h-usA44EuOMwiJSC7U-Ns&_G!;aUT z;=wYrM1V3kCts9p*?dbkn{o4di*Jm~x1Ex}lDaCnjFSsF+BW~ye8af8Ng@X!rJ$C} z$an{+uXS^YR30PqB`1hYyzD8AjJLt!=XiihAV$B`&SBhqLH0c(^A#sIpwVuV`}7?) zi)kb>GGBJ`gbLVie#({1$o$YL2yFR6p;AW11Tb^8aV8`44JQwf!p(j9%NZH3fo(8i z&S2ckEcT0W^L}}t**Boh-ffu0$b1!|9Bh#?YYOA$b&5Y3H|~GS$b1v()C~fejFV5h PN^`7jdsp@E+HE5M>J-3& diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index 5b572b62..f8b4ae4a 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -1,5 +1,5 @@ namespace :menu do - desc "Clear Data" + desc "Menu Bitp" task :bitp => :environment do # Main Menu menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake new file mode 100644 index 00000000..e919437a --- /dev/null +++ b/lib/tasks/menu_osaka.rake @@ -0,0 +1,460 @@ +namespace :menu do + desc "Menu Osaka" + task :osaka => :environment do + MenuItemInstance.delete_all + MenuItem.delete_all + MenuCategory.delete_all + Menu.delete_all + Account.delete_all +# Main Menu +menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) +food = Account.create({title: "Food", account_type: "0"}) +beverage = Account.create({title: "Beverage", account_type: "1"}) +# Gyoza +menu_category1 = MenuCategory.create({menu: menu, code: 'C001', name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) + # Gyoza 3pcs + menu_category1_menu_item0 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) + # Gyoza 2pcs + menu_category1_menu_item1 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0021", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + # Cheese Gyoza 6pcs + menu_category1_menu_item2 = SimpleMenuItem.create({ item_code:'I001', name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) +# Curry Gyoza 6pcs + menu_category1_menu_item3 = SimpleMenuItem.create({item_code:'I001', name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) +# Spicy Mayonnaise Gyoza 6pcs + menu_category1_menu_item4 = SimpleMenuItem.create({ item_code:'I001', name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) +#Gyoza 6Pcs + menu_category1_menu_item5 = SimpleMenuItem.create({ item_code:'I001', name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",item_instance_code:"II0031", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",item_instance_code:"II0031", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) +#Gyoza 12 Pcs + menu_category1_menu_item6 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",item_instance_code:"II0031", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",item_instance_code:"II0031", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + #Green Onion Gyoza 6Pcs + menu_category1_menu_item7 = SimpleMenuItem.create({item_code:'I001', name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) + #Kimchi Mayo Gyoza 6Pcs + menu_category1_menu_item8 = SimpleMenuItem.create({item_code:'I001', name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) + #White Onion Gyoza 6Pcs + menu_category1_menu_item9 = SimpleMenuItem.create({ item_code:'I001', name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) + #Garlic Gyoza 6pcs + menu_category1_menu_item26 = SimpleMenuItem.create({item_code:'I001', name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + +# Can Soda +menu_category2 = MenuCategory.create({menu: menu, code: 'C001',name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) + # Water + menu_category1_menu_item10 = SimpleMenuItem.create({ item_code:'I001', name: "Water", alt_name: "Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0111", menu_item: menu_category1_menu_item10, price:500.00, is_on_promotion:false}]) + # Coke + menu_category1_menu_item11 = SimpleMenuItem.create({item_code:'I001', name: "Coke", alt_name: "Coke",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0121", menu_item: menu_category1_menu_item11, price:1000.00, is_on_promotion:false}]) + # Coke Zero + menu_category1_menu_item12 = SimpleMenuItem.create({item_code:'I001', name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) +# Sunkist + menu_category1_menu_item13 = SimpleMenuItem.create({ item_code:'I001', name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) +# Sprite + menu_category1_menu_item14 = SimpleMenuItem.create({ item_code:'I001', name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) +# Pocari Sweat + menu_category1_menu_item15 = SimpleMenuItem.create({item_code:'I001', name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) +#Green Tea + menu_category1_menu_item16 = SimpleMenuItem.create({ item_code:'I001', name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) +# Soda Water + menu_category1_menu_item17 = SimpleMenuItem.create({item_code:'I001', name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) + +# Cold Drinks +menu_category3 = MenuCategory.create({menu: menu,code: 'C001', name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) + # Ice Cappuccino + menu_category1_menu_item18 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cappuccino", alt_name: "Ice Cappuccino",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0142", menu_item: menu_category1_menu_item18, price:3000.00, is_on_promotion:false}]) + # Ice Cafe Latte + menu_category1_menu_item19 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cafe Latte", alt_name: "Ice Cafe Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0152", menu_item: menu_category1_menu_item19, price:3000.00, is_on_promotion:false}]) + # Ice Cafe Mocha + menu_category1_menu_item20 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cafe Mocha", alt_name: "Ice Cafe Mocha",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0162", menu_item: menu_category1_menu_item20, price:3500.00, is_on_promotion:false}]) + # Ice Flavor Latte + menu_category1_menu_item21 = SimpleMenuItem.create({item_code:'I001', name: "Ice Flavor Latte", alt_name: "Ice Flavor Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hazelut",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Almond",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + # Ice Espresso + menu_category1_menu_item22 = SimpleMenuItem.create({item_code:'I001', name: "Ice Espresso", alt_name: "Ice Espresso",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0182", menu_item: menu_category1_menu_item22, price:2000.00, is_on_promotion:false}]) + # Ice Americano + menu_category1_menu_item23 = SimpleMenuItem.create({item_code:'I001', name: "Ice Americano", alt_name: "Ice Americano",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0192", menu_item: menu_category1_menu_item23, price:2000.00, is_on_promotion:false}]) + # Ice Lemon Tea + menu_category1_menu_item24 = SimpleMenuItem.create({item_code:'I001', name: "Ice Lemon Tea", alt_name: "Ice Lemon Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0202", menu_item: menu_category1_menu_item24, price:2000.00, is_on_promotion:false}]) + # Sassy High Tea + menu_category1_menu_item25 = SimpleMenuItem.create({item_code:'I001', name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1432", menu_item: menu_category1_menu_item25, price:2500.00, is_on_promotion:false}]) + +# Salad +menu_category4 = MenuCategory.create({menu: menu, code: 'C001',name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) + # Apple Salad + menu_category1_menu_item27 = SimpleMenuItem.create({item_code:'I001', name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0212", menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) + # Seaweed Salad + menu_category1_menu_item28 = SimpleMenuItem.create({item_code:'I001', name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0222", menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) + # BBQ Pork Salad + menu_category1_menu_item29 = SimpleMenuItem.create({item_code:'I001', name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0232", menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) + # Seafood Salad + menu_category1_menu_item30 = SimpleMenuItem.create({item_code:'I001', name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0242", menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) + # Fried Tofu Salad + menu_category1_menu_item31 = SimpleMenuItem.create({item_code:'I001', name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0252", menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + # S2-Kimuchi + menu_category1_menu_item32 = SimpleMenuItem.create({item_code:'I001', name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0262", menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) + # S3-Bean Sprout Salad + menu_category1_menu_item33 = SimpleMenuItem.create({ item_code:'I001', name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0272", menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) + # S4 Green Salad + menu_category1_menu_item34 = SimpleMenuItem.create({item_code:'I001', name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0282", menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) + # S5-Otsumami Sansyu + menu_category1_menu_item35 = SimpleMenuItem.create({item_code:'I001', name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0292", menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) + # S6-Edamame + menu_category1_menu_item36 = SimpleMenuItem.create({item_code:'I001', name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) + # S1-Glass Noodle Salad + menu_category1_menu_item37 = SimpleMenuItem.create({item_code:'I001', name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + # Gyoza Salad + menu_category1_menu_item59 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) + +# Appetizer +menu_category5 = MenuCategory.create({menu: menu, code: 'C001', name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) + # Party Set A + menu_category1_menu_item38 = SimpleMenuItem.create({item_code:"01024", name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) + # Party Set B + menu_category1_menu_item39 = SimpleMenuItem.create({item_code:"01025", name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) + # Croquette + menu_category1_menu_item40 = SimpleMenuItem.create({item_code:"01026", name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) + # Fried Potato + menu_category1_menu_item41 = SimpleMenuItem.create({item_code:"01027", name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) + # Spicy Steamed Chicken + menu_category1_menu_item42 = SimpleMenuItem.create({item_code:"01028", name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) + # Grilled Saba + menu_category1_menu_item43 = SimpleMenuItem.create({item_code:"01029", name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) +# Yakitori + menu_category1_menu_item44 = SimpleMenuItem.create({item_code:"01024", name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) + # Chicken Hamburg Steak + menu_category1_menu_item45 = SimpleMenuItem.create({item_code:"01025", name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) + # Grilled Shishamo + menu_category1_menu_item46 = SimpleMenuItem.create({item_code:"01026", name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + #A1 Pork Cutlet + menu_category1_menu_item47 = SimpleMenuItem.create({item_code:"01027", name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + # A2 Kushi Katsu + menu_category1_menu_item48 = SimpleMenuItem.create({item_code:"01028", name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) + # A3 Croquette + menu_category1_menu_item49 = SimpleMenuItem.create({item_code:"01029", name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) +# A4 Fried Prawn + menu_category1_menu_item50 = SimpleMenuItem.create({item_code:"01029", name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) + # A5 Fried Soft Shell Crab + menu_category1_menu_item51 = SimpleMenuItem.create({item_code:"01025", name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) + # A6 Vegetable Tempura + menu_category1_menu_item52 = SimpleMenuItem.create({item_code:"01026", name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) + # A7 Tempura Assortment + menu_category1_menu_item53 = SimpleMenuItem.create({item_code:"01027", name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) + # A8 - Fried Chicken + menu_category1_menu_item54 = SimpleMenuItem.create({item_code:"01028", name: "A8 - Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) + # A9 - Fried Tofu + menu_category1_menu_item55 = SimpleMenuItem.create({item_code:"01029", name: "A9 - Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) + # A 10 - Fried Potato + menu_category1_menu_item56 = SimpleMenuItem.create({item_code:"01028", name: "A 10 - Fried Potato", alt_name: "A 10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) + # A11 Fried Gyoza + menu_category1_menu_item57 = SimpleMenuItem.create({item_code:"01029", name: "A11 Fried Gyoza", alt_name: "A11 Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) + # Chicken Cutlet + menu_category1_menu_item58 = SimpleMenuItem.create({item_code:"01029", name: "Chicken Cutlet", alt_name: "Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) + + +# set +menu_category6 = MenuCategory.create({menu: menu, code: 'C001', name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) + # Set A ( Soup + Gyoza 3 pcs) + menu_category1_menu_item60 = SimpleMenuItem.create({item_code:"01030", name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0372", menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) + # Set B(Rice + Soup + Gyoza 3pcs) + menu_category1_menu_item61 = SimpleMenuItem.create({item_code:"01031", name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0382", menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) + # Set C ( Rice + Soup + Salad + Gyoza 3pcs) + menu_category1_menu_item62 = SimpleMenuItem.create({item_code:"01032", name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0392", menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) + # Rice + menu_category1_menu_item63 = SimpleMenuItem.create({item_code:"01033", name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0402", menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) + # Soup + menu_category1_menu_item64 = SimpleMenuItem.create({item_code:"01034", name: "Soup", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0412", menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) + # Salad + menu_category1_menu_item65 = SimpleMenuItem.create({item_code:"01035", name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0422", menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) + +# A La Carte +menu_category7 = MenuCategory.create({menu: menu, code: 'C001',name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) + # Fried Egg with Beef + menu_category1_menu_item66 = SimpleMenuItem.create({item_code:"01037", name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) + # Fried Egg with Pork + menu_category1_menu_item67 = SimpleMenuItem.create({item_code:"01038", name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) + # Fried Eggplant with Pork + menu_category1_menu_item68 = SimpleMenuItem.create({item_code:"01039", name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) + # Spicy Fried Beef + menu_category1_menu_item69 = SimpleMenuItem.create({item_code:"01040", name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) + # F1 Mabo Tofu + menu_category1_menu_item70 = SimpleMenuItem.create({item_code:"01041", name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) + # F2 Black Vinegar Chicken + menu_category1_menu_item71 = SimpleMenuItem.create({item_code:"01037", name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) + # Green Pepper Steak + menu_category1_menu_item72 = SimpleMenuItem.create({item_code:"01038", name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) + # F4 Mabo Eggplant + menu_category1_menu_item73 = SimpleMenuItem.create({item_code:"01039", name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) + # F5 Fried Vegetable + menu_category1_menu_item74 = SimpleMenuItem.create({item_code:"01040", name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) + #F6 - Ebichili + menu_category1_menu_item75 = SimpleMenuItem.create({item_code:"01041", name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) + # F7 Ebimayo + menu_category1_menu_item76 = SimpleMenuItem.create({item_code:"01037", name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) + #F8 Fried Pork Liver + menu_category1_menu_item77 = SimpleMenuItem.create({item_code:"01038", name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) + # F9 - Fried Pork with Kimuchi + menu_category1_menu_item78 = SimpleMenuItem.create({item_code:"01039", name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) + +# Ramen +menu_category8 = MenuCategory.create({menu: menu, code: 'C001',name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) + # Cold Ramen + menu_category1_menu_item79 = SimpleMenuItem.create({item_code:"01042", name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0492", menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) + # N1 - Sio Ramen + menu_category1_menu_item80 = SimpleMenuItem.create({item_code:"01043", name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0501", menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) + # N4-Fried Noodle with Thick Sauce + menu_category1_menu_item81 = SimpleMenuItem.create({item_code:"01044", name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0512", menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + # N2 Syoyu Ramen + menu_category1_menu_item82 = SimpleMenuItem.create({item_code:"01045", name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0522", menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) + # N3 Tonkotsu Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({item_code:"01046", name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0532", menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) + #N5 Curry Ramen + menu_category1_menu_item84 = SimpleMenuItem.create({item_code:"01047", name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0542", menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) + # N6 Spicy Curry Ramen + menu_category1_menu_item85 = SimpleMenuItem.create({item_code:"01049", name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0552", menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + # N7 Miso Ramen + menu_category1_menu_item86 = SimpleMenuItem.create({item_code:"01050", name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0562", menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) + +# Ramen Topping +menu_category9 = MenuCategory.create({menu: menu, code: 'C001',name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) + # Half Egg + menu_category1_menu_item87 = SimpleMenuItem.create({item_code:"01064", name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0702", menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) + # Green Onion + menu_category1_menu_item88 = SimpleMenuItem.create({item_code:"01065", name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0712", menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) + # Bamboo Shoot + menu_category1_menu_item89 = SimpleMenuItem.create({item_code:"01066", name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0722", menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) + # Egg + menu_category1_menu_item90 = SimpleMenuItem.create({item_code:"01067", name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0732", menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) + # Extra Noodle + menu_category1_menu_item91 = SimpleMenuItem.create({item_code:"01068", name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0741", menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) + # BBQ Pork + menu_category1_menu_item92 = SimpleMenuItem.create({item_code:"01068", name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0741", menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) + +# Udon +menu_category10 = MenuCategory.create({menu: menu, code: 'C001', name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) + # U8 Spicy Beef Fried Udon + menu_category1_menu_item93 = SimpleMenuItem.create({item_code:"01069", name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0751", menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) + # U1 Ebi Ten udon + menu_category1_menu_item94 = SimpleMenuItem.create({item_code:"01070", name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0762", menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) + # U2 Vegetable Fried Udon + menu_category1_menu_item95 = SimpleMenuItem.create({item_code:"01071", name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0772", menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) + # U3 Curry Udon + menu_category1_menu_item96 = SimpleMenuItem.create({item_code:"01072", name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0782", menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) + # U4 Pork Fried Udon + menu_category1_menu_item97 = SimpleMenuItem.create({item_code:"01073", name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0792", menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) + # U5 Spicy Pork Fried Udon + menu_category1_menu_item98 = SimpleMenuItem.create({item_code:"01074", name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0802", menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) + # U6 Seafood Fried Udon + menu_category1_menu_item99 = SimpleMenuItem.create({item_code:"01073", name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0792", menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) + # U7 Beef Frid Udon + menu_category1_menu_item100 = SimpleMenuItem.create({item_code:"01074", name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0802", menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) + +# Bar Dessert +menu_category11 = MenuCategory.create({menu: menu, code: 'C001',name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) + +# Curry +menu_category12 = MenuCategory.create({menu: menu,code: 'C001', name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) +# Rice +menu_category13 = MenuCategory.create({menu: menu, code: 'C001',name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) + +# Kids Set +menu_category14 = MenuCategory.create({menu: menu,code: 'C001', name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) + +# Kitchen Dessert +menu_category15 = MenuCategory.create({menu: menu, code: 'C001',name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) + +# Extra +menu_category16 = MenuCategory.create({menu: menu, code: 'C001',name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) + +# Hot Drinks +menu_category17 = MenuCategory.create({menu: menu, code: 'C001',name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) + +# Beer +menu_category18 = MenuCategory.create({menu: menu, code: 'C001',name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) + +# Green Tea +menu_category19 = MenuCategory.create({menu: menu,code: 'C001', name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) +# Drink + menu_category20 = MenuCategory.create({menu: menu,code: 'C001', name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) +# Whisky + menu_category21 = MenuCategory.create({menu: menu, code: 'C001',name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) + #discount + menu_category22 = MenuCategory.create({menu: menu,code: 'C001', name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) + + #Smoothies + menu_category23 = MenuCategory.create({menu: menu,code: 'C001', name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) + + #Italion Soda + menu_category24 = MenuCategory.create({menu: menu, code: 'C001',name: "Italion Soda", alt_name: "Italion Soda", order_by: 24, created_by: "SYSTEM DEFAULT"}) + + #Japanese Sake + menu_category25 = MenuCategory.create({menu: menu, code: 'C001',name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) + + #Cocktail + menu_category26 = MenuCategory.create({menu: menu,code: 'C001', name: "Cocktail", alt_name: "Cocktail", order_by: 26, created_by: "SYSTEM DEFAULT"}) + + #Frappe + menu_category27 = MenuCategory.create({menu: menu, code: 'C001',name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) + + #Breakfast Kitchen + menu_category28 = MenuCategory.create({menu: menu, code: 'C001',name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) + + #Grilled + menu_category29 = MenuCategory.create({menu: menu,code: 'C001', name: "Grilled", alt_name: "Grilled", order_by: 29, created_by: "SYSTEM DEFAULT"}) + + #Sushi + menu_category30 = MenuCategory.create({menu: menu, code: 'C001',name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) + +puts "Osaka's menu setup" + +zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +#Default Order Queue stations +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) + +# QueueStationZone +zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) +zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone2}) +zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone3}) +end +end From 975372e467fb0fdf90d6c2312dc9d443e1c42a17 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 11:03:21 +0630 Subject: [PATCH 20/76] update for all print with filenamme --- app/models/printer/cashier_station_printer.rb | 8 ++++++-- app/models/printer/order_queue_printer.rb | 10 +++++----- app/models/printer/receipt_printer.rb | 10 ++++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 564b4909..267073d8 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -26,9 +26,13 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print + cashier = shift_sale.employee.name + shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details) - pdf.render_file "tmp/print_close_cashier.pdf" - self.print("tmp/print_close_cashier.pdf") + filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" + pdf.render_file filename + self.print(filename) end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 6c8ba7e2..f66f1bc9 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -6,7 +6,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Print order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) - filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # check for item not to show if order_item[0].price != 0 @@ -35,7 +35,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Per Item if oqs.cut_per_item order.each do|odi| - filename = "tmp/order_item_#{odi.item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -54,7 +54,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/order_summary_#{ order_id }" + ".pdf" + filename = "tmp/order_summary.pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) pdf.render_file filename if oqs.print_copy @@ -75,7 +75,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Per Item if oqs.cut_per_item order.each do|odi| - filename = "tmp/order_item_#{odi.item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -97,7 +97,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/booking_summary_#{ booking_id }" + ".pdf" + filename = "tmp/booking_summary.pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name) pdf.render_file filename if oqs.print_copy diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 652339b9..4bd25201 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -75,8 +75,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker # print as print copies in printer setting count = printer_settings.print_copies begin - pdf.render_file "tmp/receipt_bill.pdf" - self.print("tmp/receipt_bill.pdf") + if count == 1 + pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf" + self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf") + else + pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf" + self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf") + end + count -= 1 end until count == 0 end From 72aa7694906cc094338d8c11b8ce7208380e3665 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 11:06:13 +0630 Subject: [PATCH 21/76] added member discount --- .../origami/discounts_controller.rb | 65 +++++++++++++++++++ app/models/ability.rb | 1 + app/models/sale.rb | 5 +- app/views/origami/discounts/index.html.erb | 36 +++++++--- config/routes.rb | 2 +- 5 files changed, 99 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 8d0f9422..fcdcf760 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -125,6 +125,71 @@ class Origami::DiscountsController < BaseOrigamiController sale_id = params[:sale_id] account_types = JSON.parse(params[:account_types]) sub_total = params[:sub_total] + sale = Sale.find(sale_id) + price = SaleItem.calculate_price_by_accounts(sale.sale_items) + + arr = Array.new; + + account_types.each do |at| + price.each do |pc| + if pc[:name].to_s == at["name"].to_s && pc[:price]>0 + str={type:pc[:name],amount:pc[:price]} + arr.push(str) + end + end + + end + + generic_customer_id = sale.customer.membership_id + + receipt_no = sale.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("member_discount") + merchant_uid = memberaction.merchant_account_id.to_s + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + # Control for Paypar Cloud + begin + response = HTTParty.post(url, + :body => { generic_customer_id:generic_customer_id , + campaign_type_id: campaign_type_id, + receipt_no: receipt_no, + merchant_uid:merchant_uid, + discount_method:arr.to_json, + total_sale_transaction_amount: sale.grand_total, + auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }, :timeout => 10) + rescue HTTParty::Error + response = {status: false, message: "Can't open membership server "} + + rescue Net::OpenTimeout + + response = { status: false , message: "Can't open membership server "} + + rescue OpenURI::HTTPError + response = { status: false, message: "Can't open membership server "} + + rescue SocketError + response = { status: false, message: "Can't open membership server "} + end + + puts response.to_json + + table_id = sale.bookings[0].dining_facility_id + table_type = DiningFacility.find(table_id).type + + # Re-calc All Amount in Sale + if response["status"] == true + sale.compute_by_sale_items(sale_id, sale.sale_items, response["rebate_earned"].to_f,"member_discount") + end + result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } + + render :json => result.to_json end #discount for selected order diff --git a/app/models/ability.rb b/app/models/ability.rb index 3e5fc8b6..9a9706ab 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -84,6 +84,7 @@ class Ability can :create, :discount can :remove_discount_items, :discount can :remove_all_discount, :discount + can :member_discount, :discount can :first_bill, :payment can :show, :payment diff --git a/app/models/sale.rb b/app/models/sale.rb index 661222bc..e281f230 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -208,7 +208,7 @@ class Sale < ApplicationRecord end #compute - invoice total - def compute_by_sale_items(sale_id, sale_itemss, total_discount) + def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil) sale = Sale.find(sale_id) sales_items = sale_itemss @@ -227,6 +227,9 @@ class Sale < ApplicationRecord sale.total_amount = subtotal_price sale.total_discount = total_discount sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax + if discount_type == "member_discount" + sale.discount_type = discount_type + end #compute rounding adjustment # adjust_rounding diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index d643b2e7..42df2bc8 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -191,7 +191,8 @@
- +
@@ -496,14 +497,33 @@ $(document).ready(function(){ type: "POST", url: ajax_url, data: params, - success:function(result){ - alert("Successfully Discount!"); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id + success:function(result){ + + if (result.url_status == false) { + status = result.url_message + }else{ + status = result.status } - else { - window.location.href = "/origami/room/" + result.table_id - } + + $.confirm({ + title: 'Infomation!', + content: status, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); + } }); }); diff --git a/config/routes.rb b/config/routes.rb index 3320bdc6..b9549c06 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,7 +105,7 @@ Rails.application.routes.draw do post "/:id/remove_discount_items" => "discounts#remove_discount_items" # Discount for Member - # post "/:id/member_discount" => "discounts#member_discount" + post "/:id/member_discount" => "discounts#member_discount" get "/:id/request_bills" => "request_bills#print",:as => "request_bill" get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } From 1e329d1c5f7c75ea41b1c319a59f24feedae204a Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 14:36:09 +0630 Subject: [PATCH 22/76] fix employee logout --- app/controllers/home_controller.rb | 2 ++ app/models/employee.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index d6960bc3..fb37dbdc 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -65,6 +65,8 @@ class HomeController < ApplicationController end def destroy + # clear in employee session + Employee.logout(session[:session_token]) session[:session_token] = nil redirect_to root_path end diff --git a/app/models/employee.rb b/app/models/employee.rb index 2d70768d..7693c448 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -54,6 +54,7 @@ class Employee < ApplicationRecord def self.logout(session_token) if (session_token) user = Employee.find_by_token_session(session_token) + if user user.token_session = nil user.session_expiry = nil From dec6e7de8a12d203a62d89a55a8808daad6acc02 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 15:23:29 +0630 Subject: [PATCH 23/76] add seed gen for code with 4 digit --- app/models/menu_category.rb | 2 +- app/models/menu_item.rb | 2 +- app/models/menu_item_instance.rb | 2 +- app/models/seed_generator.rb | 26 +- lib/tasks/menu_osaka.rake | 550 +++++++++++++++---------------- 5 files changed, 303 insertions(+), 279 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index af934b2c..2b42e1fd 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -39,6 +39,6 @@ class MenuCategory < ApplicationRecord private def generate_menu_category_code - self.code = SeedGenerator.generate_id(self.class.name, "C") + self.code = SeedGenerator.generate_code(self.class.name, "C") end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index dfeaeb21..9ab8822e 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -73,7 +73,7 @@ class MenuItem < ApplicationRecord private def generate_menu_item_code - self.item_code = SeedGenerator.generate_id(self.class.name, "I") + self.item_code = SeedGenerator.generate_code(self.class.name, "I") end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index 319e5293..f39c29a2 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -14,6 +14,6 @@ class MenuItemInstance < ApplicationRecord private def generate_menu_item_instance_code - self.item_instance_code = SeedGenerator.generate_id(self.class.name, "II") + self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") end end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index fe896a4d..21b8b225 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,5 +1,5 @@ class SeedGenerator < ApplicationRecord - + # Generate ID for Tables def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) new_receipt_no = 0 @@ -23,6 +23,7 @@ class SeedGenerator < ApplicationRecord end + # Generate Receipt No def self.new_receipt_no seed = SeedGenerator.find_by_model("sale") new_receipt_no = 0 @@ -41,4 +42,27 @@ class SeedGenerator < ApplicationRecord return seed.current end + + # Generate for 4 digit Code + def self.generate_code(model, prefix) + seed = SeedGenerator.find_by_model(model) + new_code = 0 + + if (seed.nil?) + seed = SeedGenerator.new() + seed.model = model + new_code = seed.next + seed.save + else + current_no = seed.next + seed.next = seed.next + seed.increase_by + seed.current = current_no + seed.save + end + + padding_len = 5 - prefix.length + next_code = prefix +"-"+ seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') + return next_code + + end end diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index e919437a..38387bdf 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -11,446 +11,446 @@ menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFA food = Account.create({title: "Food", account_type: "0"}) beverage = Account.create({title: "Beverage", account_type: "1"}) # Gyoza -menu_category1 = MenuCategory.create({menu: menu, code: 'C001', name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) +menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) # Gyoza 3pcs - menu_category1_menu_item0 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) + menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) # Gyoza 2pcs - menu_category1_menu_item1 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0021", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) # Cheese Gyoza 6pcs - menu_category1_menu_item2 = SimpleMenuItem.create({ item_code:'I001', name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item2 = SimpleMenuItem.create({ name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) # Curry Gyoza 6pcs - menu_category1_menu_item3 = SimpleMenuItem.create({item_code:'I001', name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs - menu_category1_menu_item4 = SimpleMenuItem.create({ item_code:'I001', name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item4 = SimpleMenuItem.create({ name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) #Gyoza 6Pcs - menu_category1_menu_item5 = SimpleMenuItem.create({ item_code:'I001', name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",item_instance_code:"II0031", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",item_instance_code:"II0031", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item5 = SimpleMenuItem.create({ name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) #Gyoza 12 Pcs - menu_category1_menu_item6 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",item_instance_code:"II0031", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",item_instance_code:"II0031", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item6 = SimpleMenuItem.create({ name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) #Green Onion Gyoza 6Pcs - menu_category1_menu_item7 = SimpleMenuItem.create({item_code:'I001', name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item7 = SimpleMenuItem.create({ name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) #Kimchi Mayo Gyoza 6Pcs - menu_category1_menu_item8 = SimpleMenuItem.create({item_code:'I001', name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item8 = SimpleMenuItem.create({ name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs - menu_category1_menu_item9 = SimpleMenuItem.create({ item_code:'I001', name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item9 = SimpleMenuItem.create({ name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) #Garlic Gyoza 6pcs - menu_category1_menu_item26 = SimpleMenuItem.create({item_code:'I001', name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0031", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item26 = SimpleMenuItem.create({ name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) # Can Soda -menu_category2 = MenuCategory.create({menu: menu, code: 'C001',name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) +menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) # Water - menu_category1_menu_item10 = SimpleMenuItem.create({ item_code:'I001', name: "Water", alt_name: "Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0111", menu_item: menu_category1_menu_item10, price:500.00, is_on_promotion:false}]) + menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Water", alt_name: "Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:500.00, is_on_promotion:false}]) # Coke - menu_category1_menu_item11 = SimpleMenuItem.create({item_code:'I001', name: "Coke", alt_name: "Coke",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0121", menu_item: menu_category1_menu_item11, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke", alt_name: "Coke",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:1000.00, is_on_promotion:false}]) # Coke Zero - menu_category1_menu_item12 = SimpleMenuItem.create({item_code:'I001', name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) + menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) # Sunkist - menu_category1_menu_item13 = SimpleMenuItem.create({ item_code:'I001', name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) # Sprite - menu_category1_menu_item14 = SimpleMenuItem.create({ item_code:'I001', name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item14 = SimpleMenuItem.create({ name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) # Pocari Sweat - menu_category1_menu_item15 = SimpleMenuItem.create({item_code:'I001', name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) #Green Tea - menu_category1_menu_item16 = SimpleMenuItem.create({ item_code:'I001', name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item16 = SimpleMenuItem.create({ name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) # Soda Water - menu_category1_menu_item17 = SimpleMenuItem.create({item_code:'I001', name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0131", menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) # Cold Drinks -menu_category3 = MenuCategory.create({menu: menu,code: 'C001', name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) +menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) # Ice Cappuccino - menu_category1_menu_item18 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cappuccino", alt_name: "Ice Cappuccino",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0142", menu_item: menu_category1_menu_item18, price:3000.00, is_on_promotion:false}]) + menu_category1_menu_item18 = SimpleMenuItem.create({name: "Ice Cappuccino", alt_name: "Ice Cappuccino",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item18, price:3000.00, is_on_promotion:false}]) # Ice Cafe Latte - menu_category1_menu_item19 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cafe Latte", alt_name: "Ice Cafe Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0152", menu_item: menu_category1_menu_item19, price:3000.00, is_on_promotion:false}]) + menu_category1_menu_item19 = SimpleMenuItem.create({name: "Ice Cafe Latte", alt_name: "Ice Cafe Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item19, price:3000.00, is_on_promotion:false}]) # Ice Cafe Mocha - menu_category1_menu_item20 = SimpleMenuItem.create({item_code:'I001', name: "Ice Cafe Mocha", alt_name: "Ice Cafe Mocha",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0162", menu_item: menu_category1_menu_item20, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item20 = SimpleMenuItem.create({name: "Ice Cafe Mocha", alt_name: "Ice Cafe Mocha",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item20, price:3500.00, is_on_promotion:false}]) # Ice Flavor Latte - menu_category1_menu_item21 = SimpleMenuItem.create({item_code:'I001', name: "Ice Flavor Latte", alt_name: "Ice Flavor Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hazelut",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Almond",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch",item_instance_code:"II0172", menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item21 = SimpleMenuItem.create({name: "Ice Flavor Latte", alt_name: "Ice Flavor Latte",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hazelut",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Almond",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch",menu_item: menu_category1_menu_item21, price:3500.00, is_on_promotion:false}]) # Ice Espresso - menu_category1_menu_item22 = SimpleMenuItem.create({item_code:'I001', name: "Ice Espresso", alt_name: "Ice Espresso",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0182", menu_item: menu_category1_menu_item22, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item22 = SimpleMenuItem.create({name: "Ice Espresso", alt_name: "Ice Espresso",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item22, price:2000.00, is_on_promotion:false}]) # Ice Americano - menu_category1_menu_item23 = SimpleMenuItem.create({item_code:'I001', name: "Ice Americano", alt_name: "Ice Americano",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0192", menu_item: menu_category1_menu_item23, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item23 = SimpleMenuItem.create({name: "Ice Americano", alt_name: "Ice Americano",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item23, price:2000.00, is_on_promotion:false}]) # Ice Lemon Tea - menu_category1_menu_item24 = SimpleMenuItem.create({item_code:'I001', name: "Ice Lemon Tea", alt_name: "Ice Lemon Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0202", menu_item: menu_category1_menu_item24, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item24 = SimpleMenuItem.create({name: "Ice Lemon Tea", alt_name: "Ice Lemon Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item24, price:2000.00, is_on_promotion:false}]) # Sassy High Tea - menu_category1_menu_item25 = SimpleMenuItem.create({item_code:'I001', name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1432", menu_item: menu_category1_menu_item25, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item25 = SimpleMenuItem.create({name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item25, price:2500.00, is_on_promotion:false}]) # Salad -menu_category4 = MenuCategory.create({menu: menu, code: 'C001',name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) +menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) # Apple Salad - menu_category1_menu_item27 = SimpleMenuItem.create({item_code:'I001', name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0212", menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) # Seaweed Salad - menu_category1_menu_item28 = SimpleMenuItem.create({item_code:'I001', name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0222", menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) + menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) # BBQ Pork Salad - menu_category1_menu_item29 = SimpleMenuItem.create({item_code:'I001', name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0232", menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) + menu_category1_menu_item29 = SimpleMenuItem.create({ name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) # Seafood Salad - menu_category1_menu_item30 = SimpleMenuItem.create({item_code:'I001', name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0242", menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item30 = SimpleMenuItem.create({name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) # Fried Tofu Salad - menu_category1_menu_item31 = SimpleMenuItem.create({item_code:'I001', name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0252", menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item31 = SimpleMenuItem.create({name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) # S2-Kimuchi - menu_category1_menu_item32 = SimpleMenuItem.create({item_code:'I001', name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0262", menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) + menu_category1_menu_item32 = SimpleMenuItem.create({ name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) # S3-Bean Sprout Salad - menu_category1_menu_item33 = SimpleMenuItem.create({ item_code:'I001', name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0272", menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item33 = SimpleMenuItem.create({ name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) # S4 Green Salad - menu_category1_menu_item34 = SimpleMenuItem.create({item_code:'I001', name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0282", menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item34 = SimpleMenuItem.create({name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) # S5-Otsumami Sansyu - menu_category1_menu_item35 = SimpleMenuItem.create({item_code:'I001', name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0292", menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) # S6-Edamame - menu_category1_menu_item36 = SimpleMenuItem.create({item_code:'I001', name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item36 = SimpleMenuItem.create({name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) # S1-Glass Noodle Salad - menu_category1_menu_item37 = SimpleMenuItem.create({item_code:'I001', name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item37 = SimpleMenuItem.create({name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) # Gyoza Salad - menu_category1_menu_item59 = SimpleMenuItem.create({item_code:'I001', name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0302", menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) + menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) # Appetizer -menu_category5 = MenuCategory.create({menu: menu, code: 'C001', name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) +menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) # Party Set A - menu_category1_menu_item38 = SimpleMenuItem.create({item_code:"01024", name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) + menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) # Party Set B - menu_category1_menu_item39 = SimpleMenuItem.create({item_code:"01025", name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item39 = SimpleMenuItem.create({name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) # Croquette - menu_category1_menu_item40 = SimpleMenuItem.create({item_code:"01026", name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item40 = SimpleMenuItem.create({name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) # Fried Potato - menu_category1_menu_item41 = SimpleMenuItem.create({item_code:"01027", name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item41 = SimpleMenuItem.create({name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) # Spicy Steamed Chicken - menu_category1_menu_item42 = SimpleMenuItem.create({item_code:"01028", name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item42 = SimpleMenuItem.create({name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) # Grilled Saba - menu_category1_menu_item43 = SimpleMenuItem.create({item_code:"01029", name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) + menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) # Yakitori - menu_category1_menu_item44 = SimpleMenuItem.create({item_code:"01024", name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) # Chicken Hamburg Steak - menu_category1_menu_item45 = SimpleMenuItem.create({item_code:"01025", name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) + menu_category1_menu_item45 = SimpleMenuItem.create({name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) # Grilled Shishamo - menu_category1_menu_item46 = SimpleMenuItem.create({item_code:"01026", name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) #A1 Pork Cutlet - menu_category1_menu_item47 = SimpleMenuItem.create({item_code:"01027", name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item47 = SimpleMenuItem.create({name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) # A2 Kushi Katsu - menu_category1_menu_item48 = SimpleMenuItem.create({item_code:"01028", name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) + menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) # A3 Croquette - menu_category1_menu_item49 = SimpleMenuItem.create({item_code:"01029", name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item49 = SimpleMenuItem.create({name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) # A4 Fried Prawn - menu_category1_menu_item50 = SimpleMenuItem.create({item_code:"01029", name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0312", menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) + menu_category1_menu_item50 = SimpleMenuItem.create({name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) # A5 Fried Soft Shell Crab - menu_category1_menu_item51 = SimpleMenuItem.create({item_code:"01025", name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0322", menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) + menu_category1_menu_item51 = SimpleMenuItem.create({name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) # A6 Vegetable Tempura - menu_category1_menu_item52 = SimpleMenuItem.create({item_code:"01026", name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0332", menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) # A7 Tempura Assortment - menu_category1_menu_item53 = SimpleMenuItem.create({item_code:"01027", name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0342", menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item53 = SimpleMenuItem.create({name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) # A8 - Fried Chicken - menu_category1_menu_item54 = SimpleMenuItem.create({item_code:"01028", name: "A8 - Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item54 = SimpleMenuItem.create({name: "A8 - Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) # A9 - Fried Tofu - menu_category1_menu_item55 = SimpleMenuItem.create({item_code:"01029", name: "A9 - Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item55 = SimpleMenuItem.create({name: "A9 - Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) # A 10 - Fried Potato - menu_category1_menu_item56 = SimpleMenuItem.create({item_code:"01028", name: "A 10 - Fried Potato", alt_name: "A 10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0352", menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item56 = SimpleMenuItem.create({name: "A 10 - Fried Potato", alt_name: "A 10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) # A11 Fried Gyoza - menu_category1_menu_item57 = SimpleMenuItem.create({item_code:"01029", name: "A11 Fried Gyoza", alt_name: "A11 Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item57 = SimpleMenuItem.create({name: "A11 Fried Gyoza", alt_name: "A11 Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) # Chicken Cutlet - menu_category1_menu_item58 = SimpleMenuItem.create({item_code:"01029", name: "Chicken Cutlet", alt_name: "Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0362", menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) + menu_category1_menu_item58 = SimpleMenuItem.create({name: "Chicken Cutlet", alt_name: "Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) # set -menu_category6 = MenuCategory.create({menu: menu, code: 'C001', name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) +menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) # Set A ( Soup + Gyoza 3 pcs) - menu_category1_menu_item60 = SimpleMenuItem.create({item_code:"01030", name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0372", menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) # Set B(Rice + Soup + Gyoza 3pcs) - menu_category1_menu_item61 = SimpleMenuItem.create({item_code:"01031", name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0382", menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) + menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) # Set C ( Rice + Soup + Salad + Gyoza 3pcs) - menu_category1_menu_item62 = SimpleMenuItem.create({item_code:"01032", name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0392", menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) # Rice - menu_category1_menu_item63 = SimpleMenuItem.create({item_code:"01033", name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0402", menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) + menu_category1_menu_item63 = SimpleMenuItem.create({name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) # Soup - menu_category1_menu_item64 = SimpleMenuItem.create({item_code:"01034", name: "Soup", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0412", menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) + menu_category1_menu_item64 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) # Salad - menu_category1_menu_item65 = SimpleMenuItem.create({item_code:"01035", name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0422", menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) + menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) # A La Carte -menu_category7 = MenuCategory.create({menu: menu, code: 'C001',name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) +menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) # Fried Egg with Beef - menu_category1_menu_item66 = SimpleMenuItem.create({item_code:"01037", name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item66 = SimpleMenuItem.create({name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) # Fried Egg with Pork - menu_category1_menu_item67 = SimpleMenuItem.create({item_code:"01038", name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item67 = SimpleMenuItem.create({name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) # Fried Eggplant with Pork - menu_category1_menu_item68 = SimpleMenuItem.create({item_code:"01039", name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item68 = SimpleMenuItem.create({name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) # Spicy Fried Beef - menu_category1_menu_item69 = SimpleMenuItem.create({item_code:"01040", name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item69 = SimpleMenuItem.create({name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) # F1 Mabo Tofu - menu_category1_menu_item70 = SimpleMenuItem.create({item_code:"01041", name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item70 = SimpleMenuItem.create({name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) # F2 Black Vinegar Chicken - menu_category1_menu_item71 = SimpleMenuItem.create({item_code:"01037", name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) + menu_category1_menu_item71 = SimpleMenuItem.create({name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) # Green Pepper Steak - menu_category1_menu_item72 = SimpleMenuItem.create({item_code:"01038", name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) + menu_category1_menu_item72 = SimpleMenuItem.create({name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) # F4 Mabo Eggplant - menu_category1_menu_item73 = SimpleMenuItem.create({item_code:"01039", name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item73 = SimpleMenuItem.create({name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) # F5 Fried Vegetable - menu_category1_menu_item74 = SimpleMenuItem.create({item_code:"01040", name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) + menu_category1_menu_item74 = SimpleMenuItem.create({name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) #F6 - Ebichili - menu_category1_menu_item75 = SimpleMenuItem.create({item_code:"01041", name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) + menu_category1_menu_item75 = SimpleMenuItem.create({name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) # F7 Ebimayo - menu_category1_menu_item76 = SimpleMenuItem.create({item_code:"01037", name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) + menu_category1_menu_item76 = SimpleMenuItem.create({name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) #F8 Fried Pork Liver - menu_category1_menu_item77 = SimpleMenuItem.create({item_code:"01038", name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item77 = SimpleMenuItem.create({name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) # F9 - Fried Pork with Kimuchi - menu_category1_menu_item78 = SimpleMenuItem.create({item_code:"01039", name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) + menu_category1_menu_item78 = SimpleMenuItem.create({name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) # Ramen -menu_category8 = MenuCategory.create({menu: menu, code: 'C001',name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) +menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) # Cold Ramen - menu_category1_menu_item79 = SimpleMenuItem.create({item_code:"01042", name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0492", menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item79 = SimpleMenuItem.create({name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) # N1 - Sio Ramen - menu_category1_menu_item80 = SimpleMenuItem.create({item_code:"01043", name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0501", menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) # N4-Fried Noodle with Thick Sauce - menu_category1_menu_item81 = SimpleMenuItem.create({item_code:"01044", name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0512", menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) # N2 Syoyu Ramen - menu_category1_menu_item82 = SimpleMenuItem.create({item_code:"01045", name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0522", menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) # N3 Tonkotsu Ramen - menu_category1_menu_item83 = SimpleMenuItem.create({item_code:"01046", name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0532", menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) #N5 Curry Ramen - menu_category1_menu_item84 = SimpleMenuItem.create({item_code:"01047", name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0542", menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) + menu_category1_menu_item84 = SimpleMenuItem.create({name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) # N6 Spicy Curry Ramen - menu_category1_menu_item85 = SimpleMenuItem.create({item_code:"01049", name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0552", menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) # N7 Miso Ramen - menu_category1_menu_item86 = SimpleMenuItem.create({item_code:"01050", name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0562", menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) + menu_category1_menu_item86 = SimpleMenuItem.create({name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) # Ramen Topping -menu_category9 = MenuCategory.create({menu: menu, code: 'C001',name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) +menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) # Half Egg - menu_category1_menu_item87 = SimpleMenuItem.create({item_code:"01064", name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0702", menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) + menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) # Green Onion - menu_category1_menu_item88 = SimpleMenuItem.create({item_code:"01065", name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0712", menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) + menu_category1_menu_item88 = SimpleMenuItem.create({name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) # Bamboo Shoot - menu_category1_menu_item89 = SimpleMenuItem.create({item_code:"01066", name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0722", menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) + menu_category1_menu_item89 = SimpleMenuItem.create({name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) # Egg - menu_category1_menu_item90 = SimpleMenuItem.create({item_code:"01067", name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0732", menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) + menu_category1_menu_item90 = SimpleMenuItem.create({name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) # Extra Noodle - menu_category1_menu_item91 = SimpleMenuItem.create({item_code:"01068", name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0741", menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) + menu_category1_menu_item91 = SimpleMenuItem.create({name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) # BBQ Pork - menu_category1_menu_item92 = SimpleMenuItem.create({item_code:"01068", name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0741", menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) + menu_category1_menu_item92 = SimpleMenuItem.create({name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) # Udon -menu_category10 = MenuCategory.create({menu: menu, code: 'C001', name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) +menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) # U8 Spicy Beef Fried Udon - menu_category1_menu_item93 = SimpleMenuItem.create({item_code:"01069", name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0751", menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) # U1 Ebi Ten udon - menu_category1_menu_item94 = SimpleMenuItem.create({item_code:"01070", name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0762", menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) + menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) # U2 Vegetable Fried Udon - menu_category1_menu_item95 = SimpleMenuItem.create({item_code:"01071", name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0772", menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item95 = SimpleMenuItem.create({name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) # U3 Curry Udon - menu_category1_menu_item96 = SimpleMenuItem.create({item_code:"01072", name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0782", menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) + menu_category1_menu_item96 = SimpleMenuItem.create({name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) # U4 Pork Fried Udon - menu_category1_menu_item97 = SimpleMenuItem.create({item_code:"01073", name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0792", menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item97 = SimpleMenuItem.create({name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) # U5 Spicy Pork Fried Udon - menu_category1_menu_item98 = SimpleMenuItem.create({item_code:"01074", name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0802", menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item98 = SimpleMenuItem.create({name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) # U6 Seafood Fried Udon - menu_category1_menu_item99 = SimpleMenuItem.create({item_code:"01073", name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0792", menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) + menu_category1_menu_item99 = SimpleMenuItem.create({name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) # U7 Beef Frid Udon - menu_category1_menu_item100 = SimpleMenuItem.create({item_code:"01074", name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0802", menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) # Bar Dessert -menu_category11 = MenuCategory.create({menu: menu, code: 'C001',name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) +menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) # Curry -menu_category12 = MenuCategory.create({menu: menu,code: 'C001', name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) +menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) # Rice -menu_category13 = MenuCategory.create({menu: menu, code: 'C001',name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) +menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) # Kids Set -menu_category14 = MenuCategory.create({menu: menu,code: 'C001', name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) +menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) # Kitchen Dessert -menu_category15 = MenuCategory.create({menu: menu, code: 'C001',name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) +menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) # Extra -menu_category16 = MenuCategory.create({menu: menu, code: 'C001',name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) +menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) # Hot Drinks -menu_category17 = MenuCategory.create({menu: menu, code: 'C001',name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) +menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) # Beer -menu_category18 = MenuCategory.create({menu: menu, code: 'C001',name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) +menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) # Green Tea -menu_category19 = MenuCategory.create({menu: menu,code: 'C001', name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) +menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) # Drink - menu_category20 = MenuCategory.create({menu: menu,code: 'C001', name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) + menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) # Whisky - menu_category21 = MenuCategory.create({menu: menu, code: 'C001',name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) + menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) #discount - menu_category22 = MenuCategory.create({menu: menu,code: 'C001', name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) + menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) #Smoothies - menu_category23 = MenuCategory.create({menu: menu,code: 'C001', name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) + menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) #Italion Soda - menu_category24 = MenuCategory.create({menu: menu, code: 'C001',name: "Italion Soda", alt_name: "Italion Soda", order_by: 24, created_by: "SYSTEM DEFAULT"}) + menu_category24 = MenuCategory.create({menu: menu, name: "Italion Soda", alt_name: "Italion Soda", order_by: 24, created_by: "SYSTEM DEFAULT"}) #Japanese Sake - menu_category25 = MenuCategory.create({menu: menu, code: 'C001',name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) + menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) #Cocktail - menu_category26 = MenuCategory.create({menu: menu,code: 'C001', name: "Cocktail", alt_name: "Cocktail", order_by: 26, created_by: "SYSTEM DEFAULT"}) + menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26, created_by: "SYSTEM DEFAULT"}) #Frappe - menu_category27 = MenuCategory.create({menu: menu, code: 'C001',name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) + menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) #Breakfast Kitchen - menu_category28 = MenuCategory.create({menu: menu, code: 'C001',name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) + menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) #Grilled - menu_category29 = MenuCategory.create({menu: menu,code: 'C001', name: "Grilled", alt_name: "Grilled", order_by: 29, created_by: "SYSTEM DEFAULT"}) + menu_category29 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 29, created_by: "SYSTEM DEFAULT"}) #Sushi - menu_category30 = MenuCategory.create({menu: menu, code: 'C001',name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) + menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) puts "Osaka's menu setup" zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Default Order Queue stations -order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) -order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) -zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004','I0005','I0006','I0007','I0008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # QueueStationZone zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) From 28c51300cf6b076b80875f8a0507669b34d94228 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 15:45:01 +0630 Subject: [PATCH 24/76] update discount message --- .../origami/discounts_controller.rb | 8 +- app/views/origami/discounts/index.html.erb | 92 ++++++++++++------- 2 files changed, 64 insertions(+), 36 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 9c79ea8e..2b6d4383 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -185,10 +185,14 @@ class Origami::DiscountsController < BaseOrigamiController table_type = DiningFacility.find(table_id).type # Re-calc All Amount in Sale - if response["status"] == true + if response["status"] == true sale.compute_by_sale_items(sale_id, sale.sale_items, response["rebate_earned"].to_f,"member_discount") + result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type } end - result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } + + if response[:status] == false + result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } + end render :json => result.to_json end diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 7667bab5..248223ed 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -491,42 +491,66 @@ $(document).ready(function(){ // Selected Account var account_types = JSON.stringify(get_selected_account_types()); - var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; - $.ajax({ - type: "POST", - url: ajax_url, - data: params, - success:function(result){ + if($('.accounts-type').hasClass('selected-account') == true){ - if (result.url_status == false) { - status = result.url_message - }else{ - status = result.status - } - - $.confirm({ - title: 'Infomation!', - content: status, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); - - } - }); - }); + var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + success:function(result){ + + if (result.url_status == false) { + status = result.url_message + type = 'red' + btn_color = 'btn-red' + }else{ + status = result.status + type = '' + btn_color = 'btn-green' + } + + $.confirm({ + title: 'Infomation!', + content: status, + columnClass: 'small', + type: type, + buttons: { + confirm: { + text: 'Ok', + btnClass: btn_color, + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); + + } + }); + }else{ + $.confirm({ + title: 'Alert !', + content: 'Please Select Account', + type: 'red', + typeAnimated: true, + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-danger', + } + } + }); + } + + });//end member discount }); /* Remove Selection */ From d840b08db256019ff3cc9666446ebcb326e911d4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 16:20:30 +0630 Subject: [PATCH 25/76] queue acess on cashier and shiftclose to logout --- app/controllers/crm/home_controller.rb | 12 ++++++------ app/controllers/origami/shifts_controller.rb | 4 ++++ app/models/ability.rb | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index 6866ddf1..d3934eef 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,12 +1,12 @@ class Crm::HomeController < BaseCrmController def index - # @booking = Booking.all - # @customer = Customer.all - # from = Time.now.beginning_of_day.utc - # to = Time.now.end_of_day.utc - # @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') - redirect_to crm_customers_path + @booking = Booking.all + @customer = Customer.all + from = Time.now.beginning_of_day.utc + to = Time.now.end_of_day.utc + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') + # redirect_to crm_customers_path # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e527da46..2d005cfb 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -39,8 +39,12 @@ class Origami::ShiftsController < BaseOrigamiController printer.print_close_cashier(print_settings,@shift,shop_details) + end + session[:session_token] = nil + redirect_to root_path + end def edit diff --git a/app/models/ability.rb b/app/models/ability.rb index 3e5fc8b6..f2c8c0f0 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -100,6 +100,8 @@ class Ability can :show, :payment can :create, :payment can :reprint, :payment + + can :manage, DiningQueue elsif user.role == "accountant" From 39aca095fb841bc60f74400153c01d1277b39acd Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 16:35:34 +0630 Subject: [PATCH 26/76] update osaka menu rake --- lib/tasks/menu_osaka.rake | 695 ++++++++++++++++++++------------------ 1 file changed, 367 insertions(+), 328 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 38387bdf..273e66a3 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -12,68 +12,299 @@ food = Account.create({title: "Food", account_type: "0"}) beverage = Account.create({title: "Beverage", account_type: "1"}) # Gyoza menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) + #Gyoza 6Pcs + menu_category1_menu_item5 = SimpleMenuItem.create({ name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + #Gyoza 12 Pcs + menu_category1_menu_item6 = SimpleMenuItem.create({ name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + # Cheese Gyoza 6pcs + menu_category1_menu_item2 = SimpleMenuItem.create({ name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) + # Spicy Mayonnaise Gyoza 6pcs + menu_category1_menu_item4 = SimpleMenuItem.create({ name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) + #Garlic Gyoza 6pcs + menu_category1_menu_item26 = SimpleMenuItem.create({ name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + #Green Onion Gyoza 6Pcs + menu_category1_menu_item7 = SimpleMenuItem.create({ name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) + #Kimchi Mayo Gyoza 6Pcs + menu_category1_menu_item8 = SimpleMenuItem.create({ name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) + #White Onion Gyoza 6Pcs + menu_category1_menu_item9 = SimpleMenuItem.create({ name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) # Gyoza 3pcs menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) # Gyoza 2pcs menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) - # Cheese Gyoza 6pcs - menu_category1_menu_item2 = SimpleMenuItem.create({ name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) -# Curry Gyoza 6pcs - menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) -# Spicy Mayonnaise Gyoza 6pcs - menu_category1_menu_item4 = SimpleMenuItem.create({ name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) -#Gyoza 6Pcs - menu_category1_menu_item5 = SimpleMenuItem.create({ name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) -#Gyoza 12 Pcs - menu_category1_menu_item6 = SimpleMenuItem.create({ name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - #Green Onion Gyoza 6Pcs - menu_category1_menu_item7 = SimpleMenuItem.create({ name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) - #Kimchi Mayo Gyoza 6Pcs - menu_category1_menu_item8 = SimpleMenuItem.create({ name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) - #White Onion Gyoza 6Pcs - menu_category1_menu_item9 = SimpleMenuItem.create({ name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) - #Garlic Gyoza 6pcs - menu_category1_menu_item26 = SimpleMenuItem.create({ name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + # Curry Gyoza 6pcs + # menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) -# Can Soda -menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) - # Water - menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Water", alt_name: "Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:500.00, is_on_promotion:false}]) - # Coke - menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke", alt_name: "Coke",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:1000.00, is_on_promotion:false}]) - # Coke Zero - menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) -# Sunkist - menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) -# Sprite - menu_category1_menu_item14 = SimpleMenuItem.create({ name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) -# Pocari Sweat - menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) -#Green Tea - menu_category1_menu_item16 = SimpleMenuItem.create({ name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) -# Soda Water - menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) + # Salad +menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) + # S1-Glass Noodle Salad + menu_category1_menu_item37 = SimpleMenuItem.create({name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) + # S2-Kimuchi + menu_category1_menu_item32 = SimpleMenuItem.create({ name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) + # S3-Bean Sprout Salad + menu_category1_menu_item33 = SimpleMenuItem.create({ name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) + # S4 Green Salad + # menu_category1_menu_item34 = SimpleMenuItem.create({name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) + # S5-Otsumami Sansyu + # menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) + # S6-Edamame + menu_category1_menu_item36 = SimpleMenuItem.create({name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) + # Fried Tofu Salad + menu_category1_menu_item31 = SimpleMenuItem.create({name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + # Apple Salad + # menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) + # Seaweed Salad + # menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) + # BBQ Pork Salad + menu_category1_menu_item29 = SimpleMenuItem.create({ name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) + # Seafood Salad + menu_category1_menu_item30 = SimpleMenuItem.create({name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) + # Gyoza Salad + menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) + +# Appetizer +menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) + #A1 Pork Cutlet + menu_category1_menu_item47 = SimpleMenuItem.create({name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) + # A2 Kushi Katsu + # menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) + # A3 Croquette + # menu_category1_menu_item49 = SimpleMenuItem.create({name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) + # A4 Fried Prawn + menu_category1_menu_item50 = SimpleMenuItem.create({name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) + # A5 Fried Soft Shell Crab + menu_category1_menu_item51 = SimpleMenuItem.create({name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) + # A6 Vegetable Tempura + menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) + # A7 Tempura Assortment + menu_category1_menu_item53 = SimpleMenuItem.create({name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) + # A8 - Fried Chicken + menu_category1_menu_item54 = SimpleMenuItem.create({name: "A8-Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) + # A9 - Fried Tofu + menu_category1_menu_item55 = SimpleMenuItem.create({name: "A9-Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) + # A 10 - Fried Potato + menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) + # A11 Fried Gyoza + menu_category1_menu_item57 = SimpleMenuItem.create({name: "A11-Fried Gyoza", alt_name: "A11 - Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) + # A12 Chicken Cutlet + menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) + # Spicy Steamed Chicken + menu_category1_menu_item42 = SimpleMenuItem.create({name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) + # Grilled Saba + menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) +# Yakitori + menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) + # Chicken Hamburg Steak + menu_category1_menu_item45 = SimpleMenuItem.create({name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) + # Grilled Shishamo + menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) + # Party Set A + menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) + # Party Set B + menu_category1_menu_item39 = SimpleMenuItem.create({name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) + # Croquette + menu_category1_menu_item40 = SimpleMenuItem.create({name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) + # Fried Potato + menu_category1_menu_item41 = SimpleMenuItem.create({name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) + +# set +menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) + # Set A ( Soup + Gyoza 3 pcs) + menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) + # Set B(Rice + Soup + Gyoza 3pcs) + menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) + # Set C ( Rice + Soup + Salad + Gyoza 3pcs) + menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) + # Rice + # menu_category1_menu_item63 = SimpleMenuItem.create({name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) + # Soup + # menu_category1_menu_item64 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) + # Salad + # menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) + +# A La Carte +menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) + # F1 Mabo Tofu + menu_category1_menu_item70 = SimpleMenuItem.create({name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) + # F2 Black Vinegar Chicken + menu_category1_menu_item71 = SimpleMenuItem.create({name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) + # Green Pepper Steak + menu_category1_menu_item72 = SimpleMenuItem.create({name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) + # F4 Mabo Eggplant + menu_category1_menu_item73 = SimpleMenuItem.create({name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) + # F5 Fried Vegetable + menu_category1_menu_item74 = SimpleMenuItem.create({name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) + #F6 - Ebichili + menu_category1_menu_item75 = SimpleMenuItem.create({name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) + # F7 Ebimayo + menu_category1_menu_item76 = SimpleMenuItem.create({name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) + #F8 Fried Pork Liver + menu_category1_menu_item77 = SimpleMenuItem.create({name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) + # F9 - Fried Pork with Kimuchi + menu_category1_menu_item78 = SimpleMenuItem.create({name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) + # Fried Egg with Pork + menu_category1_menu_item67 = SimpleMenuItem.create({name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) + # Fried Eggplant with Pork + menu_category1_menu_item68 = SimpleMenuItem.create({name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) + # Spicy Fried Beef + menu_category1_menu_item69 = SimpleMenuItem.create({name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) + # Fried Egg with Beef + menu_category1_menu_item66 = SimpleMenuItem.create({name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) + +# Ramen +menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) + # N1 - Sio Ramen + menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) + # N4-Fried Noodle with Thick Sauce + menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + # N2 Syoyu Ramen + menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) + # N3 Tonkotsu Ramen + menu_category1_menu_item83 = SimpleMenuItem.create({name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) + #N5 Curry Ramen + menu_category1_menu_item84 = SimpleMenuItem.create({name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) + # N6 Spicy Curry Ramen + menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) + # N7 Miso Ramen + menu_category1_menu_item86 = SimpleMenuItem.create({name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) + # Cold Ramen + menu_category1_menu_item79 = SimpleMenuItem.create({name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) + +# Ramen Topping +menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) + # Green Onion + menu_category1_menu_item88 = SimpleMenuItem.create({name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) + # Bamboo Shoot + menu_category1_menu_item89 = SimpleMenuItem.create({name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) + # Egg + menu_category1_menu_item90 = SimpleMenuItem.create({name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) + # Extra Noodle + menu_category1_menu_item91 = SimpleMenuItem.create({name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) + # BBQ Pork + menu_category1_menu_item92 = SimpleMenuItem.create({name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) + # Half Egg + menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) + +# Udon +menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) + # U1 Ebi Ten udon + menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) + # U2 Vegetable Fried Udon + menu_category1_menu_item95 = SimpleMenuItem.create({name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) + # U3 Curry Udon + menu_category1_menu_item96 = SimpleMenuItem.create({name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) + # U4 Pork Fried Udon + menu_category1_menu_item97 = SimpleMenuItem.create({name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) + # U5 Spicy Pork Fried Udon + menu_category1_menu_item98 = SimpleMenuItem.create({name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) + # U6 Seafood Fried Udon + menu_category1_menu_item99 = SimpleMenuItem.create({name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) + # U7 Beef Frid Udon + menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) + # U8 Spicy Beef Fried Udon + menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) + +# Curry +menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) + +# Rice +menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) + +# Kids Set +menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) + +# Drink +menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) + +# Hot Drinks +menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) # Cold Drinks menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) @@ -105,305 +336,113 @@ menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: menu_category1_menu_item25 = SimpleMenuItem.create({name: "Sassy High Tea", alt_name: "Sassy High Tea",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item25, price:2500.00, is_on_promotion:false}]) -# Salad -menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"}) - # Apple Salad - menu_category1_menu_item27 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "Apple Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item27, price:3500.00, is_on_promotion:false}]) - # Seaweed Salad - menu_category1_menu_item28 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}]) - # BBQ Pork Salad - menu_category1_menu_item29 = SimpleMenuItem.create({ name: "BBQ Pork Salad", alt_name: "BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}]) - # Seafood Salad - menu_category1_menu_item30 = SimpleMenuItem.create({name: "Seafood Salad", alt_name: "Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) - # Fried Tofu Salad - menu_category1_menu_item31 = SimpleMenuItem.create({name: "Fried Tofu Salad", alt_name: "Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) - # S2-Kimuchi - menu_category1_menu_item32 = SimpleMenuItem.create({ name: "S2-Kimuchi", alt_name: "S2-Kimuchi",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item32, price:1000.00, is_on_promotion:false}]) - # S3-Bean Sprout Salad - menu_category1_menu_item33 = SimpleMenuItem.create({ name: " S3-Bean Sprout Salad", alt_name: " S3-Bean Sprout Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item33, price:1500.00, is_on_promotion:false}]) - # S4 Green Salad - menu_category1_menu_item34 = SimpleMenuItem.create({name: "S4 Green Salad", alt_name: "S4 Green Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item34, price:2500.00, is_on_promotion:false}]) - # S5-Otsumami Sansyu - menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}]) - # S6-Edamame - menu_category1_menu_item36 = SimpleMenuItem.create({name: "S6-Edamame", alt_name: "S6-Edamame",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2000.00, is_on_promotion:false}]) - # S1-Glass Noodle Salad - menu_category1_menu_item37 = SimpleMenuItem.create({name: "S1-Glass Noodle Salad", alt_name: "S1-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}]) - # Gyoza Salad - menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}]) +# Can Soda +menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "Can Soda", order_by: 2, created_by: "SYSTEM DEFAULT"}) + # Water + menu_category1_menu_item10 = SimpleMenuItem.create({ name: "Water", alt_name: "Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item10, price:500.00, is_on_promotion:false}]) + # Coke + menu_category1_menu_item11 = SimpleMenuItem.create({name: "Coke", alt_name: "Coke",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item11, price:1000.00, is_on_promotion:false}]) + # Coke Zero + menu_category1_menu_item12 = SimpleMenuItem.create({ name: "Coke Zero", alt_name: "Coke Zero",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item12, price:1000.0, is_on_promotion:false}]) +# Sunkist + menu_category1_menu_item13 = SimpleMenuItem.create({ name: "Sunkist", alt_name: "Sunkist",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item13, price:1000.00, is_on_promotion:false}]) +# Sprite + menu_category1_menu_item14 = SimpleMenuItem.create({ name: "Sprite", alt_name: "Sprite",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item14, price:1000.00, is_on_promotion:false}]) +# Pocari Sweat + menu_category1_menu_item15 = SimpleMenuItem.create({ name: "Pocari Sweat", alt_name: "Pocari Sweat",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item15, price:1000.00, is_on_promotion:false}]) +#Green Tea + menu_category1_menu_item16 = SimpleMenuItem.create({ name: "Green Tea", alt_name: "Green Tea",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item16, price:2000.00, is_on_promotion:false}]) +# Soda Water + menu_category1_menu_item17 = SimpleMenuItem.create({name: "Soda Water", alt_name: "Soda Water",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item17, price:1000.00, is_on_promotion:false}]) -# Appetizer -menu_category5 = MenuCategory.create({menu: menu, name: "Appetizer", alt_name: "Appetizer", order_by: 5, created_by: "SYSTEM DEFAULT"}) - # Party Set A - menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}]) - # Party Set B - menu_category1_menu_item39 = SimpleMenuItem.create({name: "Party Set B", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item39, price:5000.00, is_on_promotion:false}]) - # Croquette - menu_category1_menu_item40 = SimpleMenuItem.create({name: "Croquette", alt_name: "Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item40, price:3500.00, is_on_promotion:false}]) - # Fried Potato - menu_category1_menu_item41 = SimpleMenuItem.create({name: "Fried Potato", alt_name: "Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item41, price:1500.00, is_on_promotion:false}]) - # Spicy Steamed Chicken - menu_category1_menu_item42 = SimpleMenuItem.create({name: "Spicy Steamed Chicken", alt_name: "Spicy Steamed Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item42, price:4500.00, is_on_promotion:false}]) - # Grilled Saba - menu_category1_menu_item43 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "Grilled Saba",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item43, price:7500.00, is_on_promotion:false}]) -# Yakitori - menu_category1_menu_item44 = SimpleMenuItem.create({name: "Yakitori", alt_name: "Yakitori",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item44, price:5000.00, is_on_promotion:false}]) - # Chicken Hamburg Steak - menu_category1_menu_item45 = SimpleMenuItem.create({name: "Chicken Hamburg Steak", alt_name: "Chicken Hamburg Steak",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}]) - # Grilled Shishamo - menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}]) - #A1 Pork Cutlet - menu_category1_menu_item47 = SimpleMenuItem.create({name: "A1 Pork Cutlet", alt_name: "A1 Pork Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item47, price:3500.00, is_on_promotion:false}]) - # A2 Kushi Katsu - menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}]) - # A3 Croquette - menu_category1_menu_item49 = SimpleMenuItem.create({name: "A3 Croquette", alt_name: "A3 Croquette",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item49, price:3500.00, is_on_promotion:false}]) -# A4 Fried Prawn - menu_category1_menu_item50 = SimpleMenuItem.create({name: "A4 Fried Prawn", alt_name: "A4 Fried Prawn",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item50, price:4000.00, is_on_promotion:false}]) - # A5 Fried Soft Shell Crab - menu_category1_menu_item51 = SimpleMenuItem.create({name: "A5 Fried Soft Shell Crab", alt_name: "A5 Fried Soft Shell Crab",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item51, price:4000.00, is_on_promotion:false}]) - # A6 Vegetable Tempura - menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}]) - # A7 Tempura Assortment - menu_category1_menu_item53 = SimpleMenuItem.create({name: "A7 Tempura Assortment ", alt_name: "A7 Tempura Assortment ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item53, price:4500.00, is_on_promotion:false}]) - # A8 - Fried Chicken - menu_category1_menu_item54 = SimpleMenuItem.create({name: "A8 - Fried Chicken ", alt_name: "A8 - Fried Chicken ",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:3500.00, is_on_promotion:false}]) - # A9 - Fried Tofu - menu_category1_menu_item55 = SimpleMenuItem.create({name: "A9 - Fried Tofu", alt_name: "A9 - Fried Tofu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:1500.00, is_on_promotion:false}]) - # A 10 - Fried Potato - menu_category1_menu_item56 = SimpleMenuItem.create({name: "A 10 - Fried Potato", alt_name: "A 10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}]) - # A11 Fried Gyoza - menu_category1_menu_item57 = SimpleMenuItem.create({name: "A11 Fried Gyoza", alt_name: "A11 Fried Gyoza",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:2500.00, is_on_promotion:false}]) - # Chicken Cutlet - menu_category1_menu_item58 = SimpleMenuItem.create({name: "Chicken Cutlet", alt_name: "Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}]) - - -# set -menu_category6 = MenuCategory.create({menu: menu, name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"}) - # Set A ( Soup + Gyoza 3 pcs) - menu_category1_menu_item60 = SimpleMenuItem.create({name: "Set A ( Soup + Gyoza 3 pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item60, price:1500.00, is_on_promotion:false}]) - # Set B(Rice + Soup + Gyoza 3pcs) - menu_category1_menu_item61 = SimpleMenuItem.create({name: "Set B(Rice + Soup + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item61, price:2000.00, is_on_promotion:false}]) - # Set C ( Rice + Soup + Salad + Gyoza 3pcs) - menu_category1_menu_item62 = SimpleMenuItem.create({name: "Set C ( Rice + Soup + Salad + Gyoza 3pcs)", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item62, price:2500.00, is_on_promotion:false}]) - # Rice - menu_category1_menu_item63 = SimpleMenuItem.create({name: "Rice", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item63, price:500.00, is_on_promotion:false}]) - # Soup - menu_category1_menu_item64 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}]) - # Salad - menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}]) - -# A La Carte -menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"}) - # Fried Egg with Beef - menu_category1_menu_item66 = SimpleMenuItem.create({name: "Fried Egg with Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2900.00, is_on_promotion:false}]) - # Fried Egg with Pork - menu_category1_menu_item67 = SimpleMenuItem.create({name: "Fried Egg with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item67, price:2900.00, is_on_promotion:false}]) - # Fried Eggplant with Pork - menu_category1_menu_item68 = SimpleMenuItem.create({name: " Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:2900.00, is_on_promotion:false}]) - # Spicy Fried Beef - menu_category1_menu_item69 = SimpleMenuItem.create({name: " Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:2900.00, is_on_promotion:false}]) - # F1 Mabo Tofu - menu_category1_menu_item70 = SimpleMenuItem.create({name: "F1 Mabo Tofu", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item70, price:2900.00, is_on_promotion:false}]) - # F2 Black Vinegar Chicken - menu_category1_menu_item71 = SimpleMenuItem.create({name: "F2 Black Vinegar Chicken", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item71, price:3900.00, is_on_promotion:false}]) - # Green Pepper Steak - menu_category1_menu_item72 = SimpleMenuItem.create({name: "Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3000.00, is_on_promotion:false}]) - # F4 Mabo Eggplant - menu_category1_menu_item73 = SimpleMenuItem.create({name: "F4 Mabo Eggplant", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item73, price:2900.00, is_on_promotion:false}]) - # F5 Fried Vegetable - menu_category1_menu_item74 = SimpleMenuItem.create({name: "F5 Fried Vegetable", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item74, price:2500.00, is_on_promotion:false}]) - #F6 - Ebichili - menu_category1_menu_item75 = SimpleMenuItem.create({name: "F6 - Ebichili", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}]) - # F7 Ebimayo - menu_category1_menu_item76 = SimpleMenuItem.create({name: "F7 Ebimayo", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item76, price:4900.00, is_on_promotion:false}]) - #F8 Fried Pork Liver - menu_category1_menu_item77 = SimpleMenuItem.create({name: "F8 Fried Pork Liver", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item77, price:2900.00, is_on_promotion:false}]) - # F9 - Fried Pork with Kimuchi - menu_category1_menu_item78 = SimpleMenuItem.create({name: " F9 - Fried Pork with Kimuchi", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item78, price:2900.00, is_on_promotion:false}]) - -# Ramen -menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) - # Cold Ramen - menu_category1_menu_item79 = SimpleMenuItem.create({name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) - # N1 - Sio Ramen - menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) - # N4-Fried Noodle with Thick Sauce - menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) - # N2 Syoyu Ramen - menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) - # N3 Tonkotsu Ramen - menu_category1_menu_item83 = SimpleMenuItem.create({name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) - #N5 Curry Ramen - menu_category1_menu_item84 = SimpleMenuItem.create({name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) - # N6 Spicy Curry Ramen - menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}]) - # N7 Miso Ramen - menu_category1_menu_item86 = SimpleMenuItem.create({name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) - -# Ramen Topping -menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"}) - # Half Egg - menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}]) - # Green Onion - menu_category1_menu_item88 = SimpleMenuItem.create({name: "Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:400.00, is_on_promotion:false}]) - # Bamboo Shoot - menu_category1_menu_item89 = SimpleMenuItem.create({name: "Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}]) - # Egg - menu_category1_menu_item90 = SimpleMenuItem.create({name: "Egg", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item90, price:500.00, is_on_promotion:false}]) - # Extra Noodle - menu_category1_menu_item91 = SimpleMenuItem.create({name: "Extra Noodle", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item91, price:800.00, is_on_promotion:false}]) - # BBQ Pork - menu_category1_menu_item92 = SimpleMenuItem.create({name: "BBQ Pork", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item92, price:1500.00, is_on_promotion:false}]) - -# Udon -menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"}) - # U8 Spicy Beef Fried Udon - menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item93, price:4500.00, is_on_promotion:false}]) +# Cocktail +menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) # U1 Ebi Ten udon - menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1 Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}]) + menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) # U2 Vegetable Fried Udon - menu_category1_menu_item95 = SimpleMenuItem.create({name: "U2 Vegetable Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item95, price:5000.00, is_on_promotion:false}]) + menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) # U3 Curry Udon - menu_category1_menu_item96 = SimpleMenuItem.create({name: "U3 Curry Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item96, price:5500.00, is_on_promotion:false}]) - # U4 Pork Fried Udon - menu_category1_menu_item97 = SimpleMenuItem.create({name: "U4 Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item97, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) + # U4 Pork Fried Udon + menu_category1_menu_item203 = SimpleMenuItem.create({name: "Memoir of a Geisha", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item203, price:2500.00, is_on_promotion:false}]) # U5 Spicy Pork Fried Udon - menu_category1_menu_item98 = SimpleMenuItem.create({name: "U5 Spicy Pork Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item98, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item204 = SimpleMenuItem.create({name: "Dawn to Dark", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item204, price:2500.00, is_on_promotion:false}]) # U6 Seafood Fried Udon - menu_category1_menu_item99 = SimpleMenuItem.create({name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) - # U7 Beef Frid Udon - menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) + menu_category1_menu_item205 = SimpleMenuItem.create({name: "Sakura Night", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item205, price:3500.00, is_on_promotion:false}]) + # U7 Beef Frid Udon + menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) + # U8 Spicy Beef Fried Udon + menu_category1_menu_item207 = SimpleMenuItem.create({name: "Love Potion", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) -# Bar Dessert -menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) +# Whisky +menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) -# Curry -menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) -# Rice -menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) +#Japanese Sake & Shochu +menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) -# Kids Set -menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) +#Breakfast Kitchen +menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) -# Kitchen Dessert -menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) +#Frappe +menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) + +#Smoothies +menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) + +#Sushi +menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) # Extra menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) -# Hot Drinks -menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) +# Bar Dessert +menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) + +# Kitchen Dessert +menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) # Beer menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) # Green Tea menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) -# Drink - menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) -# Whisky - menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) - #discount - menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) - #Smoothies - menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) +# Chinese Tea +menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name: "Chinese Tea", order_by: 31, created_by: "SYSTEM DEFAULT"}) - #Italion Soda - menu_category24 = MenuCategory.create({menu: menu, name: "Italion Soda", alt_name: "Italion Soda", order_by: 24, created_by: "SYSTEM DEFAULT"}) +# Wine +menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) - #Japanese Sake - menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) +# Grilled +menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) - #Cocktail - menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26, created_by: "SYSTEM DEFAULT"}) +#discount +# menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) - #Frappe - menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) +#Italion Soda +# menu_category24 = MenuCategory.create({menu: menu, name: "Italion Soda", alt_name: "Italion Soda", order_by: 24, created_by: "SYSTEM DEFAULT"}) - #Breakfast Kitchen - menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) +#Cocktail +# menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26, created_by: "SYSTEM DEFAULT"}) - #Grilled - menu_category29 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 29, created_by: "SYSTEM DEFAULT"}) - - #Sushi - menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) +#Grilled +# menu_category29 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 29, created_by: "SYSTEM DEFAULT"}) puts "Osaka's menu setup" From 600e8e47f48814a4cab052c539cb95f52b54bb48 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 18:26:36 +0630 Subject: [PATCH 27/76] update queue assign and member discount change --- .../crm/dining_queues_controller.rb | 2 +- .../origami/discounts_controller.rb | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 9c5f8b73..22351395 100644 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -86,7 +86,7 @@ class Crm::DiningQueuesController < BaseCrmController table_id = params[:table_id] status = queue.update_attributes(dining_facility_id: table_id,status:"Assign") - status = DiningFacility.find(table_id).update_attributes(status: "occupied") + # status = DiningFacility.find(table_id).update_attributes(status: "occupied") if status == true diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 2b6d4383..1d1d5f83 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -154,11 +154,12 @@ class Origami::DiscountsController < BaseOrigamiController # Control for Paypar Cloud begin response = HTTParty.post(url, - :body => { generic_customer_id:generic_customer_id , + :body => { account_no: nil, + generic_customer_id:generic_customer_id , campaign_type_id: campaign_type_id, receipt_no: receipt_no, merchant_uid:merchant_uid, - discount_method:arr.to_json, + discount_method:arr, total_sale_transaction_amount: sale.grand_total, auth_token:auth_token}.to_json, :headers => { @@ -179,20 +180,18 @@ class Origami::DiscountsController < BaseOrigamiController response = { status: false, message: "Can't open membership server "} end - puts response.to_json - table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type # Re-calc All Amount in Sale if response["status"] == true - sale.compute_by_sale_items(sale_id, sale.sale_items, response["rebate_earned"].to_f,"member_discount") - result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type } + sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) + end - - if response[:status] == false - result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } - end + result = {:status=> "Success", :table_id => table_id,:table_type => table_type } + # if response["status"] == false + # result = {:status=> "Success", :table_id => table_id,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } + # end render :json => result.to_json end From 3f8a5f8ef2d99cfd088f84e19a2d57d55570fe44 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 18:38:55 +0630 Subject: [PATCH 28/76] update discount --- app/controllers/origami/discounts_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 1d1d5f83..00a25021 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -159,7 +159,7 @@ class Origami::DiscountsController < BaseOrigamiController campaign_type_id: campaign_type_id, receipt_no: receipt_no, merchant_uid:merchant_uid, - discount_method:arr, + discount_method:arr.to_json, total_sale_transaction_amount: sale.grand_total, auth_token:auth_token}.to_json, :headers => { @@ -179,6 +179,8 @@ class Origami::DiscountsController < BaseOrigamiController rescue SocketError response = { status: false, message: "Can't open membership server "} end + puts "sssssssss" +puts response.to_json table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type @@ -186,7 +188,6 @@ class Origami::DiscountsController < BaseOrigamiController # Re-calc All Amount in Sale if response["status"] == true sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) - end result = {:status=> "Success", :table_id => table_id,:table_type => table_type } # if response["status"] == false From bf25d7697b4d665ea4d532bb79dfa53976f09560 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 11 Jul 2017 18:47:36 +0630 Subject: [PATCH 29/76] update member discount --- app/controllers/origami/discounts_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 00a25021..e0596166 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -179,9 +179,10 @@ class Origami::DiscountsController < BaseOrigamiController rescue SocketError response = { status: false, message: "Can't open membership server "} end - puts "sssssssss" -puts response.to_json + puts "ssssssssss" + puts response.to_json + table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type From b47e0d0548c618e33920957ad8cf9b0439e2bca6 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 19:21:17 +0630 Subject: [PATCH 30/76] osaka menu rake --- app/models/menu_category.rb | 9 ++- app/models/menu_item.rb | 2 +- app/models/seed_generator.rb | 3 +- lib/tasks/menu_osaka.rake | 114 +++++++++++++++++------------------ 4 files changed, 63 insertions(+), 65 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 2b42e1fd..71ad42c8 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,4 @@ -class MenuCategory < ApplicationRecord - +class MenuCategory < ApplicationRecord before_create :generate_menu_category_code belongs_to :menu @@ -7,7 +6,7 @@ class MenuCategory < ApplicationRecord belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true has_many :menu_items - validates_presence_of :name, :menu, :code, :order_by + validates_presence_of :name, :menu, :order_by default_scope { order('order_by asc') } @@ -38,7 +37,7 @@ class MenuCategory < ApplicationRecord private - def generate_menu_category_code - self.code = SeedGenerator.generate_code(self.class.name, "C") + def generate_menu_category_code + self.code = SeedGenerator.generate_code(self.class.name, "C") end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 9ab8822e..1f1afbe4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,7 +8,7 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account - validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 21b8b225..a88cd8d7 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -61,8 +61,7 @@ class SeedGenerator < ApplicationRecord end padding_len = 5 - prefix.length - next_code = prefix +"-"+ seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') + next_code = prefix + seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') return next_code - end end diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 273e66a3..cbf1b415 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -13,37 +13,37 @@ beverage = Account.create({title: "Beverage", account_type: "1"}) # Gyoza menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) #Gyoza 6Pcs - menu_category1_menu_item5 = SimpleMenuItem.create({ name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item5 = SimpleMenuItem.create({name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) #Gyoza 12 Pcs - menu_category1_menu_item6 = SimpleMenuItem.create({ name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) # Cheese Gyoza 6pcs - menu_category1_menu_item2 = SimpleMenuItem.create({ name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item2 = SimpleMenuItem.create({name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs - menu_category1_menu_item4 = SimpleMenuItem.create({ name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) #Garlic Gyoza 6pcs - menu_category1_menu_item26 = SimpleMenuItem.create({ name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item26 = SimpleMenuItem.create({name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) #Green Onion Gyoza 6Pcs - menu_category1_menu_item7 = SimpleMenuItem.create({ name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) #Kimchi Mayo Gyoza 6Pcs - menu_category1_menu_item8 = SimpleMenuItem.create({ name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item8 = SimpleMenuItem.create({name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs - menu_category1_menu_item9 = SimpleMenuItem.create({ name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) # Gyoza 3pcs menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) # Gyoza 2pcs menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) # Curry Gyoza 6pcs # menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) @@ -447,49 +447,49 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G puts "Osaka's menu setup" zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Default Order Queue stations -order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) -order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) -zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004','I0005','I0006','I0007','I0008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004','I0005','I0006','I0007','I0008']), print_copy: false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # QueueStationZone zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) From 32bc3c5229ee776b99c96cb998490616bea5d7d9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 10:13:19 +0630 Subject: [PATCH 31/76] update member discount --- app/controllers/origami/discounts_controller.rb | 17 +++++++++++------ app/views/origami/discounts/index.html.erb | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index e0596166..c0d93e15 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -179,21 +179,26 @@ class Origami::DiscountsController < BaseOrigamiController rescue SocketError response = { status: false, message: "Can't open membership server "} end + # {"status":true,"discount_earned":360.0,"is_bonus":false} + # {"status":false,"message":"Can't open membership server "} + puts "ssssssssss" - puts response.to_json + puts response.to_json["status"] + puts response["status"] table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type # Re-calc All Amount in Sale if response["status"] == true - sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) + sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) + result = {:status=> "Success", :table_id => table_id,:table_type => table_type } + end + if response[:status] == false + result = {:status=> response[:message], :table_id => table_id,:table_type => table_type } end - result = {:status=> "Success", :table_id => table_id,:table_type => table_type } - # if response["status"] == false - # result = {:status=> "Success", :table_id => table_id,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } - # end + # result = {:status=> response["message"], :table_id => table_id,:table_type => table_type } render :json => result.to_json end diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 248223ed..d59c74d4 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -502,8 +502,8 @@ $(document).ready(function(){ data: params, success:function(result){ - if (result.url_status == false) { - status = result.url_message + if (result.status == "Success") { + status = result.status type = 'red' btn_color = 'btn-red' }else{ From ac7b4dc56dd950bdbbf0a8edc3f8550e9e4b621b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 10:19:02 +0630 Subject: [PATCH 32/76] dev dis --- app/controllers/origami/discounts_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index c0d93e15..ce3a4f9d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -198,8 +198,9 @@ class Origami::DiscountsController < BaseOrigamiController if response[:status] == false result = {:status=> response[:message], :table_id => table_id,:table_type => table_type } end - # result = {:status=> response["message"], :table_id => table_id,:table_type => table_type } - + if response["status"] == 500 + result = {:status=> response["message"], :table_id => table_id,:table_type => table_type } + end render :json => result.to_json end From 465055aacb098c4647d48dc09d2d57cc1e8acc72 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 12 Jul 2017 10:20:43 +0630 Subject: [PATCH 33/76] re-add validate for menu item and cat --- app/models/menu_category.rb | 2 +- app/models/menu_item.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 71ad42c8..9e8e808d 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -6,7 +6,7 @@ class MenuCategory < ApplicationRecord belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true has_many :menu_items - validates_presence_of :name, :menu, :order_by + validates_presence_of :name, :menu, :code, :order_by default_scope { order('order_by asc') } diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..9ab8822e 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,7 +8,7 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account - validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } From c88248281cc683fc9a00eaa15f3ad27dce0e3701 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 12 Jul 2017 10:27:45 +0630 Subject: [PATCH 34/76] remove date filter in shift --- app/models/shift_sale.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index c9a05561..b7ce7299 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -18,15 +18,16 @@ class ShiftSale < ApplicationRecord def self.current_shift today_date = DateTime.now.strftime("%Y-%m-%d") - shift = ShiftSale.where("DATE(shift_started_at)=? and shift_started_at is not null and shift_closed_at is null",today_date).take + shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").take return shift end def self.current_open_shift(current_user) #if current_user #find open shift where is open today and is not closed and login by current cashier + #DATE(shift_started_at)=? and today_date = DateTime.now.strftime("%Y-%m-%d") - shift = ShiftSale.where("DATE(shift_started_at)=? and shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}",today_date).take + shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}").take return shift #end end From 762db6bff9982e7f0c00bd4f1464b8e26d095d4f Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 12 Jul 2017 10:39:23 +0630 Subject: [PATCH 35/76] remove auto gen for menu --- app/models/menu_category.rb | 2 +- app/models/menu_item.rb | 2 +- app/models/menu_item_instance.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 9e8e808d..39858c65 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,5 @@ class MenuCategory < ApplicationRecord - before_create :generate_menu_category_code + # before_create :generate_menu_category_code belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 9ab8822e..9dd9e741 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,6 @@ class MenuItem < ApplicationRecord - before_create :generate_menu_item_code + # before_create :generate_menu_item_code belongs_to :menu_category, :optional => true has_many :menu_item_instances diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index f39c29a2..ab4c806d 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,6 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - before_create :generate_menu_item_instance_code + # before_create :generate_menu_item_instance_code def self.findParentCategory(item) if item.menu_category_id From 1d873ddb68fb4136921b65d4b70a5d9752ced38b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 17:05:10 +0630 Subject: [PATCH 36/76] update member discount and seed for detail --- app/controllers/crm/customers_controller.rb | 16 +--------- .../origami/discounts_controller.rb | 31 +++++++++---------- app/models/seed_generator.rb | 11 +++++-- app/views/crm/customers/show.html.erb | 17 +++------- app/views/origami/discounts/index.html.erb | 18 ++++++----- app/views/origami/home/show.html.erb | 6 +++- app/views/origami/orders/show.html.erb | 6 +++- .../origami/other_charges/index.html.erb | 4 +++ app/views/origami/payments/show.html.erb | 7 ++++- .../origami/room_invoices/index.html.erb | 6 +++- app/views/origami/room_invoices/show.html.erb | 6 +++- app/views/origami/rooms/show.html.erb | 6 +++- app/views/origami/sales/show.html.erb | 6 +++- .../origami/table_invoices/index.html.erb | 6 +++- .../origami/table_invoices/show.html.erb | 6 +++- db/seeds.rb | 5 +-- 16 files changed, 94 insertions(+), 63 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 7b846db0..bbfdb912 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -49,21 +49,7 @@ class Crm::CustomersController < BaseCrmController #get customer amount @customer = Customer.find(params[:id]) @response = Customer.get_membership_transactions(@customer) - # get member information - total = Customer.get_member_account(@customer) - - - @balance = 0.00 - @accountable_type = '' - if total["status"]==true - total["data"].each do |res| - if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" - @balance += res["balance"] - # @accountable_type = res["accountable_type"] - @accountable_type = "Rebate Balance" - end - end - end + # @response = "" #end customer amount diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index ce3a4f9d..6aa76921 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -170,37 +170,36 @@ class Origami::DiscountsController < BaseOrigamiController response = {status: false, message: "Can't open membership server "} rescue Net::OpenTimeout - response = { status: false , message: "Can't open membership server "} - rescue OpenURI::HTTPError response = { status: false, message: "Can't open membership server "} rescue SocketError response = { status: false, message: "Can't open membership server "} end - # {"status":true,"discount_earned":360.0,"is_bonus":false} - # {"status":false,"message":"Can't open membership server "} - - - puts "ssssssssss" - puts response.to_json["status"] - puts response["status"] table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type - + puts response.to_json # Re-calc All Amount in Sale if response["status"] == true - sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) + discount_amount = response["discount_earned"] + if response["discount_bonus_earned"] + discount_amount = discount_amount + response["discount_bonus_earned"] + end + sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount') result = {:status=> "Success", :table_id => table_id,:table_type => table_type } end - if response[:status] == false - result = {:status=> response[:message], :table_id => table_id,:table_type => table_type } - end - if response["status"] == 500 - result = {:status=> response["message"], :table_id => table_id,:table_type => table_type } + + if response["status"] == "500" + result = {:status=> response["error"], :table_id => table_id,:table_type => table_type } end + if !response.nil? + if response[:status] == false + result = {:status=> response[:message], :table_id => table_id,:table_type => table_type } + end + end + render :json => result.to_json end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index a88cd8d7..335ab131 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -60,8 +60,15 @@ class SeedGenerator < ApplicationRecord seed.save end - padding_len = 5 - prefix.length - next_code = prefix + seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') + + if prefix.length == 1 + padding_len = 5 - prefix.length + count = 4-prefix.length + else prefix.length == 2 + padding_len = 6 - prefix.length + count = 5-prefix.length + end + next_code = prefix + seed.current.to_s.to_s.rjust((count)+1,'0') return next_code end end diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 21a05d9c..f25aa4c8 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -64,18 +64,11 @@
- - - - - - - - - - + + + @@ -86,9 +79,9 @@ <% @response["data"].each do |transaction| %> - + - + diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index d59c74d4..35e290e3 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -67,7 +67,12 @@ --> - + <%if @sale_data.discount_type == 'member_discount'%> + + <%else%> + + <%end%> + @@ -503,18 +508,17 @@ $(document).ready(function(){ success:function(result){ if (result.status == "Success") { - status = result.status + type = 'green' + btn_color = 'btn-green' + }else{ type = 'red' btn_color = 'btn-red' - }else{ - status = result.status - type = '' - btn_color = 'btn-green' + } $.confirm({ title: 'Infomation!', - content: status, + content: result.status, columnClass: 'small', type: type, buttons: { diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 73959b5b..15f28cf8 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -220,7 +220,11 @@ - + <%if @obj_sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 40388847..e8c391d1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -175,7 +175,11 @@ - + <%if @selected_item.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb index 20bb5a4b..4c617477 100644 --- a/app/views/origami/other_charges/index.html.erb +++ b/app/views/origami/other_charges/index.html.erb @@ -59,7 +59,11 @@ + <%if @sale_data.discount_type == 'member_discount'%> + + <%else%> + <%end%> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 1a325800..63b6b0d0 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -68,7 +68,12 @@ - + <%if @sale_data.discount_type == 'member_discount'%> + + <%else%> + + <%end%> + diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb index 71b9bee7..3d88622e 100644 --- a/app/views/origami/room_invoices/index.html.erb +++ b/app/views/origami/room_invoices/index.html.erb @@ -40,7 +40,11 @@ - + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/room_invoices/show.html.erb b/app/views/origami/room_invoices/show.html.erb index b44340d4..86cb1789 100644 --- a/app/views/origami/room_invoices/show.html.erb +++ b/app/views/origami/room_invoices/show.html.erb @@ -106,7 +106,11 @@ - + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 66a48522..988bcf5a 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -203,7 +203,11 @@ - + <%if @obj.discount_type == 'member_discount'%> + + <%else%> + + <%end%> <% if @status == "sale" %> diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 9a8dc95d..dd58a577 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -164,7 +164,11 @@ - + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb index 95a6ee33..834d5f36 100644 --- a/app/views/origami/table_invoices/index.html.erb +++ b/app/views/origami/table_invoices/index.html.erb @@ -40,7 +40,11 @@ - + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb index c49ddfbc..b5769e02 100644 --- a/app/views/origami/table_invoices/show.html.erb +++ b/app/views/origami/table_invoices/show.html.erb @@ -106,7 +106,11 @@ - + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> diff --git a/db/seeds.rb b/db/seeds.rb index 8fe62bde..08233594 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -138,7 +138,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, Bahan, Yangon', 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: "OSAKA OHSHO", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",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"}) @@ -172,7 +172,8 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"} + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) From fc986bfed2e000848fdbdeb7fc73e1fe39532313 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 17:23:20 +0630 Subject: [PATCH 37/76] update show for discount --- app/views/origami/home/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 15f28cf8..daacffd9 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -220,7 +220,7 @@ - <%if @obj_sale.discount_type == 'member_discount'%> + <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> <%else%> From da9bb9b5197de177af4cef2a4a107054ac43617c Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 12 Jul 2017 17:33:14 +0630 Subject: [PATCH 38/76] added menu --- lib/tasks/menu_osaka.rake | 423 +++++++++++++++++++++++++++++++++++++- 1 file changed, 415 insertions(+), 8 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index cbf1b415..e1e5e376 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -293,18 +293,175 @@ menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udo # Curry menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"}) + # C1-Pork Cutlet Curry + menu_category12_menu_item1 = SimpleMenuItem.create({name: "C1-Pork Cutlet Curry", alt_name: " ",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:5500.00, is_on_promotion:false}]) + # C2-Beef Curry + menu_category12_menu_item2 = SimpleMenuItem.create({name: "C2-Beef Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item2, price:5500.00, is_on_promotion:false}]) + # C3-Fried Chicken Curry + menu_category12_menu_item3 = SimpleMenuItem.create({name: "C3-Fried Chicken Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item3, price:5500.00, is_on_promotion:false}]) + # C4-Curry Rice + menu_category12_menu_item4 = SimpleMenuItem.create({name: "C4-Curry Rice", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item4, price:3500.00, is_on_promotion:false}]) + # C5-Fried Prawn Curry + menu_category12_menu_item5 = SimpleMenuItem.create({name: "C5-Fried Prawn Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item5, price:6900.00, is_on_promotion:false}]) + # Chicken Cutlet Curry + menu_category12_menu_item6 = SimpleMenuItem.create({name: "Chicken Cutlet Curry", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:5500.00, is_on_promotion:false}]) # Rice menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"}) + # R1-Katsu Don + menu_category13_menu_item1 = SimpleMenuItem.create({name: "R1-Katsu Don", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item1, price:5900.00, is_on_promotion:false}]) + # R2-Beef Don + menu_category13_menu_item2 = SimpleMenuItem.create({name: "R2-Beef Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item2, price:4000.00, is_on_promotion:false}]) + # R3-Pork Don + menu_category13_menu_item3 = SimpleMenuItem.create({name: "R3-Pork Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item3, price:4000.00, is_on_promotion:false}]) + # R4- Chicken Cutlet Don + menu_category13_menu_item4 = SimpleMenuItem.create({name: "R4- Chicken Cutlet Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item4, price:5900.00, is_on_promotion:false}]) + # R5-Egg and Chicken Don + menu_category13_menu_item5 = SimpleMenuItem.create({name: "R5-Egg and Chicken Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}]) + # R6-Fried Prawn Don + menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) + # R7-Fried Rice + menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) + # R8-Kimuchi Fried Rice + menu_category13_menu_item8 = SimpleMenuItem.create({name: "R8-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}]) + # R9-Crab Tenshinhan + menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) + # R10-Crab Fried Rice + menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}]) + # Beef Fried Rice + menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) + # Mabo Fried Rice + menu_category13_menu_item12 = SimpleMenuItem.create({name: "Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}]) + # Seafood Fried Rice + menu_category13_menu_item13 = SimpleMenuItem.create({name: "Seafood Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item13, price:6000.00, is_on_promotion:false}]) + # Mabo Tenshinhan + menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}]) + # KatsuCurry Tenshinhan + menu_category13_menu_item15 = SimpleMenuItem.create({name: "KatsuCurry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item15, price:7000.00, is_on_promotion:false}]) + # Fried Prawn Curry Tenshinhan + menu_category13_menu_item16 = SimpleMenuItem.create({name: "Fried Prawn Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}]) + # Fried Chicken Curry Tenshinhan + menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}]) + # Chicken Cutlet Curry Tenshinhan + menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}]) # Kids Set menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"}) + # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs) + menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}]) + # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs) + menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}]) # Drink menu_category20 = MenuCategory.create({menu: menu, name: "Drink", alt_name: "Drink", order_by: 20, created_by: "SYSTEM DEFAULT"}) + # Lime Juice + menu_category20_menu_item1 = SimpleMenuItem.create({name: "Lime Juice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item1, price:1500.00, is_on_promotion:false}]) + # Pineapple Juice + menu_category20_menu_item2 = SimpleMenuItem.create({name: "Pineapple Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item2, price:1500.00, is_on_promotion:false}]) + # Watermelon Juice + menu_category20_menu_item3 = SimpleMenuItem.create({name: "Watermelon Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item3, price:1500.00, is_on_promotion:false}]) + # Honey Dew Melon Juice + menu_category20_menu_item4 = SimpleMenuItem.create({name: "Honey Dew Melon Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item4, price:1500.00, is_on_promotion:false}]) + # Banana Juice + menu_category20_menu_item5 = SimpleMenuItem.create({name: "Banana Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item5, price:1500.00, is_on_promotion:false}]) + # Papaya Juice + menu_category20_menu_item6 = SimpleMenuItem.create({name: "Papaya Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) + # Avocado Juice + menu_category20_menu_item7 = SimpleMenuItem.create({name: "Avocado Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Avocado Juice",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}]) + # Kiwi Juice + menu_category20_menu_item9 = SimpleMenuItem.create({name: "Kiwi Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) + # Mango Juice + menu_category20_menu_item10 = SimpleMenuItem.create({name: "Mango Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item10, price:2000.00, is_on_promotion:false}]) + # Lime Soda + menu_category20_menu_item11 = SimpleMenuItem.create({name: "Lime Soda", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) + # Ice + menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}]) + # Green Apple Juice + menu_category20_menu_item13 = SimpleMenuItem.create({name: "Green Apple Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}]) + # Snow Tower + menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}]) # Hot Drinks menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name: "Hot Drinks", order_by: 17,created_by: "SYSTEM DEFAULT"}) + # Espresso + menu_category17_menu_item1 = SimpleMenuItem.create({name: "Espresso", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Espresso",menu_item: menu_category17_menu_item1, price:1500.00, is_on_promotion:false}]) + # Green Tea Pot + menu_category17_menu_item2 = SimpleMenuItem.create({name: "Green Tea Pot", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea Pot",menu_item: menu_category17_menu_item2, price:1500.00, is_on_promotion:false}]) + # Cafe' Americano + menu_category17_menu_item3 = SimpleMenuItem.create({name: "Cafe' Americano", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Americano",menu_item: menu_category17_menu_item3, price:1800.00, is_on_promotion:false}]) + # Double Espresso + menu_category17_menu_item4 = SimpleMenuItem.create({name: "Double Espresso", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Double Espresso",menu_item: menu_category17_menu_item4, price:2000.00, is_on_promotion:false}]) + # Cappuccino + menu_category17_menu_item5 = SimpleMenuItem.create({name: "Cappuccino", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}]) + # Cafe' latte + menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' latte",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) + # Matcha latte + menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Matcha latte",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}]) + # Hot Chocolate + menu_category17_menu_item9 = SimpleMenuItem.create({name: "Hot Chocolate", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Chocolate",menu_item: menu_category17_menu_item9, price:2500.00, is_on_promotion:false}]) + # Cafe' Mocha + menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cafe' Mocha",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}]) + # Flavor latte + menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazelnut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butterscotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) + # Roasted Almond Matchal latte + menu_category17_menu_item12 = SimpleMenuItem.create({name: "Roasted Almond Matchal latte", alt_name: " ",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Roasted Almond Matchal latte",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}]) + # Coconut Matcha latte + menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Coconut Matcha latte",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}]) # Cold Drinks menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"}) @@ -365,72 +522,322 @@ menu_category2 = MenuCategory.create({menu: menu, name: "Can Soda", alt_name: "C # Cocktail menu_category26 = MenuCategory.create({menu: menu, name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"}) - # U1 Ebi Ten udon + # Moscow's Sky menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}]) - # U2 Vegetable Fried Udon + # Tokyo Sunset menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}]) - # U3 Curry Udon + # Crane at Lakeside menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}]) - # U4 Pork Fried Udon + # Memoir of a Geisha menu_category1_menu_item203 = SimpleMenuItem.create({name: "Memoir of a Geisha", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item203, price:2500.00, is_on_promotion:false}]) - # U5 Spicy Pork Fried Udon + # Dawn to Dark menu_category1_menu_item204 = SimpleMenuItem.create({name: "Dawn to Dark", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item204, price:2500.00, is_on_promotion:false}]) - # U6 Seafood Fried Udon + # Sakura Night menu_category1_menu_item205 = SimpleMenuItem.create({name: "Sakura Night", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item205, price:3500.00, is_on_promotion:false}]) - # U7 Beef Frid Udon + # Kyoto Temptation menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}]) - # U8 Spicy Beef Fried Udon + # Love Potion menu_category1_menu_item207 = SimpleMenuItem.create({name: "Love Potion", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}]) # Whisky menu_category21 = MenuCategory.create({menu: menu, name: "Whisky", alt_name: "Whisky", order_by: 21, created_by: "SYSTEM DEFAULT"}) + # BLACK LABEL 1Lit + menu_category21_menu_item200 = SimpleMenuItem.create({name: "BLACK LABEL 1Lit", alt_name: " ",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"BLACK LABEL 1Lit",menu_item: menu_category21_menu_item200, price:48000.00, is_on_promotion:false}]) + # GOLD LABEL RESERVE + menu_category21_menu_item201 = SimpleMenuItem.create({name: "GOLD LABEL RESERVE", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"GOLD LABEL RESERVE",menu_item: menu_category21_menu_item201, price:70000.00, is_on_promotion:false}]) + # BLUE LABEL 75cl + menu_category21_menu_item202 = SimpleMenuItem.create({name: "BLUE LABEL 75cl", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"BLUE LABEL 75cl",menu_item: menu_category21_menu_item202, price:188000.00, is_on_promotion:false}]) + # CHIVAS 12year (1Lit) + menu_category21_menu_item203 = SimpleMenuItem.create({name: "CHIVAS 12year (1Lit)", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"CHIVAS 12year (1Lit)",menu_item: menu_category21_menu_item203, price:37000.00, is_on_promotion:false}]) + # CHIVAS REGAL Extra (1Lit) + menu_category21_menu_item204 = SimpleMenuItem.create({name: "CHIVAS REGAL Extra (1Lit)", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"CHIVAS REGAL Extra (1Lit)",menu_item: menu_category21_menu_item204, price:67000.00, is_on_promotion:false}]) + # Glenfiddich 12 years 1Lit + menu_category21_menu_item205 = SimpleMenuItem.create({name: "Glenfiddich 12 years 1Lit", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenfiddich 12 years 1Lit",menu_item: menu_category21_menu_item205, price:48000.00, is_on_promotion:false}]) + # Glenfiddish 15 years 75cl + menu_category21_menu_item206 = SimpleMenuItem.create({name: "Glenfiddish 15 years 75cl", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Glenfiddish 15 years 75cl",menu_item: menu_category21_menu_item206, price:62000.00, is_on_promotion:false}]) + # PLATINUM LABEL + menu_category21_menu_item207 = SimpleMenuItem.create({name: "PLATINUM LABEL", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"PLATINUM LABEL",menu_item: menu_category21_menu_item207, price:78000.00, is_on_promotion:false}]) + # DOUBLE BLACK + menu_category21_menu_item208 = SimpleMenuItem.create({name: "DOUBLE BLACK", alt_name: "",menu_category: menu_category21 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"DOUBLE BLACK",menu_item: menu_category21_menu_item208, price:48000.00, is_on_promotion:false}]) #Japanese Sake & Shochu menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"}) + # Iichiko Silhouette 720ml + menu_category25_menu_item200 = SimpleMenuItem.create({name: "Iichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Iichiko Silhouette 720ml",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}]) + # Kurokirishima Imo Shochu 720ml + menu_category25_menu_item201 = SimpleMenuItem.create({name: "Kurokirishima Imo Shochu 720ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kurokirishima Imo Shochu 720ml",menu_item: menu_category25_menu_item201, price:29000.00, is_on_promotion:false}]) + # Sawanotsuru Fresh 300ml + menu_category25_menu_item202 = SimpleMenuItem.create({name: "Sawanotsuru Fresh 300ml", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sawanotsuru Fresh 300ml",menu_item: menu_category25_menu_item202, price:9000.00, is_on_promotion:false}]) + # Kha Ka Bora Soba Fresh Shochu + menu_category25_menu_item203 = SimpleMenuItem.create({name: "Kha Ka Bora Soba Fresh Shochu", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kha Ka Bora Soba Fresh Shochu",menu_item: menu_category25_menu_item203, price:2500.00, is_on_promotion:false}]) + # Shwe Yi Soba Shochu + menu_category25_menu_item204 = SimpleMenuItem.create({name: "Shwe Yi Soba Shochu", alt_name: "",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shwe Yi Soba Shochu",menu_item: menu_category25_menu_item204, price:7000.00, is_on_promotion:false}]) #Breakfast Kitchen menu_category28 = MenuCategory.create({menu: menu, name: "Breakfast Kitchen", alt_name: "Breakfast Kitchen", order_by: 28, created_by: "SYSTEM DEFAULT"}) + # Ham and Cheese Sandwich with French Fries + menu_category28_menu_item200 = SimpleMenuItem.create({name: "Ham and Cheese Sandwich with French Fries", alt_name: " ",menu_category: menu_category28 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ham and Cheese Sandwich with French Fries",menu_item: menu_category28_menu_item200, price:3500.00, is_on_promotion:false}]) + # Grilled Cheese Sandwich with French Fries + menu_category28_menu_item201 = SimpleMenuItem.create({name: "Grilled Cheese Sandwich with French Fries", alt_name: "",menu_category: menu_category28 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Cheese Sandwich with French Fries",menu_item: menu_category28_menu_item201, price:3500.00, is_on_promotion:false}]) #Frappe menu_category27 = MenuCategory.create({menu: menu, name: "Frappe", alt_name: "Frappe", order_by: 27, created_by: "SYSTEM DEFAULT"}) + # Cappuccino Frappe + menu_category27_menu_item200 = SimpleMenuItem.create({name: "Cappuccino Frappe", alt_name: " ",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cappuccino Frappe",menu_item: menu_category27_menu_item200, price:3900.00, is_on_promotion:false}]) + # Caramel frappe + menu_category27_menu_item201 = SimpleMenuItem.create({name: "Caramel frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Caramel frappe",menu_item: menu_category27_menu_item201, price:3900.00, is_on_promotion:false}]) + # Green Tea frappe + menu_category27_menu_item202 = SimpleMenuItem.create({name: "Green Tea frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Green Tea frappe",menu_item: menu_category27_menu_item202, price:3900.00, is_on_promotion:false}]) + # KBanoffee + menu_category27_menu_item203 = SimpleMenuItem.create({name: "KBanoffee", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"KBanoffee",menu_item: menu_category27_menu_item203, price:3900.00, is_on_promotion:false}]) + # Butterscotch Popcorn frappe + menu_category27_menu_item204 = SimpleMenuItem.create({name: "Butterscotch Popcorn frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Butterscotch Popcorn frappe",menu_item: menu_category27_menu_item204, price:3900.00, is_on_promotion:false}]) + # Mocha frappe + menu_category27_menu_item205 = SimpleMenuItem.create({name: "Mocha frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mocha frappe",menu_item: menu_category27_menu_item205, price:3900.00, is_on_promotion:false}]) + # Chocolate frappe + menu_category27_menu_item206 = SimpleMenuItem.create({name: "Chocolate frappe", alt_name: "",menu_category: menu_category27 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chocolate frappe",menu_item: menu_category27_menu_item206, price:3900.00, is_on_promotion:false}]) #Smoothies menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"}) + # Strawberry smoothie + menu_category23_menu_item200 = SimpleMenuItem.create({name: "Strawberry smoothie", alt_name: " ",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Strawberry smoothie",menu_item: menu_category23_menu_item200, price:3500.00, is_on_promotion:false}]) + # Passion fruit smoothie + menu_category23_menu_item201 = SimpleMenuItem.create({name: "Passion fruit smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Passion fruit smoothie",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) + # Mixederry smoothie + menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixederry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixederry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) + # Blueberry smoothie + menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Blueberry smoothie",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) + # Berry Sunshine Smoothie + menu_category23_menu_item204 = SimpleMenuItem.create({name: "Berry Sunshine Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Berry Sunshine Smoothie",menu_item: menu_category23_menu_item204, price:3500.00, is_on_promotion:false}]) + # Mango Smoothie + menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mango Smoothie",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}]) #Sushi menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"}) + # Grilled Salmon Roll + menu_category30_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon Roll", alt_name: " ",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon Roll",menu_item: menu_category30_menu_item200, price:7500.00, is_on_promotion:false}]) + # Avocado Roll + menu_category30_menu_item201 = SimpleMenuItem.create({name: "Avocado Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Avocado Roll",menu_item: menu_category30_menu_item201, price:5000.00, is_on_promotion:false}]) + # Sushi Tempura + menu_category30_menu_item202 = SimpleMenuItem.create({name: "Sushi Tempura", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Sushi Tempura",menu_item: menu_category30_menu_item202, price:6500.00, is_on_promotion:false}]) + # Fried Prawn Roll + menu_category30_menu_item203 = SimpleMenuItem.create({name: "Fried Prawn Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Fried Prawn Roll",menu_item: menu_category30_menu_item203, price:7000.00, is_on_promotion:false}]) + # Jade Garden Roll + menu_category30_menu_item204 = SimpleMenuItem.create({name: "Jade Garden Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Jade Garden Roll",menu_item: menu_category30_menu_item204, price:5000.00, is_on_promotion:false}]) + # California Roll + menu_category30_menu_item205 = SimpleMenuItem.create({name: "California Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"California Roll",menu_item: menu_category30_menu_item205, price:5000.00, is_on_promotion:false}]) + # Philadelphia Roll + menu_category30_menu_item206 = SimpleMenuItem.create({name: "Philadelphia Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Philadelphia Roll",menu_item: menu_category30_menu_item206, price:7500.00, is_on_promotion:false}]) + # Soft Shell Crab Roll + menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}]) + # Fried Chicken Roll + menu_category30_menu_item208 = SimpleMenuItem.create({name: "Fried Chicken Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Fried Chicken Roll",menu_item: menu_category30_menu_item208, price:5500.00, is_on_promotion:false}]) + # Apple Salad + menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}]) + # Seaweed Salad + menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}]) + # Salmon Skin Roll + menu_category30_menu_item2011 = SimpleMenuItem.create({name: "Salmon Skin Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salmon Skin Roll",menu_item: menu_category30_menu_item2011, price:6500.00, is_on_promotion:false}]) # Extra menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Extra", order_by: 16,created_by: "SYSTEM DEFAULT"}) + # Rice + menu_category16_menu_item200 = SimpleMenuItem.create({name: "Rice", alt_name: " ",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Rice",menu_item: menu_category16_menu_item200, price:500.00, is_on_promotion:false}]) + # Soup + menu_category16_menu_item201 = SimpleMenuItem.create({name: "Soup", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soup",menu_item: menu_category16_menu_item201, price:500.00, is_on_promotion:false}]) + # Salad + menu_category16_menu_item202 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Salad",menu_item: menu_category16_menu_item202, price:500.00, is_on_promotion:false}]) + # Curry + menu_category16_menu_item203 = SimpleMenuItem.create({name: "Curry", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Curry",menu_item: menu_category16_menu_item203, price:3000.00, is_on_promotion:false}]) + # Beef + menu_category16_menu_item204 = SimpleMenuItem.create({name: "Beef", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef",menu_item: menu_category16_menu_item204, price:3500.00, is_on_promotion:false}]) + # Pieces of Chicken + menu_category16_menu_item205 = SimpleMenuItem.create({name: "Pieces of Chicken", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Chicken",menu_item: menu_category16_menu_item205, price:1000.00, is_on_promotion:false}]) + # Pieces of Prawn + menu_category16_menu_item206 = SimpleMenuItem.create({name: "Pieces of Prawn", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pieces of Prawn",menu_item: menu_category16_menu_item206, price:1500.00, is_on_promotion:false}]) + # Ginger + menu_category16_menu_item207 = SimpleMenuItem.create({name: "Ginger", alt_name: "",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ginger",menu_item: menu_category16_menu_item207, price:500.00, is_on_promotion:false}]) # Bar Dessert menu_category11 = MenuCategory.create({menu: menu, name: "Bar Dessert", alt_name: "Bar Dessert", order_by: 11, created_by: "SYSTEM DEFAULT"}) + # D4-Banana Tempura With Ice Cream + menu_category11_menu_item200 = SimpleMenuItem.create({name: "D4-Banana Tempura With Ice Cream", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D4-Banana Tempura With Ice Cream",menu_item: menu_category11_menu_item200, price:3500.00, is_on_promotion:false}]) + # D5-Ice Cream Chocolate + menu_category11_menu_item201 = SimpleMenuItem.create({name: "D5-Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}]) + # D6-Seasonal Fruits + menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}]) + # D7-Seasona Fruits with Ice Cream + menu_category11_menu_item203 = SimpleMenuItem.create({name: "D7-Seasona Fruits with Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D7-Seasona Fruits with Ice Cream",menu_item: menu_category11_menu_item203, price:2000.00, is_on_promotion:false}]) + # Ice Cream + menu_category11_menu_item204 = SimpleMenuItem.create({name: "Ice Cream", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Cream",menu_item: menu_category11_menu_item204, price:800.00, is_on_promotion:false}]) # Kitchen Dessert menu_category15 = MenuCategory.create({menu: menu, name: "Kitchen Dessert", alt_name: "Kitchen Dessert", order_by: 15, created_by: "SYSTEM DEFAULT"}) + # D1-Peanuts Butter Gyoza + menu_category15_menu_item200 = SimpleMenuItem.create({name: "D1-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}]) + # D2-Red Bean Gyoza + menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}]) + # D3-Banana Gyoza + menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}]) + # Dessert Gyoza 2Pcs + menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}]) # Beer menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer", order_by: 18,created_by: "SYSTEM DEFAULT"}) + # Myanmar Premium Draft Beer + menu_category18_menu_item200 = SimpleMenuItem.create({name: "Myanmar Premium Draft Beer", alt_name: " ",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Premium Draft Beer",menu_item: menu_category18_menu_item200, price:1800.00, is_on_promotion:false}]) + # Kirin Ichiban Draft Beer + menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Kirin Ichiban Draft Beer",menu_item: menu_category18_menu_item201, price:2200.00, is_on_promotion:false}]) + # Myanmar Beer + menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Myanmar Beer",menu_item: menu_category18_menu_item202, price:2300.00, is_on_promotion:false}]) + # Tuborg Beer + menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Tuborg Beer",menu_item: menu_category18_menu_item203, price:2500.00, is_on_promotion:false}]) + # Wine by the Glass + menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}]) # Green Tea menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"}) + # Hot Green Tea + menu_category19_menu_item200 = SimpleMenuItem.create({name: "Hot Green Tea", alt_name: " ",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Green Tea",menu_item: menu_category19_menu_item200, price:1500.00, is_on_promotion:false}]) + # Ice Green Tea + menu_category19_menu_item201 = SimpleMenuItem.create({name: "Ice Green Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}]) # Chinese Tea menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name: "Chinese Tea", order_by: 31, created_by: "SYSTEM DEFAULT"}) + # Hot China Tea + menu_category19_menu_item200 = SimpleMenuItem.create({name: "Hot China Tea", alt_name: " ",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot China Tea",menu_item: menu_category19_menu_item200, price:500.00, is_on_promotion:false}]) + # Cold China Tea + menu_category19_menu_item201 = SimpleMenuItem.create({name: "Cold China Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}]) # Wine menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"}) + # Viejo Vinedo (Arge;) + menu_category32_menu_item200 = SimpleMenuItem.create({name: "Viejo Vinedo (Arge;)", alt_name: " ",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Viejo Vinedo (Arge;)",menu_item: menu_category32_menu_item200, price:15000.00, is_on_promotion:false}]) + # Church Lane + menu_category32_menu_item201 = SimpleMenuItem.create({name: "Church Lane", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Church Lane (SHIRAZ)",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Church Lane (Cabernet Sauvignon)",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}]) + # Chardonnay Layer Cake (Napa Valley) + menu_category32_menu_item202 = SimpleMenuItem.create({name: "Chardonnay Layer Cake (Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chardonnay Layer Cake (Napa Valley)",menu_item: menu_category32_menu_item202, price:30000.00, is_on_promotion:false}]) + # PINOT NOIR + menu_category32_menu_item203 = SimpleMenuItem.create({name: "PINOT NOIR", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"PINOT NOIR",menu_item: menu_category32_menu_item203, price:25000.00, is_on_promotion:false}]) # Grilled menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) + # Grilled Salmon + menu_category33_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13500.00, is_on_promotion:false}]) + # Grilled Garlic + menu_category33_menu_item201 = SimpleMenuItem.create({name: "Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1500.00, is_on_promotion:false}]) + # Grilled Shishamo + menu_category33_menu_item202 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Shishamo",menu_item: menu_category33_menu_item202, price:3800.00, is_on_promotion:false}]) + # Grilled Saba + menu_category33_menu_item203 = SimpleMenuItem.create({name: "Grilled Saba", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Saba",menu_item: menu_category33_menu_item203, price:4800.00, is_on_promotion:false}]) + # Pork Yakiniku + menu_category33_menu_item204 = SimpleMenuItem.create({name: "Pork Yakiniku", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Yakiniku",menu_item: menu_category33_menu_item204, price:600.00, is_on_promotion:false}]) + # Beef Yakiniku + menu_category33_menu_item205 = SimpleMenuItem.create({name: "Beef Yakiniku", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Yakiniku",menu_item: menu_category33_menu_item205, price:700.00, is_on_promotion:false}]) + # Yakitori + menu_category33_menu_item206 = SimpleMenuItem.create({name: "Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) + menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) + menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:600.00, is_on_promotion:false}]) + menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3800.00, is_on_promotion:false}]) + # Yakitori Assortment + menu_category33_menu_item207 = SimpleMenuItem.create({name: "Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori Assortment",menu_item: menu_category33_menu_item207, price:5000.00, is_on_promotion:false}]) + # Shiitake mushroom (1 piece) + menu_category33_menu_item208 = SimpleMenuItem.create({name: "Shiitake mushroom (1 piece)", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Shiitake mushroom (1 piece)",menu_item: menu_category33_menu_item208, price:600.00, is_on_promotion:false}]) + # Lady finger (1 piece) + menu_category33_menu_item209 = SimpleMenuItem.create({name: "Lady finger (1 piece)", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lady finger (1 piece)",menu_item: menu_category33_menu_item209, price:600.00, is_on_promotion:false}]) #discount # menu_category22 = MenuCategory.create({menu: menu, name: "Discount", alt_name: "Discount", order_by: 22, created_by: "SYSTEM DEFAULT"}) From 9da05a72aa52ee4a64a8bff2d8e5707fd41f660d Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 12 Jul 2017 17:58:07 +0630 Subject: [PATCH 39/76] merge with master --- app/models/menu_category.rb | 4 ++-- app/models/menu_item.rb | 4 ++-- app/models/menu_item_instance.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 39858c65..71ad42c8 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,12 +1,12 @@ class MenuCategory < ApplicationRecord - # before_create :generate_menu_category_code + before_create :generate_menu_category_code belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true has_many :menu_items - validates_presence_of :name, :menu, :code, :order_by + validates_presence_of :name, :menu, :order_by default_scope { order('order_by asc') } diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 9dd9e741..1f1afbe4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,6 @@ class MenuItem < ApplicationRecord - # before_create :generate_menu_item_code + before_create :generate_menu_item_code belongs_to :menu_category, :optional => true has_many :menu_item_instances @@ -8,7 +8,7 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account - validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index ab4c806d..f39c29a2 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,6 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - # before_create :generate_menu_item_instance_code + before_create :generate_menu_item_instance_code def self.findParentCategory(item) if item.menu_category_id From e34d267fc869bf14dde09588fb44fb5998bc777f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Jul 2017 19:43:56 +0630 Subject: [PATCH 40/76] update control member for osaka --- .../origami/discounts_controller.rb | 13 +++++---- .../origami/others_payments_controller.rb | 2 ++ .../origami/payments_controller.rb | 9 ++++-- .../membership_settings_controller.rb | 2 +- app/models/sale_payment.rb | 29 +++++++++++-------- app/views/origami/discounts/index.html.erb | 8 +++-- .../membership_settings/_form.html.erb | 4 +++ .../membership_settings/index.html.erb | 8 +++++ ...170414071634_create_membership_settings.rb | 5 +++- 9 files changed, 54 insertions(+), 26 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 6aa76921..4645ff1d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -7,7 +7,7 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) end - + @member_discount = MembershipSetting.find_by_discount(1) @accounts = Account.all end @@ -167,20 +167,21 @@ class Origami::DiscountsController < BaseOrigamiController 'Accept' => 'application/json' }, :timeout => 10) rescue HTTParty::Error - response = {status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue Net::OpenTimeout - response = { status: false , message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue OpenURI::HTTPError - response = { status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } rescue SocketError - response = { status: false, message: "Can't open membership server "} + response = {:status=> false, :message => "Can't open membership server " } end table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type - puts response.to_json + puts response + puts "sssssssssss" # Re-calc All Amount in Sale if response["status"] == true discount_amount = response["discount_earned"] diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index c050c3f3..2a24e2ac 100644 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -6,6 +6,8 @@ class Origami::OthersPaymentsController < BaseOrigamiController @sale_id = params[:sale_id] @payment_method_setting = PaymentMethodSetting.all + @rebate = MembershipSetting.find_by_rebate(1) + # @sale_id = params[:sale_id] # sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index f2919cce..df1fbfcb 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -18,7 +18,8 @@ class Origami::PaymentsController < BaseOrigamiController # customer= Customer.where('customer_id=' +.customer_id) customer= Customer.find(sale_data.customer_id) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) end # get printer info @@ -55,7 +56,8 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) end @@ -145,7 +147,8 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - if customer.membership_id != nil + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) end diff --git a/app/controllers/settings/membership_settings_controller.rb b/app/controllers/settings/membership_settings_controller.rb index 36bb0092..d4da84cd 100644 --- a/app/controllers/settings/membership_settings_controller.rb +++ b/app/controllers/settings/membership_settings_controller.rb @@ -70,6 +70,6 @@ class Settings::MembershipSettingsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_membership_setting_params - params.require(:membership_setting).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by) + params.require(:membership_setting).permit(:membership_type, :is_active,:discount,:rebate,:bonus,:point, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by) end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 300935d9..8df6f1c0 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -261,20 +261,25 @@ class SalePayment < ApplicationRecord end self.sale.sale_status = "completed" - response = rebat(sObj) + if MembershipSetting.find(1).rebate + response = rebat(sObj) - if response["status"] == true - self.sale.rebate_status = 'true' - end - if response["status"] == false - self.sale.rebate_status = 'false' - end + if !response.nil? + if response["status"] == true + self.sale.rebate_status = 'true' + end + if response["status"] == false + self.sale.rebate_status = 'false' + end - if response[:status] == false - self.sale.rebate_status = 'false' - end - if response[:status] == "no_member" - self.sale.rebate_status = nil + if response[:status] == false + self.sale.rebate_status = 'false' + end + if response[:status] == "no_member" + self.sale.rebate_status = nil + end + end + puts "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr" end self.sale.save! diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 35e290e3..88e2bce6 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -195,9 +195,11 @@ -
- + <% if @member_discount%> +
+ + <%end %> diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 85b52488..98ae8f0a 100644 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -7,6 +7,10 @@ <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> + <%= f.input :discount %> + <%= f.input :rebate %> + <%= f.input :bonus %> + <%= f.input :point %> <%= f.input :created_by %> diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index 9099e9e4..f03683e1 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -18,6 +18,10 @@ + + + + @@ -32,6 +36,10 @@ + + + + diff --git a/db/migrate/20170414071634_create_membership_settings.rb b/db/migrate/20170414071634_create_membership_settings.rb index fca5cce4..51127d92 100644 --- a/db/migrate/20170414071634_create_membership_settings.rb +++ b/db/migrate/20170414071634_create_membership_settings.rb @@ -8,7 +8,10 @@ class CreateMembershipSettings < ActiveRecord::Migration[5.1] t.string :auth_token t.string :merchant_account_id t.string :created_by - + t.boolean :discount, :default => false + t.boolean :rebate, :default => false + t.boolean :bonus, :default => false + t.boolean :point, :default => false t.timestamps end end From 3232df44a66ff76f9854c0b7b2595e3c0dc826df Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 13 Jul 2017 09:56:10 +0630 Subject: [PATCH 41/76] update table no --- lib/tasks/menu_osaka.rake | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index e1e5e376..5cdceadb 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -854,44 +854,44 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G puts "Osaka's menu setup" zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table1", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table2", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table3", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table4", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table5", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table6", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table7", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table8", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table9", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table10", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table11", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table12", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table13", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table14", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table15", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table16", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table17", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table18", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table19", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table20", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table21", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table22", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table23", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table24", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table25", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table26", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table27", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table28", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table29", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table30", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table31", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table32", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table33", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From 6f57bb8a7952c080d46de2a74883def37f82da4a Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 13 Jul 2017 11:12:02 +0630 Subject: [PATCH 42/76] adding shift sale summary --- app/assets/stylesheets/origami.scss | 12 ++++++----- app/controllers/origami/shifts_controller.rb | 5 +++++ app/views/origami/home/index.html.erb | 21 ++++++++++++++------ config/routes.rb | 1 + 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..a7b25b7a 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -10,7 +10,8 @@ // padding-top: 4.5rem; // } .card-columns { - font-size: 18px !important;} + font-size: 18px !important; +} .others-payment{ line-height:100px; @@ -53,7 +54,8 @@ .payment{ height:70px;line-height:70px; - align:center;color:white; + align:center; + color:white; font-size:16px; margin-top:5px; } @@ -161,15 +163,15 @@ } .green{ - background-color: #009900 + background-color: #009900; } .orange{ - background-color: #FF8C00 + background-color: #FF8C00; } .blue{ - background-color: blue + background-color: blue; } /* End Colors */ diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index 92f174ae..1f085ac8 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -48,4 +48,9 @@ class Origami::ShiftsController < BaseOrigamiController def edit end + def sale_summary + @shift = ShiftSale.current_open_shift(current_user.id) + + end + end diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 6bdadd85..3afea88d 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -105,9 +105,10 @@
- - - + + + +
@@ -116,20 +117,28 @@ $(document).ready(function(){ $(".tables").on('click', function(){ var dining_id = $(this).attr("data-id"); window.location.href = '/origami/table/' + dining_id; - }) + }); + $(".sales").on('click',function(){ var sale_id = $(this).attr("data-id"); window.location.href = '/origami/sale/' + sale_id; - }) + }); + $(".rooms").on('click', function(){ var dining_id = $(this).attr("data-id"); window.location.href = '/origami/room/' + dining_id; - }) + }); + $(".orders").on('click',function(){ var order_id = $(this).attr("data-id"); window.location.href = '/origami/order/' + order_id; + }); + + $('#sale_summary').on('click',function(){ + window.location.href = '/origami/shift/sale_summary'; }) }); + $(function() { var timer; diff --git a/config/routes.rb b/config/routes.rb index b9549c06..d285cc2e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -114,6 +114,7 @@ Rails.application.routes.draw do resources :shifts, only: [:index, :new, :create, :edit] post 'close_shift' => 'shifts#update_shift' get 'shift/close' => 'shifts#show' + get 'shift/sale_summary' => 'shifts#sale_summary' #shift - index (open/close shift landing page) #shift - show (sales summary display) #shift - new (open shift) From 7a036b8c0a6f2009ad39dc2edb9702dd85ce1773 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 13 Jul 2017 11:34:57 +0630 Subject: [PATCH 43/76] fix for bill --- app/pdf/receipt_bill_pdf.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 1bf4b95f..418a33d9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -165,9 +165,14 @@ class ReceiptBillPdf < Prawn::Document def all_total(sale_data,precision,delimiter) item_name_width = self.item_width y_position = cursor + if sale_data.discount_type == 'member_discount' + dis_type = "Member Discount:" + else + dis_type = "Overall Discount:" + end bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Overall Discount", :size => self.item_font_size,:align => :left + text "#{ dis_type }", :size => self.item_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right From 0b7b5cae308c4d1ce3954b92c36b496692a92038 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 14 Jul 2017 17:23:40 +0630 Subject: [PATCH 44/76] update osaka demo bugs --- app/assets/images/ajax-loader.gif | Bin 0 -> 673 bytes app/assets/stylesheets/origami.scss | 26 ++++++++++++++++++ .../origami/discounts_controller.rb | 6 ++-- app/controllers/origami/home_controller.rb | 4 +-- app/controllers/origami/orders_controller.rb | 2 +- .../origami/payments_controller.rb | 4 +-- app/controllers/origami/rooms_controller.rb | 5 +--- app/controllers/origami/sales_controller.rb | 2 +- app/models/ability.rb | 4 +-- app/views/crm/customers/_new_form.html.erb | 4 +-- app/views/origami/customers/index.html.erb | 4 +-- app/views/origami/discounts/index.html.erb | 20 ++++++-------- .../origami/moveroom/move_dining.html.erb | 8 +++--- .../origami/movetable/move_dining.html.erb | 8 +++--- app/views/origami/orders/show.html.erb | 6 ++-- app/views/origami/payments/show.html.erb | 17 +++++++++--- app/views/origami/rooms/show.html.erb | 2 +- app/views/origami/shifts/new.html.erb | 2 +- .../membership_settings/_form.html.erb | 1 - .../membership_settings/index.html.erb | 2 -- .../order_queue_stations/show.html.erb | 2 +- public/image/loading-ajax.gif | Bin 0 -> 1915 bytes 22 files changed, 76 insertions(+), 53 deletions(-) create mode 100644 app/assets/images/ajax-loader.gif create mode 100755 public/image/loading-ajax.gif diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..4155add2f6d489085271c5c0594173867322cb98 GIT binary patch literal 673 zcmZ?wbhEHb6krfw_{6}lbITS628Q0wP6ItXAj93&H7+J5D?MHDpOkY^YGO%hib8p2 zNrpmVR$@g?eqxGVW?ou8gW^vX1}>m-#sA!Xt|7tBjsdPldIrplKp`C<1{y8Ez`$(G zvFpx1gHxW_!pR&~9FlX`{br!EJg8M-CNU(2bU`yt|CuQi6xwEBm0kDgA6GgcSKeBe5>d9Tc| z71~UZZ^i#GHXr6UTA3m>e?JSwJS>JT?TIpi ztK6D4T$E={3X1(~D{o+-Bh`OmNs*-w%x^5n<`{A8DpJ?>dY&TkLE^JdBad3y;e?o^ zkSVP#JLNJWoixv%au8sadubzoSPg7W&?J~KtjNXyouhDQf~EN5lIMGF%`=cZF7rT9 z&uQD-Q{ihC8S=1kixemB-eCHDDr2L;2F}ji^K&)5VCJwPn*(&toqr!V1#iv?jh)5# z?p9&J)P#<^iF59nOlx&?J8B>@Az}75MqZXf4g#|c8xCDNHxXtGJBBg9m|vahbY+g_ wbvX`>!wP-J3;9?K4OX7our5I25HPyJZY^a}C{2=RninlNfq}sqlyJZR09f(P*8l(j literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..ffd8aded 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -211,3 +211,29 @@ tr.discount-item-row:hover { margin-left:-40px !important; margin-top:-40px !important; } + +/*Loading gif for payment*/ + +#loading_wrapper{ + + position: fixed; + background-color: #C8C8C8 ; + height: 100%; + width: 100%; + left: 0; + opacity: 0.6; + top: 0; + z-index: 9999999; +} +#loading{ + position: relative; + height: 100%; + width: 100%; + background-image: url('../../../image/loading-ajax.gif'); + background-position: center center; + background-repeat: no-repeat; + opacity: 1; + filter: alpha(opacity=100); /* ie */ + -moz-opacity: 1; /* mozilla */ + +} \ No newline at end of file diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 4645ff1d..f7e1c63a 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -189,15 +189,15 @@ class Origami::DiscountsController < BaseOrigamiController discount_amount = discount_amount + response["discount_bonus_earned"] end sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount') - result = {:status=> "Success", :table_id => table_id,:table_type => table_type } + result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type } end if response["status"] == "500" - result = {:status=> response["error"], :table_id => table_id,:table_type => table_type } + result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type } end if !response.nil? if response[:status] == false - result = {:status=> response[:message], :table_id => table_id,:table_type => table_type } + result = {:status=> response[:message],:title=>"Alert", :table_id => table_id,:table_type => table_type } end end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 32f4ab12..7ee03e47 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController def index @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') # @shift = ShiftSale.current_open_shift(current_user.id) end @@ -13,7 +13,7 @@ class Origami::HomeController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @status_order = "" @status_sale = "" diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index ef213ddd..f3cddd74 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('status desc') @order = Order.find(params[:order_id]) sale_order = SaleOrder.find_by_order_id(@order.order_id) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index df1fbfcb..24d63b71 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -91,9 +91,9 @@ class Origami::PaymentsController < BaseOrigamiController #get customer amount @customer = Customer.find(@sale_data.customer_id) - + rebate = MembershipSetting.find_by_rebate(1) # get member information - if @customer.membership_id != nil + if @customer.membership_id != nil && rebate response = Customer.get_member_account(@customer) if response["status"]==true response["data"].each do |res| diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index e5728f99..823136b9 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @room = DiningFacility.find(params[:room_id]) @sale_array = Array.new @@ -31,9 +31,6 @@ class Origami::RoomsController < BaseOrigamiController end end end - puts "hhhhhhhhhh" - puts @status - puts @obj.to_json end diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index c397da0f..3a9586fb 100644 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @sale = Sale.find(params[:sale_id]) end diff --git a/app/models/ability.rb b/app/models/ability.rb index 1cf1d902..f9d98bfc 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -75,8 +75,8 @@ class Ability can :read, Sale can :update, Sale - can :add_customer, Customer - can :update_sale_by_customer, Customer + can :add_customer, Customer + can :update_sale_by_customer, Customer can :index, :other_charge can :create, :other_charge diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 66a16b2b..8b84b4b9 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -46,11 +46,11 @@
- <%= f.input :nrc_no, :class => "form-control nrc_no" %> + <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
- <%= f.input :company, :class => "form-control col-md-6 company",:required => true%> + <%= f.input :company, :class => "form-control col-md-6 company"%> <% flash.each do |name, msg| %> <% str="[\"#{msg['company']}\"]" diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a1d359e8..1f06704b 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -121,10 +121,10 @@
- <%= f.input :nrc_no, :class => "form-control nrc_no" %> + <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
- <%= f.input :company, :class => "form-control col-md-6 company",:required => true%> + <%= f.input :company, :class => "form-control col-md-6 company"%> <% flash.each do |name, msg| %> <% str="[\"#{msg['company']}\"]" diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 88e2bce6..b0e324a5 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -519,7 +519,7 @@ $(document).ready(function(){ } $.confirm({ - title: 'Infomation!', + title: result.title, content: result.status, columnClass: 'small', type: type, @@ -542,18 +542,14 @@ $(document).ready(function(){ } }); }else{ - $.confirm({ - title: 'Alert !', - content: 'Please Select Account', - type: 'red', + $.alert({ + title: 'Alert!', + content: 'Please Select Account', + type: 'red', typeAnimated: true, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-danger', - } - } - }); + btnClass: 'btn-danger', + }); + } });//end member discount diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb index a8620d6e..3cc878a3 100644 --- a/app/views/origami/moveroom/move_dining.html.erb +++ b/app/views/origami/moveroom/move_dining.html.erb @@ -15,13 +15,13 @@ -
+
-
+
<% @tables.each do |table| %> <% if table.status == 'occupied' %>
@@ -42,7 +42,7 @@
-
+
<% @rooms.each do |room| %> <% if room.status == 'occupied' %>
@@ -95,7 +95,7 @@
-
+
Membership TransactionsCurrent Balance : <%= @balance%>
DateRedeemRebateBalanceDiscount Amount From Account Status Receipt No
<%= transaction["date"]%><%= transaction["redeem"]%> <%= transaction["rebate"] %><%= transaction["balance"] %> <%= transaction["account_status"] %> <%= transaction["status"] %> <%= transaction["receipt_no"] %>
Discount:Member Discount:Discount:(<%=@sale_data.total_discount rescue 0%>)
Discount:Member Discount:Discount:(<%= @obj_sale.total_discount rescue 0%>)
<%= sub_total %>
Discount:Member Discount:Discount:(<%=@selected_item.total_discount rescue 0%>)
<%=sub_total%>
Member Discount:Discount:(<%=@sale_data.total_discount rescue 0%>)
(Discount)Member Discount:(Discount)(<%=@sale_data.total_discount rescue 0%>)
Discount:Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
<%= sub_total %>
Discount:Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
<%= sub_total %>
Discount:Member Discount:Discount:(<%=@obj.total_discount rescue 0%>)
<%= sub_total %>
Discount:Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
Discount:Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
<%= sub_total %>
Discount:Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
<%= sub_total %>
Member Discount:Discount:Gateway url Auth token Merchant accountDiscountRebateBonusPoint Created by
<%= settings_membership_setting.gateway_url %> <%= settings_membership_setting.auth_token %> <%= settings_membership_setting.merchant_account rescue ''%><%= settings_membership_setting.discount %><%= settings_membership_setting.rebate %><%= settings_membership_setting.bonus %><%= settings_membership_setting.point %> <%= settings_membership_setting.created_by %> <%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %> <%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %>
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index d64b71f0..d8abdd86 100644 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -15,13 +15,13 @@ -
+
-
+
<% @tables.each do |table| %> <% if table.status == 'occupied' %>
@@ -42,7 +42,7 @@
-
+
<% @rooms.each do |room| %> <% if room.status == 'occupied' %>
@@ -95,7 +95,7 @@
-
+
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index e8c391d1..bc614504 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -175,11 +175,9 @@ - <%if @selected_item.discount_type == 'member_discount'%> - - <%else%> + - <%end%> + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 63b6b0d0..83373b8e 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -1,4 +1,6 @@ - +
@@ -104,6 +106,7 @@
+
Amount Due
@@ -258,6 +261,8 @@
+ +
+ \ No newline at end of file diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 988bcf5a..d115b765 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -203,7 +203,7 @@ - <%if @obj.discount_type == 'member_discount'%> + <%if @obj != nil && @status_sale == 'sale' && @obj.discount_type == 'member_discount'%> <%else%> diff --git a/app/views/origami/shifts/new.html.erb b/app/views/origami/shifts/new.html.erb index 8d3ca457..a8ded240 100644 --- a/app/views/origami/shifts/new.html.erb +++ b/app/views/origami/shifts/new.html.erb @@ -110,7 +110,7 @@ $(document).on('focusout', '.float-value', function(event){ $('#open_cashier').on('click',function(){ var cashier_terminal = $('#cashier_terminal').val(); - var amount = $('#total').text(); + var amount = $('#total').text()||0; $.ajax({type: "POST", url: "<%= origami_shifts_path %>", data: "opening_balance=" + amount + "&cashier_terminal="+ cashier_terminal, diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 98ae8f0a..77a189c4 100644 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -11,7 +11,6 @@ <%= f.input :rebate %> <%= f.input :bonus %> <%= f.input :point %> - <%= f.input :created_by %>
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index f03683e1..e382f026 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -22,7 +22,6 @@
- @@ -40,7 +39,6 @@ - diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index fbb19182..97c5dd4c 100644 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -32,7 +32,7 @@ - + diff --git a/public/image/loading-ajax.gif b/public/image/loading-ajax.gif new file mode 100755 index 0000000000000000000000000000000000000000..e3d3cb83b4e3064e6f430ca5a50861d20e12531e GIT binary patch literal 1915 zcmciDc}&w+00;02zn(HwkhTyUJ!nfOC=**H6brT>Y~lep3@T8D77BtOObc>|9OWvu z^Z;uCD|ewvfeHg1N6T4Ibchy&;SdQfVa_et{uwKnC1$eBWZ7Qw{(AZ4z0dcX-+Kpq zz4yAZsGvQdHz3f;%8I$Uc}7MCnM}5|wKW(FAt50%GcyAN0|5a60)fD|`tHE~2EY*@ z5D5Fb4I|++EAey$=0a3rB!3r;;Eg8IOrbzqzL#B5i?J-0pb7d6y&% zldF+BNAz8*)`d9dAV(IuH=SIwxi-e4N$i=A4rj?Zll!FHgrRydq;Kj z*Nm!)-af6ae_&A7!@p}Cdpx*an-+UNhF#5lnh|wsPXvo-bq)^Bn&z!o;O^(xlxz;xpWRefLQD+`w%Aly*t6*uOCUn)IPWRim?+$q5A0PpjVhM0@oW zZFUp0WiH1KWmdKw&B-zG<=R_)rMbL2u<@AJ;g5Sj`fFNEf}hX+N#-*dSv4ISUm zxzE`R%7Ub&XXoVd^71WUa0(n&V1&n5F?;iyaQbXgp-CdRQIKvmEc zkyXtX%Vct)C|n}6EGq8oUhQzmveZF;j#kNhfNvyCaB7K@Cm#{j__3MxVcwk1NYpKL zuMvss5=Y-}@$ZR4yUE34DAAxSKc5oKW?M?yDLY})ZUWuV5CmmIYI|CIHOirZ%5Hy=nNG#0+1R8at;NuY z5F+rIc$gGu3-l(arEu(3`+JlD@z5~#n!Q%o|Dcj^SK7_JQ`q6tY1P~^MIToVE{-Z+ z{xEs#$L;G1NB#>TZ6AL=^hxk18P;r{Y;-O?4|#=AgifOil11XxAMqd!je-!t6x0eAf86z20Pe!UsHmZy z*j9?>6t=1McC6a2MpYlH#NAL-q1F=dk;(h5!0d;j`wED-byg*wrp<_q0Z5?Jkfkz* z{|$&^DkL7?ZC?eXTfj1@Y4mtx3J-u6aFE4RIvXXXNIg+}p1?IGIJY=o;ctC8Gb=lX zpQ=)~w6?u1w*}1ZI{G=TBNK9{1S2MvVuwTJSS_vJWzfzDimt~)wGe}5TcP@9t6sgR zT4&J=o7ZUe1^bclQ2J{8+K9fol&<;*INv!pxt3F0Jnj5LMU6K4nW=6auL RpY|=j7}ptrge@SqKLBjxAp-ya literal 0 HcmV?d00001 From b2ccc12e179eeeb7ac5b93b2d624be4989b0bd7f Mon Sep 17 00:00:00 2001 From: Yan Date: Sun, 16 Jul 2017 18:16:52 +0630 Subject: [PATCH 45/76] add paypar acc for nfc --- app/assets/stylesheets/CRM.scss | 29 +++++++++++++ app/assets/stylesheets/OQS.scss | 2 +- app/assets/stylesheets/origami.scss | 29 +++++++++++++ app/controllers/crm/customers_controller.rb | 7 ++- app/controllers/home_controller.rb | 2 +- app/models/customer.rb | 1 + .../crm/customers/_crm_customer.json.jbuilder | 2 +- app/views/crm/customers/_new_form.html.erb | 43 +++++++++++++++++-- app/views/crm/customers/index.html.erb | 3 +- app/views/crm/customers/show.json.jbuilder | 2 +- app/views/origami/customers/index.html.erb | 38 +++++++++++++++- db/migrate/20170622050926_create_customers.rb | 1 + 12 files changed, 148 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index cf6782dd..4f14b531 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -52,4 +52,33 @@ @include media-breakpoint-only(xl) { column-count: 5; } +} + +#sxModal { + display: none; + overflow: auto; + width: 100%; + height: 100%; + background-color: #000; + background-color: rgba(0,0,0,0.4); + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1100; +} + +#sxModal-Content { + position: relative; + left: 42%; + top: 30%; + background-color: #d9534f; + color: #fff; + text-align: center; + width: 200px; + height: 200px; + padding-top: 5%; + border-radius: 100px; + z-index: 1101; } \ No newline at end of file diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 57c5a36d..74a8032f 100644 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -24,4 +24,4 @@ width: 49%; font-size: 18px; margin: 0px 0px 5px 0px; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..62a17d2c 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -211,3 +211,32 @@ tr.discount-item-row:hover { margin-left:-40px !important; margin-top:-40px !important; } + +#sxModal { + display: none; + overflow: auto; + width: 100%; + height: 100%; + background-color: #000; + background-color: rgba(0,0,0,0.4); + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1100; +} + +#sxModal-Content { + position: relative; + left: 42%; + top: 30%; + background-color: #d9534f; + color: #fff; + text-align: center; + width: 200px; + height: 200px; + padding-top: 5%; + border-radius: 100px; + z-index: 1101; +} diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index bbfdb912..ab79b9e8 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -81,6 +81,7 @@ class Crm::CustomersController < BaseCrmController address = customer_params[:address] nrc = customer_params[:nrc_no] card_no = customer_params[:card_no] + paypar_account_no = customer_params[:paypar_account_no] member_group_id = params[:member_group_id] if member_group_id.present? @@ -95,6 +96,7 @@ class Crm::CustomersController < BaseCrmController response = HTTParty.post(url, :body => {name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc,card_no:card_no, + paypar_account_no: paypar_account_no, member_group_id: member_group_id, merchant_uid:merchant_uid,auth_token:auth_token}.to_json, :headers => { @@ -172,6 +174,7 @@ end address = customer_params[:address] nrc = customer_params[:nrc_no] card_no = customer_params[:card_no] + paypar_account_no = customer_params[:paypar_account_no] id = @crm_customer.membership_id member_group_id = params[:member_group_id] @@ -187,6 +190,7 @@ end response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc, + paypar_account_no: paypar_account_no, card_no:card_no,member_group_id: member_group_id, merchant_uid:merchant_uid,auth_token:auth_token}.to_json, :headers => { @@ -231,6 +235,7 @@ end response = HTTParty.post(url, :body => {name: name,phone: phone,email: email, dob: dob,address: address,nrc:nrc,card_no:card_no, + paypar_account_no: paypar_account_no, id: id,member_group_id:member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -287,6 +292,6 @@ end def customer_params params.require(:customer).permit(:name, :company, :contact_no, :email, - :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no) + :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no) end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index fb37dbdc..29e9d371 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -84,7 +84,7 @@ class HomeController < ApplicationController if !shift.nil? redirect_to origami_root_path else - redirect_to dashboard_path + redirect_to crm_customers_path end elsif employee.role == "cashier" #check if cashier has existing open cashier diff --git a/app/models/customer.rb b/app/models/customer.rb index 2f09ff12..83a652d3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,6 +10,7 @@ class Customer < ApplicationRecord validates :contact_no, uniqueness: true validates :email, uniqueness: true validates :card_no, uniqueness: true + validates :paypar_account_no, uniqueness: true paginates_per 50 diff --git a/app/views/crm/customers/_crm_customer.json.jbuilder b/app/views/crm/customers/_crm_customer.json.jbuilder index 1b1b237e..c0d66225 100644 --- a/app/views/crm/customers/_crm_customer.json.jbuilder +++ b/app/views/crm/customers/_crm_customer.json.jbuilder @@ -1,2 +1,2 @@ -json.extract! crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at,:salutation, :gender,:nrc_no,:address,:card_no +json.extract! crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at,:salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no json.url crm_customer_url(crm_customer, format: :json) diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 66a16b2b..b51aac36 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -1,7 +1,5 @@
- <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> @@ -15,6 +13,14 @@ <% end -%>
+
+ +
+ +
+
+
+

@@ -107,11 +113,40 @@
-
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
<%end%> - \ No newline at end of file + + +
+

Card Tap

+
+ + \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a44aed2f..955395ef 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -119,7 +119,7 @@ $(document).on('click',".customer_tr",function(){ url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { $('#customer_id').val(data.id); $('#customer_name').val(data.name); $('#customer_company').val(data.company); @@ -128,6 +128,7 @@ $(document).on('click',".customer_tr",function(){ $('#customer_salutation').val(data.salutation); $('#customer_nrc_no').val(data.nrc_no); $('#customer_card_no').val(data.card_no); + $('#paypar_account_no').val(data.paypar_account_no); $('#customer_address').val(data.address); $('#customer_date_of_birth').val(data.date_of_birth); $('#customer_membership_type').val(data.membership_type); diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder index 86901801..5fd0410a 100644 --- a/app/views/crm/customers/show.json.jbuilder +++ b/app/views/crm/customers/show.json.jbuilder @@ -1,4 +1,4 @@ json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, - :salutation, :gender,:nrc_no,:address,:card_no + :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no json.url crm_customer_url(@crm_customer, format: :json) diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a1d359e8..4d03d48f 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -34,6 +34,7 @@ + @@ -54,7 +55,7 @@ - + <% end %> @@ -89,6 +90,14 @@ <%= str %> <% end -%> +
+ +
+ <%= #f.input :paypar_account_no, :id => "paypar_account_no", :class => "form-control" %> + +
+
+

@@ -192,6 +201,10 @@
+
+

Card Tap

+
+ diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 996393ac..7e70615f 100644 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -35,7 +35,7 @@ - + @@ -59,7 +59,8 @@ <% foc = 0 %> <% discount = 0 %> <% total = 0 %> - <% grand_total = 0 %> + <% grand_total = 0 %> + <% old_grand_total = 0 %> <% count = 1 %> <% rounding_adj = 0 %> <% @sale_data.each do |sale| %> <% void += sale[:void_amount] %> @@ -74,6 +75,7 @@ <% discount += sale[:total_discount] %> <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f %> <% grand_total += sale[:grand_total].to_f %> + <% old_grand_total += sale[:old_grand_total].to_f %> <% rounding_adj += sale[:rounding_adj].to_f %> @@ -90,25 +92,25 @@ - + <% count = count + 1 %> <% end %> - - - - - + + + + + - + <% total_tax = 0 %> @@ -135,54 +137,3 @@ - - - \ No newline at end of file diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 67e76e3c..424f3b63 100644 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -1,12 +1,11 @@ -
+
+
<%= sub_total %>
Member Discount:Discount:(<%=@selected_item.total_discount rescue 0%>)
<%= sub_total %>
Member Discount:Discount: Rebate Bonus PointCreated by
<%= settings_membership_setting.rebate %> <%= settings_membership_setting.bonus %> <%= settings_membership_setting.point %><%= settings_membership_setting.created_by %> <%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %> <%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %>
<%= @settings_order_queue_station.station_name %> <%= @settings_order_queue_station.is_active %> <%= @settings_order_queue_station.auto_print %><%= @settings_order_queue_station.processing_items %><%= JSON.parse(@settings_order_queue_station.processing_items).count %> <%= @settings_order_queue_station.print_copy %> <%= @settings_order_queue_station.printer_name %> <%= @settings_order_queue_station.font_size %>Company Contact no Email
<%= crm_customer.company rescue '-' %> <%= crm_customer.contact_no %> <%= crm_customer.email %>
Master Sales Visa Sales Jcb SalesPaypar SalesRedeem Sales Cash Sales Credit Sales FOC Sales
<%= count %>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>) <%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%>
Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%> (<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>) <%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%>
- <% if params[:from]%> - + - <% end %> @@ -15,7 +14,7 @@ - + @@ -39,7 +38,8 @@ <% foc = 0 %> <% discount = 0 %> <% total = 0 %> - <% grand_total = 0 %> + <% grand_total = 0 %> + <% old_grand_total = 0 %> <% count = 1 %> <% rounding_adj = 0 %> <% @sale_data.each do |sale| %> <% void += sale[:void_amount] %> @@ -48,12 +48,13 @@ <% visa += sale[:visa_amount] %> <% jcb += sale[:jcb_amount] %> <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount] %> + <% cash += sale[:cash_amount]-sale[:total_change_amount] %> <% credit += sale[:credit_amount] %> <% foc += sale[:foc_amount] %> <% discount += sale[:total_discount] %> - <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f %> <% grand_total += sale[:grand_total].to_f %> + <% old_grand_total += sale[:old_grand_total].to_f %> <% rounding_adj += sale[:rounding_adj].to_f %> @@ -64,31 +65,31 @@ - + - + - + <% count = count + 1 %> <% end %> - - - - - + + + + + - + <% total_tax = 0 %> @@ -113,4 +114,5 @@ <% end %>
Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>) Sale (<%= from rescue '-' %> - <%= to rescue '-'%>)
Sr.no DateMaster Sales Visa Sales Jcb SalesPaypar SalesRedeem Sales Cash Sales Credit Sales FOC Sales
<%= count %><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%> (<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%>
Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%> (<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>) <%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%>
-
\ No newline at end of file +
+ diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb index 8e1de8e2..c6308a66 100644 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -6,6 +6,7 @@
- + <% if defined? payments %>
- - + + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>
+ <% end %>
@@ -41,7 +36,8 @@
- +
@@ -49,70 +45,6 @@
<% end %> - - -
-
- <% if defined? promotions %> - <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> - <% end %> - - <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> - <% end %> - - <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> - <% end %> - - - - <% if defined? cashiers %> - <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> - <% end %> - - <% if defined? singer %> - <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> - <% end %> - - <% if defined? bsm %> - <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - - <% if defined? guest_role %> - <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> - <% end %> - - <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> - <% end %> - - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> - <% end %> -
-
- - - <% end %> @@ -150,12 +82,22 @@ $(function(){ } }); + <% if params[:shift_name].to_i > 0%> + shift_id = '<%= params[:shift_name] %>' + local_date = '<%= @shift_from %> - <%= @shift_to %> ' + var shift = $('#shift_name'); + str = ''; + shift.append(str); +<% end %> - -// $("#from").val("<%=params[:from] rescue '-'%>"); -// $("#to").val("<%=params[:to] rescue '-'%>"); -// $("#sel_period").val(<%=params[:period] rescue '-'%>); -// $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); + $("#from").val("<%=params[:from] rescue '-'%>"); + $("#to").val("<%=params[:to] rescue '-'%>"); + $("#sel_period").val(<%=params[:period] rescue '-'%>); + $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); + // shift = $(".shift-id").text() + // if (shift.length>0) { + // $('.shift_name > option[value="'+shift+'"]').attr('selected','selected'); + // } <% if params[:period_type] == 1 || params[:period_type] == "1" %> $("#rd_period_type_1").attr("checked","checked"); diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index d4438d43..30689437 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -7,35 +7,36 @@
<%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_receipt_no_index_path} %> + :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
- +
- <% if !params[:from].blank?%> - - - - <% end %> - <% if @shift_from %> - - <% if @shift.employee %> - <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> - <% end %> - - - <% end %> + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> @@ -61,53 +62,54 @@ <% other_amt = 0 %> <% total_nett = 0 %> <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> + <%if @sale_data %> + <% @sale_data.each do |result| %> - <% @sale_data.each do |result| %> + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + + + + + + + + + + + - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - - - - - - - - - - - - - <% end %> - - - - - - - - - - - - - - - - - - - + <% end %> + + + + + + + + + + + + + + + + + + + + <%end%>
From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
Recipt No
<%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= result.total_tax rescue '-' %><%= result.old_grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
<%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= result.total_tax rescue '-' %><%= result.grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
 <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
 Total AmountDiscount AmountTax AmountGrand TotalRounding Adj.Grand Total +
- Rounding Adj. -
 <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= old_grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
 Total AmountDiscount AmountTax AmountGrand TotalRounding Adj.Grand Total +
+ Rounding Adj. +
@@ -181,9 +183,9 @@ var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date; var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date; - + var shift_id = data.message[index].shift_id ; if(param_shift != ''){ - if(sh_date == param_shift){ + if(shift_id == param_shift){ selected = 'selected = "selected"'; } else{ @@ -192,7 +194,7 @@ }else{ selected = ''; } - str += ''; + str += ''; // console.log(sh_date) }) diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index b55a40c4..2739356d 100644 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -2,19 +2,20 @@
- <% if !params[:from].blank?%> - - - - <% end %> - <% if @shift_from %> - - <% if @shift.employee %> - <% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %> - <% end %> - - - <% end %> + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> @@ -32,6 +33,7 @@ <% grand_total = 0 %> + <% old_grand_total = 0 %> <% total_tax = 0 %> <% guest_count = 0 %> <% total_sum = 0 %> @@ -39,52 +41,54 @@ <% other_amt = 0 %> <% total_nett = 0 %> <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> + <%if @sale_data %> + <% @sale_data.each do |result| %> - <% @sale_data.each do |result| %> + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + + + + + + + + + + + - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - - - - - - - - - - - - - <% end %> - - - - - - - - - - - - - - - - - - - + <% end %> + + + + + + + + + + + + + + + + + + + + <%end%>
From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
Recipt No
<%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= result.total_tax rescue '-' %><%= result.old_grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
<%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= sprintf "%.2f",result.total_tax rescue '-' %><%= result.grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
 <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= grand_total.to_f.round + rounding_adj %>
 Total AmountDiscount AmountTax AmountGrand TotalRounding Adj.Grand Total +
- Rounding Adj. -
 <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= old_grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
 Total AmountDiscount AmountTax AmountGrand TotalRounding Adj.Grand Total +
+ Rounding Adj. +
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index 5c8c47b1..9ed12d12 100644 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -41,7 +41,8 @@
- +
@@ -49,74 +50,6 @@
<% end %> - - -
-
- <% if defined? promotions %> - <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> - <% end %> - - <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> - <% end %> - - <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> - <% end %> - - <% if defined? shift_name %> - - <% end %> - - <% if defined? cashiers %> - <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> - <% end %> - - <% if defined? singer %> - <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> - <% end %> - - <% if defined? bsm %> - <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - - <% if defined? guest_role %> - <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> - <% end %> - - <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> - <% end %> - - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> - <% end %> -
-
- - - <% end %> @@ -152,20 +85,19 @@ $(function(){ } }); -//Reset the form to pervious values -$("#branch").val(<%=params[:branch]%>); -$("#waiter").val("<%=params[:waiter]%>"); -$("#cashier").val(<%=params[:cashier]%>); -$("#product").val(<%=params[:product]%>); -$("#singer").val(<%=params[:singer]%>); -$("#item").val('<%=params[:item]%>'); -$("#guest_role").val('<%=params[:guest_role]%>'); + <% if params[:shift_name].to_i > 0%> + shift_id = '<%= params[:shift_name] %>' + local_date = '<%= @shift_from %> - <%= @shift_to %> ' + var shift = $('#shift_name'); + str = ''; + shift.append(str); +<% end %> + $("#from").val("<%=params[:from] rescue '-'%>"); + $("#to").val("<%=params[:to] rescue '-'%>"); + $("#sel_period").val(<%=params[:period] rescue '-'%>); + $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); -$("#from").val("<%=params[:from]%>"); -$("#to").val("<%=params[:to]%>"); -$("#sel_period").val(<%=params[:period]%>); -$("#sel_sale_type").val(<%=params[:sale_type]%>); <% if params[:period_type] == 1 || params[:period_type] == "1" %> $("#rd_period_type_1").attr("checked","checked"); @@ -195,4 +127,4 @@ $('#item').change(function(){ } } }); - \ No newline at end of file + diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 7f51fee5..6a9c5620 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -134,15 +134,11 @@ <%= grand_total%> <% end %> - - - + <%= @grand_total - @change_amount%> + @@ -256,9 +252,10 @@ var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date; var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date; + var shift_id = data.message[index].shift_id ; if(param_shift != ''){ - if(sh_date == param_shift){ + if(shift_id == param_shift){ selected = 'selected = "selected"'; } else{ @@ -270,7 +267,7 @@ } - str += ''; + str += ''; // console.log(sh_date) }) @@ -278,10 +275,5 @@ }); } - //total price by account - - $('#items_table tr').each(function(i){ - - }); }); \ No newline at end of file diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb index 34173d99..1ccf99ad 100644 --- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb @@ -18,18 +18,7 @@ - - +
@@ -39,6 +28,11 @@
+
+ + +
@@ -82,15 +76,13 @@ $(function(){ }); //Reset the form to pervious values -$("#branch").val(<%=params[:branch]%>); -$("#waiter").val("<%=params[:waiter]%>"); -$("#cashier").val(<%=params[:cashier]%>); -$("#product").val(<%=params[:product]%>); -$("#singer").val(<%=params[:singer]%>); -$("#item").val('<%=params[:item]%>'); -$("#guest_role").val('<%=params[:guest_role]%>'); - - +<% if params[:shift_name].to_i > 0%> + shift_id = '<%= params[:shift_name] %>' + local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>' + var shift = $('#shift_name'); + str = ''; + shift.append(str); +<% end %> $("#from").val("<%=params[:from]%>"); $("#to").val("<%=params[:to]%>"); $("#sel_period").val(<%=params[:period]%>); diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 714a8328..e8f2d1d8 100644 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -7,7 +7,7 @@
<%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_shiftsale_index_path} %> + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
@@ -110,5 +110,94 @@ + From bd0b8681c988ef54bb8e7981a07128664ed63b10 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 17 Jul 2017 12:11:21 +0630 Subject: [PATCH 47/76] update reports --- .../reports/saleitem_controller.rb | 223 +---------------- app/models/sale.rb | 7 +- app/views/reports/saleitem/index.xls.erb | 232 +++++++++++------- 3 files changed, 144 insertions(+), 318 deletions(-) diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index c9715fc3..b9f71494 100644 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -66,226 +66,5 @@ class Reports::SaleitemController < BaseReportController format.json { render json: out } end end - - # def get_date_range_from_params - # period_type = params[:period_type] - # period = params[:period] - # from = params[:from] - # to = params[:to] - # branch = params[:branch] - # report_type = params[:report_type] - - # shift_name = params[:shift_name] - # unless shift_name.nil? - # shift_arr = shift_name.split(' - ') - # shift_from = shift_arr[0] - # shift_to = shift_arr[1] - # end - - # day_ref = Time.now - - # if period_type.to_i == 1 - # ### =>search by from and to - # unless shift_name.nil? - # if shift_name.to_s == '0' - # ### => all shift - # #f_date = DateTime.parse(from) - # #t_date = DateTime.parse(to) - # if params[:from] && params[:to] - # if params[:from] != "" && params[:to] !="" - # f_date = DateTime.strptime(from, "%m/%d/%Y") - # t_date = DateTime.strptime(to, "%m/%d/%Y") - - # f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) - # t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) - # from = f_time.beginning_of_day.utc - # to = t_time.end_of_day.utc - # end - # else - # from = day_ref.beginning_of_day.utc - # to = day_ref.end_of_day.utc - # end - # else - # unless shift_from == '-' - # f_date = DateTime.parse(shift_from) - # from = f_date - # else - # from = '' - # end - - # unless shift_to == '-' - # t_date = DateTime.parse(shift_to) - # to = t_date - # else - # to = '' - # end - # end - # else - # # f_date = DateTime.parse(from) - # # t_date = DateTime.parse(to) - # if params[:from] && params[:to] - # if params[:from] != "" && params[:to] !="" - # f_date = DateTime.strptime(from, "%m/%d/%Y") - # t_date = DateTime.strptime(to, "%m/%d/%Y") - # f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) - # t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) - # from = f_time.beginning_of_day.utc - # to = t_time.end_of_day.utc - # end - # else - # from = day_ref.beginning_of_day.utc - # to = day_ref.end_of_day.utc - # end - # end - # else - # ### => search by Today or yesterday - # unless shift_name.nil? - # if shift_name.to_s == '0' - # ### => all shift - # case period.to_i - # when PERIOD["today"] - - # from = day_ref.beginning_of_day.utc - # to = day_ref.end_of_day.utc - - # when PERIOD["yesterday"] - # from = (day_ref - 1.day).beginning_of_day.utc - # to = (day_ref - 1.day).end_of_day.utc - - # when PERIOD["this_week"] - # from = Time.now.beginning_of_week.utc - # to = Time.now.utc - # when PERIOD["last_week"] - # from = (day_ref - 7.day).beginning_of_week.utc - # to = (day_ref - 7.day).end_of_week.utc - # when PERIOD["last_7"] - # from = (day_ref - 7.day).utc - # to = Time.now.utc - # when PERIOD["this_month"] - # from = Time.now.beginning_of_month.utc - # to = Time.now.utc - # when PERIOD["last_month"] - # from = (day_ref - 1.month).beginning_of_month.utc - # to = (day_ref - 1.month).end_of_month.utc - # when PERIOD["last_30"] - # from = (day_ref - 30.day).utc - # to = Time.now.utc - # when PERIOD["this_year"] - # from = Time.now.beginning_of_year.utc - # to = Time.now.utc - # when PERIOD["last_year"] - # from = (day_ref - 1.year).beginning_of_year.utc - # to = (day_ref - 1.year).end_of_year.utc - - # end - - # else - # unless shift_from == '-' - # f_date = DateTime.parse(shift_from) - # # f_date = DateTime.strptime(shift_from, "%m/%d/%Y") - # #f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec) - # from = f_date - # else - # from = '' - # end - - # unless shift_to == '-' - # t_date = DateTime.parse(shift_to) - # # t_date = DateTime.strptime(shift_to, "%m/%d/%Y") - - # #t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec) - # to = t_date - # else - # to = '' - # end - # end - # else - # if params[:report_type].to_i != 0 - # r_type = params[:report_type].to_s - - # if r_type == 'shift_item' - - # case period.to_i - # when PERIOD["today"] - - # from = day_ref.beginning_of_day.utc - # to = day_ref.end_of_day.utc - - # when PERIOD["yesterday"] - # from = (day_ref - 1.day).beginning_of_day.utc - # to = (day_ref - 1.day).end_of_day.utc - - # when PERIOD["this_week"] - # from = Time.now.beginning_of_week.utc - # to = Time.now.utc - # when PERIOD["last_week"] - # from = (day_ref - 7.day).beginning_of_week.utc - # to = (day_ref - 7.day).end_of_week.utc - # when PERIOD["last_7"] - # from = (day_ref - 7.day).utc - # to = Time.now.utc - # when PERIOD["this_month"] - # from = Time.now.beginning_of_month.utc - # to = Time.now.utc - # when PERIOD["last_month"] - # from = (day_ref - 1.month).beginning_of_month.utc - # to = (day_ref - 1.month).end_of_month.utc - # when PERIOD["last_30"] - # from = (day_ref - 30.day).utc - # to = Time.now.utc - # when PERIOD["this_year"] - # from = Time.now.beginning_of_year.utc - # to = Time.now.utc - # when PERIOD["last_year"] - # from = (day_ref - 1.year).beginning_of_year.utc - # to = (day_ref - 1.year).end_of_year.utc - - # end - # end - # else - # ### => report not shift - # case period.to_i - # when PERIOD["today"] - # from = day_ref.beginning_of_day.utc - # to = day_ref.end_of_day.utc - - # when PERIOD["yesterday"] - # from = (day_ref - 1.day).beginning_of_day.utc - # to = (day_ref - 1.day).end_of_day.utc - - # when PERIOD["this_week"] - # from = Time.now.beginning_of_week.utc - # to = Time.now.utc - # when PERIOD["last_week"] - # from = (day_ref - 7.day).beginning_of_week.utc - # to = (day_ref - 7.day).end_of_week.utc - # when PERIOD["last_7"] - # from = (day_ref - 7.day).utc - # to = Time.now.utc - # when PERIOD["this_month"] - # from = Time.now.beginning_of_month.utc - # to = Time.now.utc - # when PERIOD["last_month"] - # from = (day_ref - 1.month).beginning_of_month.utc - # to = (day_ref - 1.month).end_of_month.utc - # when PERIOD["last_30"] - # from = (day_ref - 30.day).utc - # to = Time.now.utc - # when PERIOD["this_year"] - # from = Time.now.beginning_of_year.utc - # to = Time.now.utc - # when PERIOD["last_year"] - # from = (day_ref - 1.year).beginning_of_year.utc - # to = (day_ref - 1.year).end_of_year.utc - # end - # end - # end - - - - # end - - # return from, to,report_type - # end - + end diff --git a/app/models/sale.rb b/app/models/sale.rb index 8fa54a7c..4e47f6cd 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -602,14 +602,15 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty payment_type = " and sale_payments.payment_method = '#{payment_type}'" end end + puts payment_type + query = Sale.all if shift.present? - query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.total_amount != 0", shift.to_a) + query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - else - query = query .where("sale_status=? #{payment_type} and sales.shift_sale_id in (?)","completed",shift_sale_range.to_a) + query = query .where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") end diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb index 3773619b..dfdd77dc 100644 --- a/app/views/reports/saleitem/index.xls.erb +++ b/app/views/reports/saleitem/index.xls.erb @@ -1,104 +1,150 @@ - - - - - - - -
-<% unless @sale_data.blank? %> +
+
+
+ - - +
+ - <% if !params[:from].blank?%> - - + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + <% unless @sale_data.blank? %> + <% acc_arr = Array.new %> + <% cate_arr = Array.new %> + + <% sub_total = 0.0 %> + <% count = 0%> + <% total_price = 0.0 %> + <% cate_count = 0 %> + <% acc_count = 0%> + <% grand_total = 0%> + <% total_qty = 0%> + <% total_amount = 0 %> + <% discount = 0%> + + <% @sale_data.each do |sale| %> + <% total_qty += sale.total_item %> + + <% if !acc_arr.include?(sale.account_id) %> + + + + + + + <% acc_arr.push(sale.account_id) %> + + <% end %> + + + <% if !cate_arr.include?(sale.menu_category_id) %> + + <% cate_arr.push(sale.menu_category_id) %> + <% else %> + + <% end %> + + + + + + + + + + <% @menu_cate_count.each do |key,value| %> + <% if sale.menu_category_id == key %> + + <% count = count + 1 %> + <% sub_total += sale.grand_total %> + <% if count == value %> + + + + + + + <% sub_total = 0.0%> + <% count = 0%> + <% end %> + <% end %> + <% end %> + + + + <% end %> + + + + + + + + + <% end %> + + + + + - <% end %> - <% if @shift_from %> - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - - - - - - - <% acc_arr = Array.new %> - <% cate_arr = Array.new %> - - <% sub_total = 0.0 %> - <% count = 0%> - <% total_price = 0.0 %> - <% cate_count = 0 %> - <% acc_count = 0%> - <% grand_total = 0%> - <% total_discount = 0.0 %> - - <% @sale_data.order("total_item desc").each do |sale| %> - - - - <% if !cate_arr.include?(sale.menu_category_id) %> - - <% cate_arr.push(sale.menu_category_id) %> - <% else %> - - <% end %> - - <% if @item_table == 'sale' %> - <% if sale.item_remark == 'FOC' %> - - <% elsif sale.item_remark == 'FOC ITEM' %> - - <% elsif sale.item_remark == 'DISCOUNT' %> - - <% else %> - - <% end %> - <% if sale.item_remark == 'DISCOUNT' %> - - - - <% total_price += sale.total_price %> - <% else %> - - - - <% end %> - <% else %> - - - - - <% end %> + + + - - - - - <% grand_total += sale.grand_total%> - <% end %> + + + + + + + + + + + + + + + - + + - +
From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
 Menu CategoryCodeProductTotal ItemUnit PriceRevenue
<%= sale.account_name %> Total Price By <%= sale.account_name %> + <% @totalByAccount.each do |account, total| %> + <% if sale.account_id == account %> + <%= total %> + <% grand_total += total %> + <% end %> + <% end %> +
 <%= sale.menu_category_name %> <%= sale.item_code rescue '-' %><%= sale.product_name rescue '-' %><%= sale.total_item rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total rescue '-' %>
 Sub Total<%= sub_total %>
 Total Item<%= total_qty%>Total Amount<%= grand_total%>
 Cash Received<%= @cash_data - @change_amount %>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
 Menu CategoryCodeProductTotal ItemUnit PriceRevenue
 <%= sale.menu_category_name %> <%= sale.code rescue '-' %><%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %><%= sale.product_name.to_s rescue '-' %> - - <%= sale.total_price.abs rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %><%= sale.product_name.to_s rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %> Card Sales<%= @card_data %>
 Credit Sales<%= @credit_data %>
 FOC Sales<%= @foc_data %>
 Discount Amount<%= @discount_data %>
  Grand Total<%= grand_total + total_discount %><%= @grand_total - @change_amount%>
-<% end %>
- - \ No newline at end of file +
+
From 51c14f379bfb555f3d204d2cc336675d7defa0de Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 17 Jul 2017 15:07:27 +0630 Subject: [PATCH 48/76] still nfc --- app/assets/stylesheets/CRM.scss | 2 +- app/models/customer.rb | 2 +- app/views/crm/customers/_new_form.html.erb | 20 ++++++++++++-------- app/views/crm/customers/index.html.erb | 17 +++++++++++++++-- app/views/origami/customers/index.html.erb | 1 + 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 4f14b531..82b84afd 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -73,7 +73,7 @@ position: relative; left: 42%; top: 30%; - background-color: #d9534f; + background-color: #32ad1a; color: #fff; text-align: center; width: 200px; diff --git a/app/models/customer.rb b/app/models/customer.rb index 83a652d3..002bde6c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -194,7 +194,7 @@ class Customer < ApplicationRecord def self.search(search) if search # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) - where("name LIKE ? OR contact_no LIKE ? OR card_no LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%",) + where("name LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%",) else find(:all) end diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index b51aac36..41130f76 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -128,12 +128,15 @@ \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 955395ef..53212f8a 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -22,10 +22,11 @@ - <%= form_tag crm_customers_path, :method => :get do %> + <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
+ @@ -73,7 +74,6 @@ <%= paginate @crm_customers %>
- <%= render 'card_read_form' %> <%= render 'new_form', crm_customer: @crm_customer %> @@ -97,6 +97,19 @@ $(function() { $('.datepicker').attr('ReadOnly','true'); $('.datepicker').css('cursor','pointer'); + // Read Card Reader + $("#member_acc_no").on('click', function(e){ + var cardNo = ""; + $("#sxModal").show(); + setTimeout(function(){ + cardNo = getCardNo(); + $("#search").val(cardNo); + $("#sxModal").hide(); + },100); + + $("#filter_form").submit(); + }); + }); $(document).on('click',".customer_tr",function(){ diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 4d03d48f..8e5e5157 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -23,6 +23,7 @@
+
<% end %> From 33537cef60c51b768e74e8f229b2360c91ea3ea3 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 17 Jul 2017 16:55:18 +0630 Subject: [PATCH 49/76] 17 update for bitp --- app/controllers/home_controller.rb | 3 ++- app/controllers/oqs/home_controller.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index fb37dbdc..fb42bfee 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -21,7 +21,8 @@ class HomeController < ApplicationController session[:session_token] = @employee.token_session route_by_role(@employee) else - render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!" + flash[:notice] ="Invalid PIN for Employee. Please try again!" + render :show end end diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 226b3a83..28645a74 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id 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 = true AND odt.price <> 0") + .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at <= ?", Time.now.end_of_day.utc) .group("assigned_order_items.order_id") From a5546920b6d4675bac38498f84f9a5362ebdad76 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 18 Jul 2017 16:06:36 +0630 Subject: [PATCH 50/76] nfc done --- app/controllers/home_controller.rb | 2 +- app/controllers/oqs/home_controller.rb | 2 +- .../origami/customers_controller.rb | 16 +++++++-- .../origami/other_charges_controller.rb | 1 + app/views/crm/customers/index.html.erb | 18 +++++----- app/views/layouts/_header.html.erb | 2 ++ app/views/origami/customers/index.html.erb | 34 +++++++++++++----- app/views/origami/home/index.html.erb | 3 +- dump.rdb | Bin 18311 -> 466 bytes 9 files changed, 54 insertions(+), 24 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index a601e4b8..fb42bfee 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -85,7 +85,7 @@ class HomeController < ApplicationController if !shift.nil? redirect_to origami_root_path else - redirect_to crm_customers_path + redirect_to dashboard_path end elsif employee.role == "cashier" #check if cashier has existing open cashier diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 28645a74..c79c971c 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id 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 = true AND odt.price <> 0 AND assigned_order_items.created_at <= ?", Time.now.end_of_day.utc) + .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between #{Time.now.beginning_of_day.utc} and #{Time.now.end_of_day.utc}") .group("assigned_order_items.order_id") diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 203e5600..26e3c74b 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -50,12 +50,22 @@ class Origami::CustomersController < BaseOrigamiController def update_sale_by_customer id = params[:sale_id][0,3] + customer_id = params[:customer_id] + + # Check and find with card no + if(!customer_id.include? "CUS") + customer = Customer.find_by_paypar_account_no(customer_id) + if(customer != nil) + customer_id = customer.customer_id + end + end + if(id == "SAL") sale = Sale.find(params[:sale_id]) - status = sale.update_attributes(customer_id: params[:customer_id]) + status = sale.update_attributes(customer_id: customer_id) sale.sale_orders.each do |sale_order| order = Order.find(sale_order.order_id) - status = order.update_attributes(customer_id: params[:customer_id]) + status = order.update_attributes(customer_id: customer_id) end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @@ -63,7 +73,7 @@ class Origami::CustomersController < BaseOrigamiController @orders.each do |bo| order = Order.find(bo.order_id) - status = order.update_attributes(customer_id: params[:customer_id]) + status = order.update_attributes(customer_id: customer_id) end end diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index bb0d9e42..b0e6472c 100644 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -37,6 +37,7 @@ class Origami::OtherChargesController < BaseOrigamiController sale_item.unit_price = di["price"] sale_item.taxable_price = 0 sale_item.is_taxable = 0 + sale_item.account_id = 0 sale_item.price = di["price"] sale_item.save diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a73fd08f..71b90b1b 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -23,15 +23,15 @@ <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> -
- - - +
+ +
<% end %> + @@ -102,13 +102,11 @@ $(function() { var cardNo = ""; $("#sxModal").show(); setTimeout(function(){ - getCardNo; - $("#sxModal").hide(); - },5000); -alert($("#search").val()); - $("#filter_form").submit(); + getCardNo(); + $("#sxModal").hide(); + $("#filter_form").submit(); + },100); }); - }); $(document).on('click',".customer_tr",function(){ diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index fd951d6c..2a0684a1 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -45,6 +45,8 @@
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • +
  • +
    • diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a9079efe..b11488b4 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -12,20 +12,20 @@
    - +
    @@ -94,8 +94,7 @@
    - <%= #f.input :paypar_account_no, :id => "paypar_account_no", :class => "form-control" %> - +
    @@ -224,6 +223,23 @@ $("#sxModal").hide(); },100); }); + + // Read Card Reader + $("#member_acc_no").on('click', function(e){ + var cardNo = ""; + var sale_id = $("#sale_id").val() || 0; + var customer_mamber_card_no = 0; + $("#sxModal").show(); + setTimeout(function(){ + getCardNo(); + $("#sxModal").hide(); + customer_mamber_card_no = $("#search").val(); + + if(sale_id != 0 && customer_mamber_card_no != 0){ + update_sale(customer_mamber_card_no,sale_id); + } + },100); + }); }); @@ -236,6 +252,7 @@ function setCardNo(cardNo){ if(cardNo.length == 16){ $("#paypar_account_no").val(cardNo); + $("#search").val(cardNo); } } @@ -253,6 +270,7 @@ var url = "customers/"+customer_id; } + // Need To Clean? $.ajax({ type: "GET", url: url, diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 3afea88d..77d85f10 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -107,7 +107,8 @@ - + + diff --git a/dump.rdb b/dump.rdb index 915b246254cbbdb2d38072a0e1549d44ad9b34c9..2747d9732713057f3a828b18fa930f51ba657f37 100644 GIT binary patch delta 147 zcmZqgXS~Eb!NBmq)!fKm9HqsnDZ06-xrc775oP$t@SBa1L9DnWvBWAZF*7GM#mdOQ z&|KHRT-VUzz{H8F0(@Y(f};H7)MB8{1Ctf(CAh(|41ea{;0~R<%l3t#xq-2nnVx~6 lk(r^fDQjVAW@-s*T4GLdDg!r?(FYj*PxE6r^;+heJOHp{HPHY7 literal 18311 zcmd5^eUM#sdA=X}kxjBmKuKy9?zx+U5XiayzCTu}cLRtJjRHDWnUp=hbAAUFHoM{O zuE5x|L6?rq)Hbcm#8yW)Wj8V%#ah5RD0VUGw9`&!T19DVHES}AmR3ycA4)se=iI&f zmA#R@kU0DAUD({c?|Gm1d7tNb@6Fd;d&4b+5dC6T%_jpR;Rk%JomW`JzPNVw1vfA{ zGF^SKJsus{@4t5apYMO)i)+S4d=l>W`@i<=-(Qq_DfhpZK;rKjxO-w#zPC5ny7s-b=)eJA>)F+F zPk&b~398-itR=p-yEYspaWpa-Yzr>U-CeyQczs9X4-GCVM77(4{T;V{u;$mU08t_m)!QxQ-18lZ2(Aker8+NPK8)q?}f)sHl#E-|oM&c-v64|3v$6_kr5L zaBX1pzMkHpvBAOq-)|e+?}tXKWxOUrqR57}}I-VaJ zD&J5V81hN5-;drgoCN(NzJ@1lN01KJg1!R>1_$D(`jxJ0A~)!J-!Ytw1z(xI{^_B@ z-r;xjU!A+Ix-Yo2m_1w5A3jl-Y?nqdVJ6PB-4+jz4OPD}u_-q&jlcf!POhocMjyPG z;w=e0EJjzd*NnBt`<~tXw)0ce1g zL*b(mNeK$A($FTHgn}y-nn=r#5XWhpx}r*H671_AZWMm>?81*X3jbg?lS|5d(L%X* zFDdt%XUqMu{==KKiFKMv>LaRI!i9_Cgh^K&Usi1@G^45_lwo)}>(xFs5o}sqZ7V1j zLC`*1@ACC|)cb*r_tb`mZV!gW_B&q-hSQ*Y&7rRrf-7z>f2nIIpt}Np?*ShNV}*e2 zEO#F2d-`{BeG_j)ncq8C=HClGy$;Wsw7epiWHdO~|6h%2|8343%If{b6ZuCw@i=lq z#nO7?H9Vik`+l(dmh)5ZSJmahIm1YthCI?1U2f3j5wjt)iDEAHMX#v&HFUW&#-`qR zs-2M1&`1huWlVyHHlN+)mKw@cB?yA`!Ch$aCnidZi;m}2GZg)THTigO{a+j5^-;-QCx&g0fp6xs90#xsWUrDFLo~!owu; z)C(($QL6lk%Ki#^d`lvHJ=pDh1;l81AxwzwM{I2^BnWx`%|34OPMze3n1U=N* zxp#Q z;SxObhUHyuxwRE52&H1K&(|%~9WA~+$IhDNAI@g^+g^T_e|hmN|1xIz{${hh_;B!G zUeIMtp3U+cFMp;;h+5j@_?W>%j`y9|ee)`4@>oPEGa?C7YfyD5TxerLLZ+#ST}+E2 zHfgI>mn*G$N5FS`nUqobmTvZ!za-WRny z69h04`P&w7Uk}n1B^-FIQ_9lFM6vY2__7wy z2pk6~CmM*9)jHZVQR-S~@!((cg!V5*_VKfk{qhB5-(LwWpz=o`fceSm={DNfO74 zHgzi-MpV=D=wpMMOZ`;#3lVPn@VG$evAmMk{C{Yt&qeFJ^E?31RhxWN;_) zlkEoUmlX@(9z4-km?iFDa2yj|%q?or3pfgo*BIv+xUUA{?wE*#u_k0ml!SssG4?e) z0$Nk*rBFriyQEccrz-{bh4q{o;VeEN0WKlAB9_Ho0i~N1J|pgoR{-GH+nN<#2o1J; zK?`4)Y!gH)yHNK9aDP0HW$}9jvB2E9McoCsDbdIK{(bjNs{q_}LNUJ+9(v(;C_s-e z)O8vvg00y()ZMd|7dGB{-33p0#6XUPL?78$KnRnTpy6M)e5PBd92JcIVC!7jb27L; zxMoeJ$ta02bwMY3@!?{o%rzb89b9l@=>m`A1|^5&B(S5e4ka$J0G=ojAysuAr)=nG zD#FMa2xC+hV{0yW$q!9zb`cPVMQI|4a|t0ab1HFh6Behr3Wkam!gNqrTya$W2Wv!y zQ-G_zpgVdd#Bs`rr3*q_W3rPIg(o@;fXcFk$*xg#ye8Oc0r+()jVz^D%mt5vwj2q% zHbp6SVWx};p8(}u)GEHeg27HeFI<{QD$2)c#A6T&##7N0-z`_XVi;;`=gPi#unVRY zkpC=3cOLcEag@EtF&2Z#{&Pq(j2YHobQyck03Lh2HK_ZuyKgu@0RJi#*bR_kl=G25 zn|mFKp#7rIKu`jKw<*OQFPxw&6kuB>@SEdQLwMCr`6)Em%ltjX#)RB`Jm-9BX!b#|I7Wy%@#R#lwg$1{*ZfsrNxWsvxm?${1HlsR8 zthtY6b2Sdlm5DM26MasNTfDOUT|rnAl;#xow`Pj__;SU4_o1iiiu>OzR@_H3#XYzm ziu=B^759U|r{>o+3gbxzpIVUIgFmj$S}cV}JCxzrLKbixiw1O8E>&HNTMYzG2uvkG zqA=DTCDz#>w_xuuB?*I%STqXuN{hZ)tHd4C+$(P57)Dv@6HF8iA=V`_3LbiWGyWzu ztPUesa3>V^$0sgZEXe?xC_jt9eJDfq>t9}pdvdW7_av0K!DdQa{x33D%}PD-LZi*U z7Ch9Kn_br)%X41-qk>+b?RCMO!#|=x^>6RKepR4)$tZ_DCnA(l1m+IT96BO=h@!`g z$E*mfG%M_K(Q21(am>I`(Jl3zHxth{s{PfvhdS%2ap-??L6gDufYlt_EvxmnR)zkCA)`~^ zc9=loMu%$>T4ER+79Sbmbul4)WgXtlS}gRT!)vYbR7BKq?t)_QlXeN4J{C>EyisNa zi_gq~`J%>#SgVLUtFd23fGa?Nt1j2yIvUPO-<1ucJeZZ=>ZRtE>UsGsc)TIQ6dvmU z>7-O2yr^!MORG4*9ItUKd*3z+#faM-op2mv%h!=%Sd8=6d3Vao= zyiFXoDhawy6pgJ)Q>B`dbVDW7Hv(p1nv!&IBh1$eNz#jxMVP0Hw6{eX474|v#XRO0 za!A%_aEQbl0{eG&Uw3}M{8gFev1bXPDG8;c;A=AWq4OG>npT_>=Zltky`r*rGt(-P zZ)Tv|gj0q!oZ{Kj)GOGwtolMTf{u|=K{|qJDC}7tW@$nq+m8*X`_f{sz&$m=ODl3u zyXV|fYAmuj6FQTTNbJS!ecQLt3_icNla4>Wj%5+7@L=n z+^kTc#44r)d^Fe{YDMKX#A89}%UeXbc6vs1g@vkJPLq#T?nlU8k< z@imf!5#+Ye!NN@7sufwxeht>jW@;Ui35lIbIp$3o#|{L}SC{ACELG^7N~T>xsH^uo z@^4EN7$ucC+gf=bJ$~Ck;zcORR7N!1n!#+gokzh zM1fbY^GkB;-Q2^qh2o>iLeldrm7#FJAGQjIr z;xV%<4iMio9%B@uJ`3@fI$_6ah<9Y3%4!HoIH}NEk{}I*fGdnk9Xgh=c86pXKKEh@ zfv{D8e+8b3=5TFoW}iD5#oni$rp(GV=&S{G#7#~b>5Dbguz7rm-EHjU!}BOQh*{A5fggpPCMph`ov<&QwiWOq*)$wJT+dQtLkLsG+xeEiV(dR|Oz^MFb@%5W zs)Kq$RG-_+Ezd-CV=_&Bb?oJWFifLJA>fFVBTRCWIi}dxI7?ukp~|noJZlxup|M65 zYq`WMv49lC62tM>MQ}`)5%zj_lM3>gP+8~J@(j<{&*3>fa&^J85f)l`^K1n6au5m8 zuu{Oel_xrphG3u@jSZcF5M^{7LWiQ+G+zy2D2;@n^xB09FctY`gDnl|@{k~-0_`X+ zI?7n91g>?ne6xWPBT%u7v8N8nM^6&zUA0-=mBjTAq&OJsbN#+pW5+Go#k%+@pve!T|R!g_TBgf3a4MU=`{hT=L=Mb|(AgDs~ z3HZWM%SCTpmbnNjK>|h4CYUYSdE#_XEJ#V4b~~z0Dq2!YXPuR^j#q#Jh?`yTvZI}Y z@&5S>wcv}@xo*#MUB0m}$K7G2)(fu*OmygR-&rj;YUmn<3=%HWVuENpi6gixEXI8U zpdj|LNIc50vKzJ56SwOIugnFHW|LxEky+L4;g9+i0_ z*SeQh?l^~GKCitp#8!!&IQv8mIjBcF4D2bv=BZpgAA#45$>I^K;ZjK>ON@3-LKY=B zLrt;^R2-3Hx2OtdRvJebIKW$pUEa-F&PHr;5$;q7g`?&n##kOH5O+kIo7!oh%UL#p zDFF)COl*fqxy)Hvf!J5hko;;~xI55+h|W&zzed*a>Gduz|^-E(!@C3g(me#dR|2g^|C1|#POtJ{KgZ8)mN z)$*49KRq0YYI3x`Wy#h0N{-fl)rMcdKOA(|Z`OzA zPnUo9#HKgZPnY+VXsQf}l+3PK6~Kau(BS9=#vHB-6Pp&Hp=Uv=yJk<9^9Rm8T|U$} zU4CGZQ*-VGVDFM6=ElwXr~5y-Md0Ac@B}#@?WCtj?4j#Gn1jR1762To&xWHh(PoL@ z7f!4%wdsQ|9nF^~bDy4>m@E+%c^pO4FpaZ3ps}!`q)o$ED2ND&EON(v`8EA#X6R&& z&4iO%5F~>G5XXR`7}-sv^NH0dn7LKLz)T#;mn4~iBg;42VXiiGc{F$E}?L> z5#g95#^pC=e`pa_38e?7VZ0Wopnb2MQByfO6HaY}$t+V3pW7#j5{OoZixMzd#lJDN zrXCoAG)-qVOdTo}kl8pom76#@v8OA=RS+0Z940-dyR#gOh6FO`*8j;!Lrmp*gN z+n+mnWR37fq=>tO+n?R~_9B#)aO=Kq5Jsn%P8B9|BFdM{sAJDnj%>kM8oYeWaR_k; zMo~Cykp1D2;mOPGx)Sy&7a`g;~ zt#{6JvRJt=V&Wa!y746v5e`H`E*+1>wiJOaUd|q-A62gIv}pu$HHvrsU_C`34QC*Z zF?`=caQI}`jcs+|Gk7%E_1t=#UYGJ(%seu+5j&lXSZqU*?f4?PqOa({SA(`r1l2ji zo#ClB{q#qbH?M=l7BhudBfcS`M|5&<^~e$XT=$Xk1D%=X0<+4@Y{X-l*XHQdkB(lQ zvEV=Kd87z~KiT=iPUPD_G=;qC<2k=~PtI@cL`m_s^D5c({hSMrUwNQloZ9}0oCqGx z3wv_Ip2`zh_!UR(cwqWVmp_{m>Fb!Mh=Y=g!LUFw|8!rlmNT~W>Gi#5X$d__*=MV3C z5RZJ(C0?*!=0&)d6oG(d+v#?ESwl(ln_aey;OKG+w}(a>ahM;HJs`($>AF9y#5GD+7dGR1%sipU;P4=f4$UiX~g$ zw^sTHiBW=RxZc)}isEU{r}T=icfiBQa%We(xs7I5D_4%-TS>CEMJS0u^x!|qndjGi z1n<9q5O(?4sbi<}P~~4A{Gubosc006?O$vQolbP+J9(TeezVA|H`jj-9eb*By5K;~ z_UE1M3A>DSxM#NbUJ|--X5+E;`gs{U*}bRyjsDB>_~ik9cNerb-B+jb`SlO> z;gQLyz0ch9nx7p-q+zEmq(+6?^GSO7k-XsLiG0e-e`(5j$*%fnUa5C~4<8PGdHGM) zBE7G$qkv5Mt>0@`N+xl9a@~!2&2PG*4TlqopIKKrQMfE8&6iFdyRp+JF#EaF Date: Tue, 18 Jul 2017 18:05:27 +0630 Subject: [PATCH 51/76] update membership rebate for food and beverage --- .../origami/discounts_controller.rb | 2 +- app/models/customer.rb | 3 + app/models/sale_item.rb | 34 +++-- app/models/sale_payment.rb | 142 ++++++++++++++---- db/seeds.rb | 1 + 5 files changed, 136 insertions(+), 46 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index f7e1c63a..abe42c9d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -159,7 +159,7 @@ class Origami::DiscountsController < BaseOrigamiController campaign_type_id: campaign_type_id, receipt_no: receipt_no, merchant_uid:merchant_uid, - discount_method:arr.to_json, + campaign_method:arr.to_json, total_sale_transaction_amount: sale.grand_total, auth_token:auth_token}.to_json, :headers => { diff --git a/app/models/customer.rb b/app/models/customer.rb index 2f09ff12..70587529 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -66,6 +66,9 @@ class Customer < ApplicationRecord }, :timeout => 10 ) + rescue HTTParty::Error + response = {status: false, message: "Can't open membership server " } + rescue Net::OpenTimeout response = { status: false , message: "Server Time out"} diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index a0bc1ae2..af2230de 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -66,26 +66,32 @@ class SaleItem < ApplicationRecord return discount_accounts end - # Calculate rebate_by_account + # Calculate rebate_by_account def self.calculate_rebate_by_account(sale_items) rebateacc = Account.where("rebate=?",true) - puts "Account that can rebate" - rebateacc.each do |i| - puts i.title - end - prices=0 - sale_items.each do |si| - price = self.get_rebate_price(si.sale_item_id,rebateacc) + price = 0 + rebate_arr = [] + rebateacc.each do |a| + account_price = {:type => a.title, :amount => 0} - prices = prices + price + # Check for actual sale items + sale_items.each do |si| + if si.account_id == a.id + account_price[:amount] = account_price[:amount] + si.price + price = price + si.price + end + + end + rebate_arr.push(account_price) end - return prices + + return price,rebate_arr end # get food price or beverage price for item def self.get_rebate_price(sale_item_id,rebateacc) - price=0 - + price = 0 + type = '' item=SaleItem.select("sale_items.price , menu_items.account_id") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") .where("sale_items.sale_item_id=?", sale_item_id.to_s) @@ -93,12 +99,14 @@ class SaleItem < ApplicationRecord rebateacc.each do |i| if item[0].account_id == i.id price = item[0].price + type = i.title end end - return price + return price,type end + # def self.get_overall_discount(sale_id) # price = 0.0 # item=SaleItem.where("product_code=?", sale_id) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 8df6f1c0..e1047de8 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -77,7 +77,10 @@ class SalePayment < ApplicationRecord # Control for Paypar Cloud begin response = HTTParty.get(url, - :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :body => { app_token: token,membership_id:membership_id, + campaign_type_id:campaign_type_id,merchant_uid:merchant_uid, + auth_token:auth_token + }.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' @@ -115,7 +118,14 @@ class SalePayment < ApplicationRecord # Control for Paypar Cloud begin response = HTTParty.post(url, - :body => { generic_customer_id:membership_id,total_amount: redeem_prices,total_sale_transaction_amount: sale_data.grand_total,redeem_amount:received_amount,receipt_no:sale_data.receipt_no,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :body => { generic_customer_id:membership_id, + total_amount: redeem_prices, + total_sale_transaction_amount: sale_data.grand_total, + redeem_amount:received_amount, + receipt_no:sale_data.receipt_no, + campaign_type_id:campaign_type_id, + account_no:"",merchant_uid:merchant_uid, + auth_token:auth_token}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' @@ -261,7 +271,7 @@ class SalePayment < ApplicationRecord end self.sale.sale_status = "completed" - if MembershipSetting.find(1).rebate + if MembershipSetting.find_by_rebate(1) response = rebat(sObj) if !response.nil? @@ -280,12 +290,12 @@ class SalePayment < ApplicationRecord end end puts "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr" + puts response.to_json end self.sale.save! table_update_status(sObj) - if paid_amount != "0.0" update_shift end @@ -324,13 +334,14 @@ class SalePayment < ApplicationRecord end def rebat(sObj) - rebate_prices = SaleItem.calculate_rebate_by_account(sObj.sale_items) - + rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items) generic_customer_id = sObj.customer.membership_id if generic_customer_id.present? - paypar = sObj.sale_payments + + paypar = sObj.sale_payments payparcost = 0 - credit = 0 + credit = 0 + paypar.each do |pp| if pp.payment_method == "paypar" payparcost = payparcost + pp.payment_amount @@ -339,46 +350,113 @@ class SalePayment < ApplicationRecord end end # overall_dis = SaleItem.get_overall_discount(sObj.id) - overall_dis = sObj.total_discount - - total_amount = rebate_prices - payparcost - overall_dis - if credit == 1 - total_amount = 0 - end - if total_amount >= 0 - receipt_no = sObj.receipt_no - membership = MembershipSetting.find_by_membership_type("paypar_url") - memberaction = MembershipAction.find_by_membership_type("rebate") - merchant_uid = memberaction.merchant_account_id.to_s - campaign_type_id = memberaction.additional_parameter["campaign_type_id"] - auth_token = memberaction.auth_token.to_s - url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + overall_dis = sObj.total_discount + + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("get_member_campaign") + merchant_uid = memberaction.merchant_account_id.to_s + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s # Control for Paypar Cloud begin - response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_sale_transaction_amount: sObj.grand_total,merchant_uid:merchant_uid,total_amount: total_amount,campaign_type_id: campaign_type_id, - receipt_no: receipt_no,auth_token:auth_token}.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }, :timeout => 10) + response = HTTParty.get(url, + :body => { + member_group_id:sObj.customer.membership_type, + merchant_uid:merchant_uid, + campaign_type_id: campaign_type_id, + auth_token:auth_token + }.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }, :timeout => 10) rescue Net::OpenTimeout response = { "status": false , "message": "Connect To" } - - rescue OpenURI::HTTPError response = { "status": false, "message": "Can't connect server"} rescue SocketError response = { "status": false, "message": "Can't connect server"} + end + + redeem_amount = payparcost + overall_dis + + total_percentage = 0 + + type_arr = [] + response["membership_campaign_data"].each do |a| + data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i} + total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i + + type_arr.push(data) + end + + rebate_arr =[] + campaign_method.each do |a| + data = {:type => a[:type], :amount => a[:amount]} + puts data + type_arr.each do |si| + if si[:type] == a[:type] + puts "steeeeeeeeeeeee" + amount = (redeem_amount / total_percentage)*si[:percentage] + actual = a[:amount] - amount + data[:amount] = actual + end + + end + rebate_arr.push(data) + + end + puts "ssssssssss" + puts rebate_arr.to_json + total_amount = rebate_prices - payparcost - overall_dis + + if credit == 1 + total_amount = 0 + end + if total_amount >= 0 + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + merchant_uid = memberaction.merchant_account_id.to_s + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + # Control for Paypar Cloud + begin + response = HTTParty.post(url, + :body => { + generic_customer_id:generic_customer_id , + total_sale_transaction_amount: sObj.grand_total, + merchant_uid:merchant_uid, + total_amount: total_amount, + campaign_type_id: campaign_type_id, + receipt_no: receipt_no, + campaign_method: rebate_arr.to_json, + auth_token:auth_token + }.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }, :timeout => 10) + rescue Net::OpenTimeout + response = { "status": false , "message": "Connect To" } + rescue OpenURI::HTTPError + response = { "status": false, "message": "Can't connect server"} + rescue SocketError + response = { "status": false, "message": "Can't connect server"} end return response + puts "latest respppppp" puts response.to_json - end + end else response = { "status": "no_member", "message": "Not membership"} - + end end diff --git a/db/seeds.rb b/db/seeds.rb index 08233594..317194c1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -174,6 +174,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) From 1fa8520a5e6b2110ed51a017ff6393f5b59cccc3 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 18 Jul 2017 18:06:59 +0630 Subject: [PATCH 52/76] change discount_type to campaign_type --- app/controllers/origami/discounts_controller.rb | 2 +- dump.rdb | Bin 466 -> 430 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index f7e1c63a..abe42c9d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -159,7 +159,7 @@ class Origami::DiscountsController < BaseOrigamiController campaign_type_id: campaign_type_id, receipt_no: receipt_no, merchant_uid:merchant_uid, - discount_method:arr.to_json, + campaign_method:arr.to_json, total_sale_transaction_amount: sale.grand_total, auth_token:auth_token}.to_json, :headers => { diff --git a/dump.rdb b/dump.rdb index 2747d9732713057f3a828b18fa930f51ba657f37..f193e7b226525b7511a7cec99649aa333eeb2c76 100644 GIT binary patch delta 99 zcmV-p0G$8Q1Fi#*Fftw9ZCUyVb#rB8Ep26O!hl!@0R8~`1pxpSb97;JI%Z*MY-MCR zGB7bWEigANF*v{gk%ce=DRC^3xZ@HLF*PtSGdD6dFfuMOF*h+dGn1|X90>9Z>RrV3 F1*M}qAt3+& delta 135 zcmV;20C@kd1JVPKFjc_SZCUyVb#rB8Ep26O!q}`80R8~`1_1yTb97;JI%Z*MY-MCR zGB7bWEigANF*v{g0ts+(Z)0V1b7gY@7I|TAIx#RdFf%$bG&yE4Fl9C{Ff=xiVlV@p p*b9-B;}a4wH83zUH!w3cHZCwRGBz Date: Thu, 20 Jul 2017 10:29:20 +0630 Subject: [PATCH 53/76] update shift update from void in sale --- app/controllers/origami/void_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index c0245dc3..9d20ae77 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -3,6 +3,7 @@ class Origami::VoidController < BaseOrigamiController def overall_void sale_id = params[:sale_id] + if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) sale.payment_status = 'void' @@ -10,9 +11,10 @@ class Origami::VoidController < BaseOrigamiController sale.save # update count for shift sale - if(sale.sale_status == "completed") - shift = ShiftSale.current_open_shift(sale.cashier_id) - shift.calculate(sale, "void") + if(sale.sale_status == "void") + # shift = ShiftSale.current_open_shift(sale.cashier_id) + shift = ShiftSale.find(sale.shift_sale_id) + shift.calculate(sale_id, "void") end bookings = sale.bookings From e45bc7964c1671b3104e8d5cb84a9e3c15700ef2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 20 Jul 2017 15:58:31 +0630 Subject: [PATCH 54/76] fix for oqs completed --- app/controllers/oqs/home_controller.rb | 2 +- lib/tasks/menu_osaka.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index c79c971c..e0e53b12 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id 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 = true AND odt.price <> 0 AND assigned_order_items.created_at between #{Time.now.beginning_of_day.utc} and #{Time.now.end_of_day.utc}") + .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .group("assigned_order_items.order_id") diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 5cdceadb..5980a1c1 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -807,7 +807,7 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"}) # Grilled Salmon menu_category33_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13000.00, is_on_promotion:false}]) # Grilled Garlic menu_category33_menu_item201 = SimpleMenuItem.create({name: "Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1500.00, is_on_promotion:false}]) From 30e1854969918f3a8f67ce5e272dc48612dfc492 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 20 Jul 2017 17:42:02 +0630 Subject: [PATCH 55/76] fix discount with selected --- .../origami/discounts_controller.rb | 5 +- app/views/origami/discounts/index.html.erb | 99 +++++++++--------- dump.rdb | Bin 430 -> 522 bytes 3 files changed, 54 insertions(+), 50 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index abe42c9d..030629bf 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -124,7 +124,8 @@ class Origami::DiscountsController < BaseOrigamiController # Member Discount def member_discount sale_id = params[:sale_id] - account_types = JSON.parse(params[:account_types]) + # account_types = JSON.parse(params[:account_types]) + account_types = Account.where("discount=?",true) sub_total = params[:sub_total] sale = Sale.find(sale_id) price = SaleItem.calculate_price_by_accounts(sale.sale_items) @@ -133,7 +134,7 @@ class Origami::DiscountsController < BaseOrigamiController account_types.each do |at| price.each do |pc| - if pc[:name].to_s == at["name"].to_s && pc[:price]>0 + if pc[:name] == at.title && pc[:price]>0 str={type:pc[:name],amount:pc[:price]} arr.push(str) end diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index b0e324a5..c1250e39 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -497,60 +497,63 @@ $(document).ready(function(){ var ajax_url = "/origami/" + sale_id + "/member_discount"; // Selected Account - var account_types = JSON.stringify(get_selected_account_types()); + //var account_types = JSON.stringify(get_selected_account_types()); - if($('.accounts-type').hasClass('selected-account') == true){ + // if($('.accounts-type').hasClass('selected-account') == true){ - var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + // var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; - $.ajax({ - type: "POST", - url: ajax_url, - data: params, - success:function(result){ + var params = {'sale_id':sale_id, 'sub_total':sub_total }; - if (result.status == "Success") { - type = 'green' - btn_color = 'btn-green' - }else{ - type = 'red' - btn_color = 'btn-red' + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + success:function(result){ - } - - $.confirm({ - title: result.title, - content: result.status, - columnClass: 'small', - type: type, - buttons: { - confirm: { - text: 'Ok', - btnClass: btn_color, - action: function(){ - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - } - } - }); - - } - }); - }else{ - $.alert({ - title: 'Alert!', - content: 'Please Select Account', - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + if (result.status == "Success") { + type = 'green' + btn_color = 'btn-green' + }else{ + type = 'red' + btn_color = 'btn-red' + + } + + $.confirm({ + title: result.title, + content: result.status, + columnClass: 'small', + type: type, + buttons: { + confirm: { + text: 'Ok', + btnClass: btn_color, + action: function(){ + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + } + } + } + }); + + } + }); + // } + // else{ + // $.alert({ + // title: 'Alert!', + // content: 'Please Select Account', + // type: 'red', + // typeAnimated: true, + // btnClass: 'btn-danger', + // }); - } + // } });//end member discount }); diff --git a/dump.rdb b/dump.rdb index f193e7b226525b7511a7cec99649aa333eeb2c76..1967e324a9015034ad0371eb8d18b1eeaa785db0 100644 GIT binary patch literal 522 zcmZ{gF-yZh9L2AiLaV4KSamWSj%~T5O)t%221Q(T5|MgI{ov6GG^)C?Mdnas(n@tD4p3aN<+&xRR+m%=?OW zVX$-F+Zh%T2|=X`-GO~Ii(b)lA%~WvV#?`>*aw+W$0P==5Lz)wipGjxy3CdOEOHED zn+?aSQ?NYZ`3;+*>7V`-q0&fcGamkm``;?2}tbh;sDw# z3Eh?X4nOF$dVA0Yu7O*uOjrr+?gwPc;vinlnbF>}I`LtyyN> PuiX?F2$7}| delta 267 zcmeBTS;suVz)ALAZsaeH(&E$<-Q3jNLk$t^4F4E@vobP>6_+HISfwRq=A@=r85tOw z>l&Er8d@A+VBiDG6cptrrxpYCO*|v7^GCB#Cp4Ckfq_M=GBMA}(7?>V*viPnGR?ps z)y%-a#EgX{GcPUwu)}(X9g{5?6^%tq4GfG;O-xOV^bAZbjg3uplnOFa6vR0|I(3vv z64MpTn2RflQWZ>CN{bTnN)+rT_c3~ePHM>ELoryXmL;jQxbgr4OHyiLiJ&3KTyrB+ p10y{nLvuq5W7fjb%+wOrw8Wg^R0eJ&KOJEB|B2^S?2)gmO98;NQV{?E From a0edef735d4c89c9fa5af950dade41d74f0b3006 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 21 Jul 2017 09:57:22 +0630 Subject: [PATCH 56/76] update report detail ,close_cashire_pdf and view reports --- app/controllers/origami/shifts_controller.rb | 10 +- .../reports/dailysale_controller.rb | 4 +- .../reports/receipt_no_controller.rb | 7 +- .../reports/saleitem_controller.rb | 2 + .../reports/shiftsale_controller.rb | 8 ++ app/models/printer/cashier_station_printer.rb | 4 +- app/models/sale.rb | 41 +++++-- app/pdf/close_cashier_pdf.rb | 24 ++-- .../_shift_sale_report_filter.html.erb | 1 + app/views/reports/dailysale/index.html.erb | 4 +- app/views/reports/dailysale/index.xls.erb | 2 +- app/views/reports/receipt_no/index.html.erb | 25 ++-- app/views/reports/receipt_no/index.xls.erb | 27 ++-- .../reports/receipt_no/indexback.html.erb | 115 ------------------ .../reports/receipt_no/indexback.xls.erb | 43 ------- .../_shift_sale_report_filter.html.erb | 1 + app/views/reports/saleitem/index.html.erb | 6 +- app/views/reports/saleitem/index.xls.erb | 6 +- app/views/reports/shiftsale/index.html.erb | 24 ++-- app/views/reports/shiftsale/index.xls.erb | 28 +++-- 20 files changed, 150 insertions(+), 232 deletions(-) delete mode 100644 app/views/reports/receipt_no/indexback.html.erb delete mode 100644 app/views/reports/receipt_no/indexback.xls.erb diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e227d81a..5be0a735 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -30,12 +30,20 @@ class Origami::ShiftsController < BaseOrigamiController unique_code = "CloseCashierPdf" shop_details = Shop.find(1) + #get tax + shift_obj = ShiftSale.where('id =?',@shift.id) + @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') + + puts @sale_taxes.to_a + puts @sale_taxes + puts @sale_taxes.to_json + puts "taxxxxxxxxxxxx" # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) - printer.print_close_cashier(print_settings,@shift,shop_details) + printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes) end diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index 280f497c..fc1f150f 100644 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -2,9 +2,11 @@ class Reports::DailysaleController < BaseReportController authorize_resource :class => false def index - from, to ,report_type = get_date_range_from_params + from, to = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @tax = SaleTax.get_tax(from,to) + @from = from + @to = to respond_to do |format| format.html diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index d1427e6e..a69177bd 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -17,7 +17,12 @@ authorize_resource :class => false @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) end end - @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to, params[:payment_type]) + payment_type = params[:payment_type] + @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) + @sale_taxes = Sale.get_separate_tax(@shift,from,to,payment_type) + + @from = from + @to = to if @shift.present? @shift.each do |sh| diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index b9f71494..00be65e6 100644 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -29,6 +29,8 @@ class Reports::SaleitemController < BaseReportController @totalByAccount = Hash.new {|hash, key| hash[key] = 0} @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + @from = from + @to = to if shift.present? shift.each do |sh| diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb index fc3adbf9..5bc2020c 100644 --- a/app/controllers/reports/shiftsale_controller.rb +++ b/app/controllers/reports/shiftsale_controller.rb @@ -9,6 +9,14 @@ class Reports::ShiftsaleController < BaseReportController @shift = ShiftSale.find(params[:shift_name]) end @sale_data = Sale.get_by_shiftsales(from,to,@shift) + @from = from + @to = to + if @shift.present? + + @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = @shift + end respond_to do |format| format.html diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 267073d8..55bf8c39 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # end #Bill Receipt Print - def print_close_cashier(printer_settings,shift_sale,shop_details) + def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes) #Use CUPS service #Generate PDF #Print cashier = shift_sale.employee.name shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details) + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes) filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" pdf.render_file filename self.print(filename) diff --git a/app/models/sale.rb b/app/models/sale.rb index 4e47f6cd..05fc2452 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -602,7 +602,6 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty payment_type = " and sale_payments.payment_method = '#{payment_type}'" end end - puts payment_type query = Sale.all if shift.present? @@ -610,23 +609,47 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") else - query = query .where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a) + query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") end end +def self.get_separate_tax(shift,from,to,payment_type) -def self.get_separate_tax(from,to,payment_method=nil) - - query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") - .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .group("sale_taxes.tax_name") - - return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) + if payment_type.blank? + payment_type = '' + else + if payment_type == 'card' + payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar'" + else + payment_type = " and sale_payments.payment_method = '#{payment_type}'" + end + end + + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sale_taxes.tax_name") + .order("sale_taxes.sale_tax_id asc") + + if shift.present? + query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + else + query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) + end end +# def self.get_separate_tax(from,to,payment_method=nil) + +# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") +# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") +# .group("sale_taxes.tax_name") + +# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 82507e67..893746b2 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,6 +1,6 @@ class CloseCashierPdf < 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,:text_width - def initialize(printer_settings, shift_sale,shop_details) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes) self.page_width = 210 self.page_height = 7000 self.margin = 5 @@ -32,7 +32,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule - shift_detail(shift_sale) + shift_detail(shift_sale,sale_taxes) @@ -51,7 +51,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule end - def shift_detail(shift_sale) + def shift_detail(shift_sale,sale_taxes) move_down 7 y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do @@ -190,15 +190,17 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{shift_sale.total_discounts}", :size => self.item_font_size, :align => :right end - - y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Commercial Tax :", :size => self.item_font_size, :align => :right + + sale_taxes.each do |tax| + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right + end end - bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{shift_sale.commercial_taxes}", :size => self.item_font_size, :align => :right - end - y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do text "Grand Total :", :size => self.item_font_size, :align => :right diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index 28706731..d49d2660 100644 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -6,6 +6,7 @@
    <% path ="/origami/#{@sale_id}/customers" %> - <%= form_tag path, :method => :get do %> -
    - - - + <%= form_tag path, :id => "filter_form", :method => :get do %> +
    + +
    <% end %> +
    - + - + diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 424f3b63..c1eda6ef 100644 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -4,7 +4,7 @@
    Sale (<%= from rescue '-' %> - <%= to rescue '-'%>) From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Sr.noSr Date Void Amount Mpu Sales
    - + diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 30689437..5868d078 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -24,11 +24,9 @@
    Sale (<%= from rescue '-' %> - <%= to rescue '-'%>) From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Sr.no
    - <% if !params[:from].blank?%> - - - <% end %> + + <% if @shift_from %> <% if @shift_data.employee %> @@ -43,7 +41,9 @@ - + <% @sale_taxes.each do |tax| %> + + <% end %> @@ -78,8 +78,9 @@ - - + <% result.sale_taxes.each do |tax| %> + + <%end%> @@ -91,9 +92,9 @@ - - + <% @sale_taxes.each do |tax| %> + + <% end %> @@ -102,7 +103,9 @@ - + <% @sale_taxes.each do |tax| %> + + <% end %>
    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Cashier Name Total Amount Discount Amount Tax Amount<%= tax.tax_name %> Grand Total Rounding Adj.<%= result.cashier_name rescue '-' %> <%= result.total_amount rescue '-' %> <%= result.total_discount rescue '-' %><%= result.total_tax rescue '-' %><%= tax.tax_payable_amount rescue '-' %><%= result.old_grand_total %> <%= result.rounding_adjustment.to_f rescue '-' %>  <%= total_sum rescue '-'%> <%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= tax.st_amount.round(2) %><%= old_grand_total.to_f.round(2) rescue '-'%> <%= rounding_adj rescue '-'%> <%= old_grand_total.to_f.round + rounding_adj %>  Total Amount Discount AmountTax Amount<%= tax.tax_name %>Grand Total Rounding Adj. Grand Total +
    diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index 2739356d..cddb34f9 100644 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -2,12 +2,9 @@
    - - <% if !params[:from].blank?%> - - - <% end %> + + <% if @shift_from %> <% if @shift_data.employee %> @@ -22,7 +19,10 @@ - + <% @sale_taxes.each do |tax| %> + + + <% end %> @@ -57,8 +57,9 @@ - - + <% result.sale_taxes.each do |tax| %> + + <%end%> @@ -70,9 +71,9 @@ - - + <% @sale_taxes.each do |tax| %> + + <% end %> @@ -81,7 +82,9 @@ - + <% @sale_taxes.each do |tax| %> + + <% end %> >
    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Cashier Name Total Amount Discount Amount Tax Amount<%= tax.tax_name %> Grand Total Rounding Adj.<%= result.cashier_name rescue '-' %> <%= result.total_amount rescue '-' %> <%= result.total_discount rescue '-' %><%= result.total_tax rescue '-' %><%= tax.tax_payable_amount rescue '-' %><%= result.old_grand_total %> <%= result.rounding_adjustment.to_f rescue '-' %>  <%= total_sum rescue '-'%> <%= discount_amt rescue '-'%><%= sprintf "%.2f",total_tax rescue '-'%><%= tax.st_amount.round(2) %><%= old_grand_total.to_f.round(2) rescue '-'%> <%= rounding_adj rescue '-'%> <%= old_grand_total.to_f.round + rounding_adj %>  Total Amount Discount AmountTax Amount<%= tax.tax_name %>Grand Total Rounding Adj. Grand Total +
    diff --git a/app/views/reports/receipt_no/indexback.html.erb b/app/views/reports/receipt_no/indexback.html.erb deleted file mode 100644 index dc7d05ee..00000000 --- a/app/views/reports/receipt_no/indexback.html.erb +++ /dev/null @@ -1,115 +0,0 @@ -
    -
      -
    • Home
      • -
    • Receipt List Report
      • -
    -
    - -
    - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %> -
    -
    - -
    -
    -
    - Export to Excel -
    -
    -
    - -
    -
    - - - - - - - - - - <% TaxProfile.all.each do |r|%> - - <% end %> - - - - - - <% total_sales = 0 %> - <% net_sales = 0 %> - <% @sale_data.each do |sale| %> - <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> - <% net_sales = total_sales.to_f + sale.total_tax.to_f%> - - - - - - - - <% sale.sale_taxes.each do |sale|%> - - <% end %> - - - - <% end %> - -
    DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
    <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
    -
    -
    - -<%= paginate @sale_data %> - - \ No newline at end of file diff --git a/app/views/reports/receipt_no/indexback.xls.erb b/app/views/reports/receipt_no/indexback.xls.erb deleted file mode 100644 index 5befb18a..00000000 --- a/app/views/reports/receipt_no/indexback.xls.erb +++ /dev/null @@ -1,43 +0,0 @@ -
    -
    - - - - - - - - - - - <% TaxProfile.all.each do |r|%> - - <% end %> - - - - - - <% total_sales = 0 %> - <% net_sales = 0 %> - <% @sale_data.each do |sale| %> - <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> - <% net_sales = total_sales.to_f + sale.total_tax.to_f%> - - - - - - - - <% sale.sale_taxes.each do |sale|%> - - <% end %> - - - - <% end %> - -
    DateReceipt NoCashier NameGross SalesDiscountTotal Sales<%=r.name%>Nett Sales
    <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=Employee.find(sale.cashier_id).name rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
    -
    -
    diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index 9ed12d12..eddebc64 100644 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -6,6 +6,7 @@
    - <% if !params[:from].blank?%> - - - <% end %> + + <% if @shift_from %> <% if @shift_data.employee %> diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb index dfdd77dc..74886913 100644 --- a/app/views/reports/saleitem/index.xls.erb +++ b/app/views/reports/saleitem/index.xls.erb @@ -6,11 +6,9 @@
    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    - <% if !params[:from].blank?%> - - - <% end %> + + <% if @shift_from %> <% if @shift_data.employee %> diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index e8f2d1d8..755511ab 100644 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -27,12 +27,20 @@
    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    - <% if params[:from]%> - - - - <% end %> - + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> @@ -82,7 +90,7 @@ <% grand_total = result.grand_total.to_f %> - + <% cash += result.cash_sales.to_f %> <% credit += result.credit_sales.to_f %> @@ -103,7 +111,7 @@ - +
    From Date : <%= params[:from] rescue '-'%> ,To Date : <%= params[:to] rescue '-'%>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> + - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    Cashier Station Cashier Name<%= sprintf "%.2f",grand_tota.to_f.to_d rescue '-'%>
    <%= sprintf("%.2f",card) rescue '-'%> <%= sprintf("%.2f",g_total) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%>
    diff --git a/app/views/reports/shiftsale/index.xls.erb b/app/views/reports/shiftsale/index.xls.erb index c2a8a6d2..951268e9 100644 --- a/app/views/reports/shiftsale/index.xls.erb +++ b/app/views/reports/shiftsale/index.xls.erb @@ -1,11 +1,24 @@ +
    +
    - <% if params[:from]%> - - - + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + <% end %> @@ -57,7 +70,7 @@ <% grand_total = result.grand_total.to_f %> - + <% cash += result.cash_sales.to_f %> <% credit += result.credit_sales.to_f %> @@ -78,9 +91,10 @@ - +
    From Date : <%= params[:from] rescue '-'%> ,To Date : <%= params[:to] rescue '-'%>
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> + - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    <%= sprintf "%.2f",grand_tota.to_f.to_d rescue '-'%>
    <%= sprintf("%.2f",card) rescue '-'%> <%= sprintf("%.2f",g_total) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%>
    -
    \ No newline at end of file +
    +
    \ No newline at end of file From 409fd05da46b3655ec1b8b8fab176257f46095b2 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 21 Jul 2017 10:52:46 +0630 Subject: [PATCH 57/76] no show void item in discount --- app/views/origami/discounts/index.html.erb | 2 +- dump.rdb | Bin 522 -> 487 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index c1250e39..ba7bf989 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -31,7 +31,7 @@ <% @sale_data.sale_items.each do |sale_item| %> <% sub_total += sale_item.qty*sale_item.unit_price - unless sale_item.price == 0 + if sale_item.price != 0 && sale_item.remark != "void" %>
    diff --git a/dump.rdb b/dump.rdb index 1967e324a9015034ad0371eb8d18b1eeaa785db0..0e8d606fd2b675a0c3e88d8fa1ab9153d5ebc576 100644 GIT binary patch delta 73 zcmV-P0Ji^%1m^>gFc=f1a9R2Yb#rB8Ep26O!njul0R8~`2LX}J83ZygzyOhma|9!w f1z?f?^%gZWH83|WG&MLkGBh>+;TC7=zi;@V@$wvQ delta 88 zcmV-e0H^=w1BwKYFc?{na9R2Yb#rB8Ep26O!Z@1|0R8~`2mz6+84xlszyJaXaB^>B uWpi_7a{-az7m;Oi1j)~^Uy Date: Fri, 21 Jul 2017 14:56:40 +0630 Subject: [PATCH 58/76] osaka menu update and void tax calc fix --- app/controllers/origami/sale_edit_controller.rb | 15 +++++++++++++++ app/controllers/origami/void_controller.rb | 7 ++++--- app/models/sale.rb | 7 ++++--- lib/tasks/menu_osaka.rake | 11 +++++++---- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 3d632403..3d5b9722 100644 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -21,6 +21,10 @@ class Origami::SaleEditController < BaseOrigamiController @newsaleitem.is_taxable = 1 @newsaleitem.product_name = saleitemObj.product_name + " - void" @newsaleitem.save + + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void end # def item_edit @@ -56,6 +60,10 @@ class Origami::SaleEditController < BaseOrigamiController # saleitemObj.remark = 'edit' saleitemObj.product_name = saleitemObj.product_name + " - updated" saleitemObj.save + + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void end @@ -71,6 +79,10 @@ class Origami::SaleEditController < BaseOrigamiController end end saleitemObj.destroy + + # re-calc tax + saleObj = Sale.find(saleitemObj.sale_id) + saleObj.compute_without_void end # remove all void items @@ -85,6 +97,9 @@ class Origami::SaleEditController < BaseOrigamiController end item.save end + + # re-calc tax + saleObj.compute_without_void end def apply_void diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 9d20ae77..73f89d13 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -12,9 +12,10 @@ class Origami::VoidController < BaseOrigamiController # update count for shift sale if(sale.sale_status == "void") - # shift = ShiftSale.current_open_shift(sale.cashier_id) - shift = ShiftSale.find(sale.shift_sale_id) - shift.calculate(sale_id, "void") + if sale.shift_sale_id != nil + shift = ShiftSale.find(sale.shift_sale_id) + shift.calculate(sale_id, "void") + end end bookings = sale.bookings diff --git a/app/models/sale.rb b/app/models/sale.rb index 05fc2452..0e634d8f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -42,8 +42,8 @@ class Sale < ApplicationRecord booking.sale_id = sale_id end - order = booking.booking_orders.take.order - link_order_sale(order.id) + order = booking.booking_orders.take.order + link_order_sale(order.id) return status, sale_id end @@ -323,7 +323,8 @@ class Sale < ApplicationRecord sale_tax.tax_rate = tax.rate #include or execulive # sale_tax.tax_payable_amount = total_taxable * tax.rate - sale_tax.tax_payable_amount = total_taxable * tax.rate / 100 + total_tax = total_taxable - self.total_discount + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 #new taxable amount is standard rule for step by step # total_taxable = total_taxable + sale_tax.tax_payable_amount diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 5980a1c1..e81ed490 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -220,16 +220,16 @@ menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"}) # N1 - Sio Ramen menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1 - Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) - # N4-Fried Noodle with Thick Sauce - menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}]) # N2 Syoyu Ramen menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2 Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}]) # N3 Tonkotsu Ramen menu_category1_menu_item83 = SimpleMenuItem.create({name: "N3 Tonkotsu Ramen ", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:6900.00, is_on_promotion:false}]) + # N4-Fried Noodle with Thick Sauce + menu_category1_menu_item81 = SimpleMenuItem.create({name: "N4-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) #N5 Curry Ramen menu_category1_menu_item84 = SimpleMenuItem.create({name: "N5 Curry Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item84, price:6000.00, is_on_promotion:false}]) @@ -239,6 +239,9 @@ menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Rame # N7 Miso Ramen menu_category1_menu_item86 = SimpleMenuItem.create({name: "N7 Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item86, price:5500.00, is_on_promotion:false}]) + # N8 Spicy Miso Ramen + menu_category1_menu_item000 = SimpleMenuItem.create({name: "N8-Spicy Miso Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item000, price:5500.00, is_on_promotion:false}]) # Cold Ramen menu_category1_menu_item79 = SimpleMenuItem.create({name: "Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}]) From c5dbbea76dae7544bc2aeb2ad108eda58e730c19 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 21 Jul 2017 17:07:31 +0630 Subject: [PATCH 59/76] update long bill --- app/controllers/origami/movetable_controller.rb | 4 +++- app/models/booking.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 50f2c774..6062216f 100644 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -44,12 +44,14 @@ class Origami::MovetableController < BaseOrigamiController change_to = params[:change_to] #new change_from = params[:change_from] #original bookings = Booking.where('dining_facility_id=?',change_from) + booking_array = Array.new bookings.each do | booking | - if booking.sale_id.nil? || booking.sale.sale_status != 'completed' || booking.booking_status != 'moved' + if booking.sale_id.nil? && booking.booking_status != 'moved' booking_array.push(booking) end end + @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) end end diff --git a/app/models/booking.rb b/app/models/booking.rb index cc4ae389..e3d94a37 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -1,4 +1,3 @@ - class Booking < ApplicationRecord self.primary_key = "booking_id" @@ -14,6 +13,7 @@ class Booking < ApplicationRecord def self.update_dining_facility(booking_arr, newd, old) table = DiningFacility.find(newd) exist = table.get_booking + if exist # order exists booking_arr.each do |booking| From 8852bc04492f0216ab98cfda8f0349a42919eb93 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 21 Jul 2017 17:52:38 +0630 Subject: [PATCH 60/76] update pay without existing invoice in salepayment.rb --- app/controllers/origami/shifts_controller.rb | 4 ---- app/models/sale_payment.rb | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index 5be0a735..e03dd0fc 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -34,10 +34,6 @@ class Origami::ShiftsController < BaseOrigamiController shift_obj = ShiftSale.where('id =?',@shift.id) @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') - puts @sale_taxes.to_a - puts @sale_taxes - puts @sale_taxes.to_json - puts "taxxxxxxxxxxxx" # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e1047de8..74764785 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -321,10 +321,14 @@ class SalePayment < ApplicationRecord bookings = table.bookings bookings.each do |tablebooking| if tablebooking.booking_status != 'moved' - if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' + if tablebooking.sale_id + if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' + status = false + end + else status = false - end - end + end + end end if status table.status = "available" From b8fc67745d6ba9bc434848ae48f3b7c14fadaf64 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 21 Jul 2017 18:15:10 +0630 Subject: [PATCH 61/76] fix discount and receipt bill --- .../origami/discounts_controller.rb | 17 +++-- app/pdf/receipt_bill_pdf.rb | 11 ++- lib/tasks/menu_osaka.rake | 76 +++++++++---------- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 030629bf..d9f1f4fb 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -97,13 +97,14 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) table_id = sale.bookings[0].dining_facility_id - table_type = DiningFacility.find(table_id).type - + table_type = DiningFacility.find(table_id).type + + discount_items = [] #destroy all discount sale item - sale.sale_items.each do |si| - if si.remark == "Discount" && si.price < 0 - sale.total_amount = (sale.total_amount + si.price.abs) - si.destroy + sale.sale_items.each do |si| + if si.remark == "Discount" && si.price < 0 + sale.total_amount = (sale.total_amount + si.price.abs) + discount_items.push(si) end end @@ -111,6 +112,9 @@ class Origami::DiscountsController < BaseOrigamiController # sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax; # sale.save + #destroy in sale.sale_items + sale.sale_items.destroy(discount_items) + # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, 0) result = {:status=> "Success", :table_id => table_id, :table_type => table_type } @@ -139,7 +143,6 @@ class Origami::DiscountsController < BaseOrigamiController arr.push(str) end end - end generic_customer_id = sale.customer.membership_id diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 418a33d9..bf826af9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,6 +1,6 @@ class ReceiptBillPdf < Prawn::Document include ActionView::Helpers::NumberHelper - 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 + 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, :description_width, :price_num_width def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status) self.page_width = 210 self.page_height = 7000 @@ -12,6 +12,9 @@ class ReceiptBillPdf < Prawn::Document self.item_height = 15 self.item_description_width = (self.page_width-20) / 2 self.label_width = 100 + + self.description_width = 150 + self.price_num_width = 50 # @item_width = self.page_width.to_i / 2 # @qty_width = @item_width.to_i / 3 # @double = @qty_width * 1.3 @@ -73,10 +76,10 @@ class ReceiptBillPdf < Prawn::Document move_down 7 # move_down 2 y_position = cursor - bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left end - bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + bounding_box([self.description_width,y_position], :width => self.price_num_width, :height => self.item_height) do text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right end move_down 5 @@ -140,7 +143,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor pad_top(15) { - text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size , :overflow => :expand text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index e81ed490..9241166b 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -288,7 +288,7 @@ menu_category10 = MenuCategory.create({menu: menu, name: "Udon", alt_name: "Udo menu_category1_menu_item99 = SimpleMenuItem.create({name: "U6 Seafood Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item99, price:4900.00, is_on_promotion:false}]) # U7 Beef Frid Udon - menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Frid Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_category1_menu_item100 = SimpleMenuItem.create({name: "U7 Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item100, price:4500.00, is_on_promotion:false}]) # U8 Spicy Beef Fried Udon menu_category1_menu_item93 = SimpleMenuItem.create({name: "U8 Spicy Beef Fried Udon", alt_name: "",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) @@ -640,8 +640,8 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: menu_category23_menu_item201 = SimpleMenuItem.create({name: "Passion fruit smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Passion fruit smoothie",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}]) # Mixederry smoothie - menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixederry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixederry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) + menu_category23_menu_item202 = SimpleMenuItem.create({name: "Mixedberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Mixedberry smoothie",menu_item: menu_category23_menu_item202, price:3500.00, is_on_promotion:false}]) # Blueberry smoothie menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Blueberry smoothie",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}]) @@ -857,44 +857,44 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G puts "Osaka's menu setup" zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table1", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table2", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table3", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table4", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table5", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table6", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table7", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table8", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table9", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table10", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table11", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table12", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, name:"Table13", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"1", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"2", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"3", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"4", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"5", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"6", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"7", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"8", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"9", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"10", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"11", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"12", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"13", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table14", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table15", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table16", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table17", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table18", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table19", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table20", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table21", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table22", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table23", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table24", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table25", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table26", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, name:"Table27", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"14", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"15", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"16", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"17", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"18", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"19", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"20", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"21", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"22", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"23", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"24", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"25", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"26", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"27", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table28", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table29", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table30", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table31", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table32", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table33", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, name:"Table35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"28", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"29", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"30", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"31", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"32", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"33", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Default Order Queue stations order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) From a7cbea5dbb3d6f6c6c57ed8e6d655e2f425b9445 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 17:42:34 +0630 Subject: [PATCH 62/76] update login To show dashboard screen with available features based on user type --- app/assets/javascripts/application.js | 131 ------------------------- app/controllers/crm/home_controller.rb | 14 +-- app/controllers/home_controller.rb | 14 ++- app/models/ability.rb | 18 +++- app/pdf/order_item_pdf.rb | 4 +- app/pdf/order_summary_pdf.rb | 8 +- app/views/home/index.html.erb | 125 ++++++++++++++++++++++- 7 files changed, 158 insertions(+), 156 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 63c871d9..9adb6b75 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,134 +30,3 @@ function export_to(path) var form_params = $("#frm_report").serialize(); window.location = path+"?"+ form_params; } - -/* -* ToDo Move to here from pages -* -* - - - -$(function(){ - $('#custom_excel').hide(); - - $('#custom_excel').click(function(){ - var url = $('#custom_excel').attr('data-url'); - $('#frm_report').attr('action',url) - $('#frm_report').submit(); - // window.location = url; - }); - - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'order'){ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } - else if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - } - else{ - $('#waiter').hide(); - $('#cashier').show(); - $("#item").val('sale'); - } -}); - -//Reset the form to pervious values -$("#branch").val(<%=params[:branch]%>); -$("#waiter").val("<%=params[:waiter]%>"); -$("#cashier").val(<%=params[:cashier]%>); -$("#product").val(<%=params[:product]%>); -$("#singer").val(<%=params[:singer]%>); -$("#item").val('<%=params[:item]%>'); -$("#guest_role").val('<%=params[:guest_role]%>'); - - -$("#from").val("<%=params[:from]%>"); -$("#to").val("<%=params[:to]%>"); -$("#sel_period").val(<%=params[:period]%>); -$("#sel_sale_type").val(<%=params[:sale_type]%>); - -<% if params[:period_type] == 1 || params[:period_type] == "1" %> - $("#rd_period_type_1").attr("checked","checked"); -<% else %> - $("#rd_period_type_0").attr("checked","checked"); -<% end %> -$(".btn-group button").removeClass("active"); -<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> -$("#btn_report_type_<%= report_type %>").addClass("active"); - -$('#item').change(function(){ - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - if(payment_type){ - $('#payment_type').show(); - } - } - else{ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } -}); - -$(function(){ - var check_arr = []; - var search = '<%= params[:period_type] %>'; - if(search){ - if(parseInt(search) == 0){ - search_by_period(); - } - else{ - search_by_date(); - } - }else{ - search_by_period(); - } - $('#sel_period').change(function(){ - search_by_period(); - }); - function search_by_period(){ - var period = $('#sel_period').val(); - var period_type = 0; - var from = ""; - var to = ""; - } - - $('#from').change(function(){ - search_by_date(); - }); - - $('#to').change(function(){ - search_by_date(); - }); - function search_by_date(){ - var from = $('#from').val(); - var to = $('#to').val(); - var period = 0; - var period_type = 1; - if(to != '' && from != ''){ - shift_name = from + ',' + to; - check_arr.push(to); - // console.log(check_arr.length) - if(check_arr.length == 1){ - } - if(check_arr.length == 3){ - check_arr = []; - } - } - } -}); -*/ diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index d3934eef..012f2bc6 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,13 +1,13 @@ class Crm::HomeController < BaseCrmController def index - @booking = Booking.all - @customer = Customer.all - from = Time.now.beginning_of_day.utc - to = Time.now.end_of_day.utc - @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') - # redirect_to crm_customers_path - # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + @booking = Booking.all + @customer = Customer.all + from = Time.now.beginning_of_day.utc + to = Time.now.end_of_day.utc + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') + redirect_to crm_customers_path + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index fb42bfee..ead69f39 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -42,9 +42,12 @@ class HomeController < ApplicationController elsif @employee.role == "manager" session[:session_token] = @employee.token_session redirect_to dashboard_path - elsif @employee.role == "accountant" + elsif @employee.role == "supervisour" session[:session_token] = @employee.token_session - redirect_to dashboard_path + redirect_to origami_root_path + elsif @employee.role == "account" + session[:session_token] = @employee.token_session + redirect_to reports_dailysale_index_path else render :index end @@ -96,12 +99,15 @@ class HomeController < ApplicationController redirect_to new_origami_shift_path end elsif employee.role == "manager" - redirect_to oqs_root_path + redirect_to dashboard_path elsif employee.role == "waiter" redirect_to oqs_root_path elsif employee.role == "crm" redirect_to crm_root_path - + elsif @employee.role == "supervisour" + redirect_to origami_root_path + elsif @employee.role == "account" + redirect_to reports_dailysale_index_path end end end diff --git a/app/models/ability.rb b/app/models/ability.rb index f9d98bfc..368aa424 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -104,7 +104,7 @@ class Ability can :manage, DiningQueue - elsif user.role == "accountant" + elsif user.role == "account" can :index, :dailysale can :index, :saleitem @@ -113,11 +113,19 @@ class Ability elsif user.role == "supervisour" - can :index, :dailysale - can :index, :saleitem - can :index, :receipt_no - can :index, :shiftsale + can :edit, :sale_edit + can :item_void, :sale_edit + can :item_edit, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit + can :overall_void, :void + can :first_bill, :payment + can :create, :payment + can :show, :payment + can :reprint, :payment + can :rounding_adj, :payment end end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 546e8f82..61f5f0c2 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -6,7 +6,7 @@ class OrderItemPdf < Prawn::Document self.page_height = 1450 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 35 + self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 @@ -80,7 +80,7 @@ class OrderItemPdf < Prawn::Document text "#{order_item.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width-4,y_position], :width => self.qty_width) do text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 6d530058..26a89476 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -68,8 +68,8 @@ class OrderSummaryPdf < Prawn::Document text "Item", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width-2,y_position], :width => self.qty_width, :height => self.item_height) do - text "Qty", :size => self.item_font_size,:align => :left + bounding_box([self.item_width-4,y_position], :width => self.qty_width, :height => self.item_height) do + text "Qty", :size => self.item_font_size,:align => :right end stroke_horizontal_rule @@ -96,8 +96,8 @@ class OrderSummaryPdf < Prawn::Document end - bounding_box([self.item_width,y_position], :width => self.qty_width) do - text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left + bounding_box([self.item_width-4,y_position], :width => self.qty_width) do + text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :right end bounding_box([0,y_position], :width => self.item_width) do diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 87bf3f50..ac20f446 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -24,8 +24,8 @@ -->
    -
    -
    +
    +
    <% @employees.each do |employee| %> @@ -43,11 +43,111 @@
    - <% end %> + <% end %>
    + +
    +
    + + +
    +
    +
    +

    + Administrator +

    +
    +
    +
    +
      +
    • All Accept
      • +
    +
    +
    +
    +
    +
    +

    + Manager +

    +
    +
    +
    +
      +
    • All Accept except Membership and Payment Settings
      • +
    +
    +
    +
    +
    +
    +

    + Supervisor +

    +
    +
    +
    +
      +
    • Void
      • +
    • FOC
      • +
    • Edit
      • +
    • Credit
      • +
    • and Payment
      • +
    +
    +
    +
    +
    +
    +

    + Cashier +

    +
    +
    +
    +
      +
    • Orgami Panel except Edit and Void
      • +
    • Sale and Order
      • +
    • and Queue in CRM
      • +
    +
    +
    +
    +
    +
    +

    + Accountant +

    +
    +
    +
    +
      +
    • Daily Sale Report
      • +
    • Sale Item Report
      • +
    • Receipt No Report
      • +
    • ShiftSale Report
      • +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + From bf9b977cd0b99977c58fe3555321c02737a70f0d Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 24 Jul 2017 19:24:43 +0630 Subject: [PATCH 63/76] membership update --- Gemfile | 4 +++ app/controllers/crm/customers_controller.rb | 17 +++++------ app/controllers/oqs/home_controller.rb | 4 +++ .../origami/discounts_controller.rb | 5 ++-- app/helpers/application_helper.rb | 30 ++++++++++++++----- app/models/customer.rb | 2 +- app/views/crm/customers/_new_form.html.erb | 10 ++++--- app/views/oqs/home/index.html.erb | 2 +- db/seeds.rb | 24 +++++++-------- 9 files changed, 60 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index 5344bdc5..fa2990ad 100644 --- a/Gemfile +++ b/Gemfile @@ -72,6 +72,10 @@ gem 'filterrific' gem 'cancancan', '~> 1.10' +#pageless no need for current +# gem 'will_paginate' +# gem 'pageless-rails', github: 'rorlab/pageless-rails' + # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 81db4f47..4b045221 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -84,7 +84,6 @@ class Crm::CustomersController < BaseCrmController member_group_id = params[:member_group_id] if member_group_id.present? - puts "aaaaaaaaa" membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("create_membership_customer") merchant_uid = memberaction.merchant_account_id.to_s @@ -106,18 +105,18 @@ class Crm::CustomersController < BaseCrmController ) rescue HTTParty::Error - response = {status: false, message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue Net::OpenTimeout - - response = { status: false , message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue OpenURI::HTTPError - response = { status: false, message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue SocketError - response = { status: false, message: "Can't open membership server "} - end + response = {"status" => false, "message" => "Can't open membership server "} + end + if response["status"] == true customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) @@ -132,9 +131,9 @@ class Crm::CustomersController < BaseCrmController customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_type:member_group_id ) if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] } end end else diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index e0e53b12..d8731ecb 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -26,6 +26,7 @@ class Oqs::HomeController < BaseOqsController @queue_stations_items.push({:zone_id => zone_id , :station_name => que.station_name, :is_active => que.is_active , :is_ap => que.auto_print, :item_count => i }) end + # @queue_items_details = @queue_items_details.paginate(:per_page => 10, :page => params[:page]) @queue_stations_items end @@ -99,6 +100,7 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0") .group("assigned_order_items.assigned_order_item_id") + .order("assigned_order_items.created_at") end # Completed Order @@ -114,6 +116,8 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .group("assigned_order_items.order_id") + .limit(20) + .order("assigned_order_items.created_at") # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index d9f1f4fb..e6ddf11f 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -181,11 +181,10 @@ class Origami::DiscountsController < BaseOrigamiController rescue SocketError response = {:status=> false, :message => "Can't open membership server " } end - + table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type - puts response - puts "sssssssssss" + # Re-calc All Amount in Sale if response["status"] == true discount_amount = response["discount_earned"] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 96956958..ae3934e4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,11 +1,25 @@ 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 + 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 + + # For Pageless + # def pageless(total_pages, url=nil, container=nil) + # opts = { + # :totalPages => total_pages, + # :url => url, + # :loaderMsg => 'Loading more pages...', + # :loaderImage => image_path('load.gif') + # } + + # container && opts[:container] ||= container + + # javascript_tag("$('#{container}').pageless(#{opts.to_json});") + # end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 06f7f1d1..ef777c2d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,7 +10,7 @@ class Customer < ApplicationRecord validates :contact_no, uniqueness: true validates :email, uniqueness: true validates :card_no, uniqueness: true - validates :paypar_account_no, uniqueness: true + # validates :paypar_account_no paginates_per 50 diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index d6ad14ca..3c09d20f 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -131,10 +131,12 @@ $("#paypar_account_no").on('focus', function(e){ var cardNo = ""; $("#sxModal").show(); - setTimeout(function(){ - getCardNo(); - $("#sxModal").hide(); - },100); + if($(this).val() == ''){ + setTimeout(function(){ + getCardNo(); + $("#sxModal").hide(); + },100); + } }); }); diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 571de1a2..ca652d26 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -130,7 +130,7 @@ end end %> - + diff --git a/db/seeds.rb b/db/seeds.rb index 317194c1..504862a5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,25 +163,25 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: " crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) From 9c4e5bbdc8c22a3aea093f28fdae237f765040fa Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 19:25:31 +0630 Subject: [PATCH 64/76] update comertial tax and service in sale model --- .../reports/receipt_no_controller.rb | 2 +- app/models/sale.rb | 41 +++++++++++-------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index a69177bd..3ca19e9d 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -19,7 +19,7 @@ authorize_resource :class => false end payment_type = params[:payment_type] @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) - @sale_taxes = Sale.get_separate_tax(@shift,from,to,payment_type) + @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index 0e634d8f..324bb608 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,7 +617,17 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -def self.get_separate_tax(shift,from,to,payment_type) +# def self.get_separate_tax(from,to,payment_method=nil) + +# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") +# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") +# .group("sale_taxes.tax_name") +# .order("sale_taxes.sale_tax_id asc") + +# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + +def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) if payment_type.blank? payment_type = '' @@ -629,28 +639,23 @@ def self.get_separate_tax(shift,from,to,payment_type) end end - query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") - .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .group("sale_taxes.tax_name") - .order("sale_taxes.sale_tax_id asc") - + puts "SSSSSSSSSSS" if shift.present? - query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sale_taxes.tax_name") + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) else - query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) + query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) + .group("sale_taxes.tax_name") end + end -# def self.get_separate_tax(from,to,payment_method=nil) - -# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") -# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") -# .group("sale_taxes.tax_name") - -# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) -# end - def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end From 6e4228853addc883adefa9ff53f85971848efe23 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 24 Jul 2017 19:29:58 +0630 Subject: [PATCH 65/76] update comertial tax and service in sale model --- app/models/sale.rb | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 324bb608..11d67543 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,16 +617,6 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -# def self.get_separate_tax(from,to,payment_method=nil) - -# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") -# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") -# .group("sale_taxes.tax_name") -# .order("sale_taxes.sale_tax_id asc") - -# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) -# end - def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) if payment_type.blank? @@ -638,24 +628,45 @@ def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) payment_type = " and sale_payments.payment_method = '#{payment_type}'" end end - - puts "SSSSSSSSSSS" + if shift.present? query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") - .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) .group("sale_taxes.tax_name") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + .order("sale_taxes.sale_tax_id asc") else query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) .group("sale_taxes.tax_name") + .order("sale_taxes.sale_tax_id asc") end + # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") + # .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") + # .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + # .group("sale_taxes.tax_name") + # .order("sale_taxes.sale_tax_id asc") + + # if shift.present? + # query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + # else + # query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to) + # end end +# def self.get_separate_tax(from,to,payment_method=nil) + +# query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") +# .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id") +# .group("sale_taxes.tax_name") + +# return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to) +# end + def grand_total_after_rounding return self.old_grand_total.to_f + self.rounding_adjustment.to_f end From d01ec184f59a4b00a57030702200c808898fa294 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 25 Jul 2017 09:53:25 +0630 Subject: [PATCH 66/76] edit merchant code for bitp --- db/seeds.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 504862a5..317194c1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,25 +163,25 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: " crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) From a135e220248b5e9deef92118313bdbaf80d58cc6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 25 Jul 2017 10:49:36 +0630 Subject: [PATCH 67/76] update wrong commercial tax and service tax and role features --- app/models/sale.rb | 6 +++--- app/views/home/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 11d67543..fc2a761b 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,7 +617,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) +def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) if payment_type.blank? payment_type = '' @@ -633,14 +633,14 @@ def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") else query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ac20f446..cf8729f3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -49,7 +49,7 @@
    - +

    Role Features

    From 3f0ecb5ac6273165f41013c120c72b2f4db54df1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 25 Jul 2017 12:21:05 +0630 Subject: [PATCH 68/76] update home view card column --- app/views/home/index.html.erb | 44 ++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index cf8729f3..0e046691 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -25,11 +25,11 @@
    -->
    -
    +
    <% @employees.each do |employee| %> -
    +

    @@ -140,12 +140,44 @@ .panel-body { padding: 5px !important; } - .card-columns { - column-count: 5; - } + /*.card-columns { + column-count: 4; + display: inline-block; + }*/ .panel-title .glyphicon { - float: right; + float: right; + } + @media (min-width: 34em) { + .card-columns { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + } + } + + @media (min-width: 48em) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } + } + + @media (min-width: 62em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } + } + + @media (min-width: 75em) { + .card-columns { + -webkit-column-count: 5; + -moz-column-count: 5; + column-count: 5; + } }