git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add shift module

Browse Source
This commit is contained in:
Yan
2017-06-29 14:09:56 +06:30
parent fbeab17b3c
commit 769509adec
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/routes.rb
View File

@@ -100,8 +100,6 @@ Rails.application.routes.draw do
get "/:id/request_bills" => "request_bills#print",:as => "request_bill" get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
<<<<<<< HEAD
=======
#---------Shift ---------------# #---------Shift ---------------#
resources :shifts, only: [:index, :new, :create, :edit] resources :shifts, only: [:index, :new, :create, :edit]
@@ -117,7 +115,6 @@ Rails.application.routes.draw do
#payment - Incoming payments - [accept all payment types (cash, other payments (except rebate)) #payment - Incoming payments - [accept all payment types (cash, other payments (except rebate))
#payment - Outing payments - Cash only [ *Misc expeness tracking] #payment - Outing payments - Cash only [ *Misc expeness tracking]
>>>>>>> 11c3be8f4a6b853a11b0e3f27e0fe60af75386d9
#--------- Payment ------------# #--------- Payment ------------#
get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' } get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
get 'sale/:sale_id/payment' => 'payments#show' get 'sale/:sale_id/payment' => 'payments#show'