merge with origin master

app/controllers/api/bill_controller.rb

@@ -37,14 +37,18 @@ class Api::BillController < Api::ApiController
     # # get member information
     # member_info = Customer.get_member_account(customer)
 
+
     # # get printer info
     # print_settings=PrintSetting.find_by_unique_code(unique_code)
 
     # # Calculate Price by accounts
     # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
+
     # printer = Printer::ReceiptPrinter.new(print_settings)
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
+
+
   end
 
 

app/controllers/home_controller.rb

@@ -80,7 +80,7 @@ class HomeController < ApplicationController
       redirect_to dashboard_path
     elsif employee.role == "cashier"
       #check if cashier has existing open cashier
-      shift = ShiftSale.current_open_shift(employee)
+      shift = ShiftSale.current_open_shift(employee.id)
       if !shift.nil?
         redirect_to origami_root_path
       else

app/controllers/origami/cash_ins_controller.rb

@@ -0,0 +1,15 @@
+class Origami::CashInsController < BaseOrigamiController
+
+  def new
+  end
+
+  def create
+    reference = params[:reference]
+    remark = params[:remark]
+    amount = params[:amount]
+    payment_method = params[:payment_method]
+    payment_method_reference = params[:payment_method_reference]
+    p_jour = PaymentJournal.new
+    p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user.id)
+  end
+end

app/controllers/origami/cash_outs_controller.rb

@@ -0,0 +1,13 @@
+class Origami::CashOutsController < BaseOrigamiController
+
+  def new
+  end
+
+  def create
+    reference = params[:reference]
+    remark = params[:remark]
+    amount = params[:amount]
+    p_jour = PaymentJournal.new
+    p_jour.cash_out(reference, remark, amount, current_user.id)
+  end
+end

app/controllers/origami/home_controller.rb

@@ -6,6 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all
     @orders = Order.all.order('date desc')
+    # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
  # origami table detail

app/controllers/origami/request_bills_controller.rb

@@ -39,6 +39,7 @@ class Origami::RequestBillsController < BaseOrigamiController
 
     # printer = Printer::ReceiptPrinter.new(print_settings)
 
-    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)    
+
+    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
 end

app/controllers/origami/shifts_controller.rb

@@ -4,10 +4,11 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
+    @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
   def new
-    @float = Lookup.where('lookup_type=?','float')
+    @float = Lookup.where('lookup_type=?','float_value')
   end
 
   def create
@@ -16,6 +17,14 @@ class Origami::ShiftsController < BaseOrigamiController
     @shift.create(opening_balance,current_user)
   end
 
+  def update_shift
+    @shift = ShiftSale.current_open_shift(current_user.id)
+    if @shift
+      @shift.shift_closed_at = DateTime.now.utc
+      @shift.save
+    end
+  end
+
   def edit
   end
 end