merge with crm

2017-07-01 20:11:52 +06:30
parent 6fe2de877c c26b80066b
commit 97c70fb72b
28 changed files with 467 additions and 98 deletions
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -25,8 +25,8 @@ class ShiftSale < ApplicationRecord
    #end
  end

-  def create(opening_balance,current_user)
-    self.cashier_terminal_id = CashierTerminal.first.id
+  def create(opening_balance,cashier_terminal, current_user)
+    self.cashier_terminal_id = cashier_terminal
    self.shift_started_at = DateTime.now
    self.employee_id = current_user.id
    self.opening_balance = opening_balance