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}])