From 857ab0ae14cb22ce012861dd960d3a17fd74d929 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 16:49:09 +0630
Subject: [PATCH] update for multiple cashier

---
 app/controllers/origami/shifts_controller.rb | 7 +++++++
 app/models/shift_sale.rb                     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index a0e027ba..34614424 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -15,6 +15,7 @@ class Origami::ShiftsController < BaseOrigamiController
     opening_balance = params[:opening_balance]
     cashier_terminal_param = params[:cashier_terminal]
 
+    # Multiple Cashier
     cashier_terminal = CashierTerminal.find(cashier_terminal_param)
     if cashier_terminal.is_currently_login
       respond_to do |format|
@@ -22,6 +23,7 @@ class Origami::ShiftsController < BaseOrigamiController
       end
     end
 
+    # Update Cashier Terminal
     cashier_terminal.is_currently_login = 1
     cashier_terminal.save
 
@@ -36,8 +38,13 @@ class Origami::ShiftsController < BaseOrigamiController
     if @shift
       @shift.shift_closed_at = DateTime.now.utc
       @shift.closing_balance = closing_balance.to_f
+      @shift.cashier_terminal.is_currently_login = 0
       @shift.save
 
+      # Multiple Cashier
+      #cashier_terminal = @shift.cashier_terminal
+
+
       unique_code = "CloseCashierPdf"
       shop_details = Shop.find(1)
       #get tax
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 68c64cff..e9a6dd44 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -37,6 +37,7 @@ class ShiftSale < ApplicationRecord
     self.shift_started_at = DateTime.now
     self.employee_id = current_user.id
     self.opening_balance = opening_balance
+    self.other_sales = 0
     self.save
   end