update fixed conflict

app/controllers/origami/discounts_controller.rb

@@ -29,7 +29,6 @@ class Origami::DiscountsController < BaseOrigamiController
       if discount_items.length > 0
         #save sale item for discount
         discount_items.each do |di|
-          puts di
           origin_sale_item = SaleItem.find(di["id"])
           sale_item = SaleItem.new
 
@@ -53,6 +52,59 @@ class Origami::DiscountsController < BaseOrigamiController
     render :json => dining.to_json
   end
 
+  # Remove selected discount Items
+  def remove_discount_items
+    sale_id = params[:sale_id]
+    discount_items = JSON.parse(params[:discount_items])
+    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
+              
+      if discount_items.length > 0       
+        #destroy sale item for discount
+        discount_items.each do |di|          
+          sale_item = SaleItem.find(di["id"])                 
+          sale.total_amount = (sale.total_amount + sale_item.price.abs)
+          sale_item.destroy
+        end                 
+      end  
+
+      sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;   
+      sale.save
+    end
+
+    dining = {:table_id => table_id, :table_type => table_type }
+
+    render :json => dining.to_json
+  end
+
+  # Remove all discount Items
+  def remove_all_discount
+    sale_id = params[:id]
+
+    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
+                    
+      #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
+        end
+      end                 
+
+      sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;   
+      sale.save
+    end
+
+    dining = {:table_id => table_id, :table_type => table_type }
+
+    render :json => dining.to_json
+  end
+
   #discount for selected order
   # def create
   # 	sale_id = params[:sale_id]

app/controllers/origami/request_bills_controller.rb

@@ -12,7 +12,7 @@ class Origami::RequestBillsController < BaseOrigamiController
       # 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)
+      @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