update conflict oragimi.scss

config/routes.rb

@@ -104,6 +104,9 @@ Rails.application.routes.draw do
     get "/:id/remove_all_discount" => "discounts#remove_all_discount"
     post "/:id/remove_discount_items" => "discounts#remove_discount_items"
 
+    # Discount for Member
+    post "/:id/member_discount" => "discounts#member_discount"
+
     get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
 
@@ -111,6 +114,7 @@ Rails.application.routes.draw do
     resources :shifts, only: [:index, :new, :create, :edit]
     post 'close_shift' => 'shifts#update_shift'
     get 'shift/close' => 'shifts#show'
+    get 'shift/sale_summary' => 'shifts#sale_summary'
     #shift - index (open/close shift landing page)
     #shift - show (sales summary display)
     #shift - new (open shift)
@@ -270,10 +274,12 @@ Rails.application.routes.draw do
 
   #--------- Reports Controller Sections ------------#
   namespace :reports do
-    resources :receipt_no, :only => [:index, :show]
+    resources :receipt_no
     resources :dailysale, :only => [:index, :show]
     resources :saleitem, :only => [:index, :show]
     resources :shiftsale, :only => [:index, :show]
+
+    get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
     # resources :sales, :only => [:index, :show]
     # resources :orders, :only => [:index, :show]
     # resources :customers, :only => [:index, :show]