Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/controllers/api/bill_controller.rb

@@ -5,7 +5,8 @@ class Api::BillController < Api::ApiController
   def create
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
-    if ShiftSale.current_shift
+
+    if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -15,16 +16,18 @@ class Api::BillController < Api::ApiController
 
         cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
 
-        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id(cashier_zone.cashier_terminal_id)
+        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
         get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
 
           if booking
             if booking.sale_id.nil?
               @sale = Sale.new
               @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier_by_terminal)
+              @sale_data = Sale.find_by_sale_id(@sale_id)
             else
               @status = true
               @sale_id = booking.sale_id
+              @sale_data = Sale.find_by_sale_id(@sale_id)
             end
           end
 
@@ -36,6 +39,11 @@ class Api::BillController < Api::ApiController
         booking  = Booking.find_by_sale_id(@sale_id)
         table = DiningFacility.find(booking.dining_facility_id)
       end
+    
+      # Bind shift sale id to sale
+      @sale_data.shift_sale_id = shift_by_terminal.id
+      @sale_data.save
+
       Promotion.promo_activate(@sale)
 
       BillBroadcastJob.perform_later(table)

app/controllers/api/check_in_process_controller.rb

@@ -3,7 +3,7 @@ class Api::CheckInProcessController < Api::ApiController
 	def check_in_time
 		if params[:dining_id]	
 			dining_facility = DiningFacility.find(params[:dining_id])		
-			booking = dining_facility.get_current_checkout_booking
+			booking = dining_facility.get_current_booking
 			if !booking.nil?
 				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")

app/controllers/origami/credit_payments_controller.rb

@@ -31,6 +31,15 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote")
     end

app/controllers/origami/jcb_controller.rb

@@ -36,6 +36,15 @@ class Origami::JcbController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
     end

app/controllers/origami/mpu_controller.rb

@@ -35,6 +35,15 @@ class Origami::MpuController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
     end

app/controllers/origami/payments_controller.rb

@@ -56,12 +56,13 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
       
+      # rounding adjustment
       if shop_details.is_rounding_adj
         new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
         rounding_adj = new_total-saleObj.grand_total
         saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
-        #end rounding adjment
       end
+      #end rounding adjustment
 
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "cash")

app/controllers/origami/visa_controller.rb

@@ -34,6 +34,16 @@ class Origami::VisaController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
+      #end rounding adjustment
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
     end

app/models/sale.rb

@@ -115,7 +115,7 @@ class Sale < ApplicationRecord
 
       booking.sale_id = self.id
       booking.checkout_at = Time.now.utc.getlocal
-      booking.checkout_by = requested_by.name
+      # booking.checkout_by = requested_by.name
       booking.save      
 
       InventoryJob.perform_now(self.id)

app/models/sale_payment.rb

@@ -213,14 +213,12 @@ class SalePayment < ApplicationRecord
 
   def external_terminal_card_payment(method)
     payment_status = false
-
     self.payment_method = method
     self.payment_amount = self.received_amount
     self.payment_reference  = self.card_payment_reference
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
     return payment_status
   end

app/views/reports/saleitem/index.html.erb

@@ -202,7 +202,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= grand_total + total_tax%></td> 
+								<td style="border-top:2px solid grey;"><%= grand_total.to_f + total_tax.to_f%></td> 
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>