Pull from master

2018-08-06 17:52:03 +06:30
parent 35ac07b0a6
commit e99e907bc4
33 changed files with 455 additions and 126 deletions
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -25,6 +25,7 @@ class Origami::SalesController < BaseOrigamiController
  def add_to_existing_invoice
    dining = params[:dining_id]
    sale_id = params[:sale_id]
+    tax_type = params[:tax_type]
    table = DiningFacility.find(dining)
    existing_booking = Booking.find_by_sale_id(sale_id)
      table.bookings.each do |booking|
@@ -51,7 +52,7 @@ class Origami::SalesController < BaseOrigamiController
             end

             # Re-compute for add
-             saleobj.compute(order.source)
+             saleobj.compute(order.source,tax_type)
             saleobj.save
             order.save
             booking.save