merge with origin master

config/routes.rb

@@ -70,6 +70,8 @@ Rails.application.routes.draw do
 
   #--------- Cashier ------------#
   namespace :origami do
+    resources :cash_ins, only:[:new, :create]
+    resources :cash_outs, only:[:new, :create]
     root "home#index"
     get "table/:dining_id" => "home#show" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type
@@ -98,6 +100,24 @@ Rails.application.routes.draw do
 
     get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
+<<<<<<< HEAD
+=======
+
+    #---------Shift ---------------#
+    resources :shifts, only: [:index, :new, :create, :edit]
+    post 'close_shift' => 'shifts#update_shift'
+    get 'shift/close' => 'shifts#show' 
+    #shift - index (open/close shift landing page)
+    #shift - show (sales summary display)
+    #shift - new (open shift)
+    #shift - edit (close shift)
+
+    resources :cash_mgmt, only: [:new, :create]
+    #payment - accepting or expending money from cashier - [Cash Journal]
+    #payment - Incoming payments - [accept all payment types (cash, other payments (except rebate))
+    #payment - Outing payments - Cash only [ *Misc expeness tracking]
+
+>>>>>>> 11c3be8f4a6b853a11b0e3f27e0fe60af75386d9
     #--------- Payment ------------#
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'