update fixed conflict

app/controllers/api/api_controller.rb

@@ -1,6 +1,6 @@
 class Api::ApiController < ActionController::API
   include TokenVerification
-  helper_method :current_token, :current_login_employee
+  helper_method :current_token, :current_login_employee, :get_cashier
 
 
   private
@@ -13,6 +13,11 @@ class Api::ApiController < ActionController::API
     end
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_login_employee
     @employee = Employee.find_by_token_session(current_token)
   end

app/controllers/api/bill_controller.rb

@@ -13,7 +13,7 @@ class Api::BillController < Api::ApiController
         if booking
           if booking.sale_id.nil?
             @sale = Sale.new
-            @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee)
+            @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier)
           else
             @status = true
             @sale_id = booking.sale_id
@@ -22,7 +22,7 @@ class Api::BillController < Api::ApiController
 
     elsif (params[:order_id])
       @sale = Sale.new
-      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee)
+      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
     end
 
     @sale_data = Sale.find_by_sale_id(@sale_id)

app/controllers/api/orders_controller.rb

@@ -67,13 +67,19 @@ class Api::OrdersController <  Api::ApiController
         if booking
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
-              check_order_with_booking(booking)
+              sale_status = check_order_with_booking(booking)
+              if sale_status
+                return false
+              end
             else
               @order.new_booking = false
               @order.booking_id = params[:booking_id]
             end
           else
-              check_order_with_table(params[:table_id])
+              sale_status = check_order_with_table(params[:table_id])
+              if sale_status
+                return false
+              end
           end
         end #booking exists
       else
@@ -90,9 +96,11 @@ class Api::OrdersController <  Api::ApiController
        if booking
          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
            @order.new_booking = true
+           return true
          else
            @order.new_booking = false
            @order.booking_id = booking.booking_id
+           return false
          end
        end
     end
@@ -101,9 +109,11 @@ class Api::OrdersController <  Api::ApiController
   def check_order_with_booking(booking)
     if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
       @order.new_booking = true
+      return true
     else
       @order.new_booking = false
       @order.booking_id = params[:booking_id]
+      return false
     end
   end
   # Description

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