api/bill_controller edited

config/application.rb

@@ -13,7 +13,6 @@ module SXRestaurants
     # -- all .rb files in that directory are automatically loaded.
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
-    # config.time_zone = 'Asia/Rangoon'
-    
+    config.time_zone = 'Asia/Rangoon'    
   end
 end

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
@@ -89,14 +91,37 @@ Rails.application.routes.draw do
     get 'room/:room_id' => 'rooms#show'
     get 'order/:order_id' => "orders#show"
 
-    post '/:booking_id' => 'home#item_show'
+    # post '/:booking_id' => 'home#item_show'
 
+    # Other Charges
+    get "/:sale_id/other_charges" => "other_charges#index"
+    post "/:sale_id/other_charges" => "other_charges#create"
+
+    # Discount
     get "/:id/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
+    get "/:id/remove_all_discount" => "discounts#remove_all_discount"
+    post "/:id/remove_discount_items" => "discounts#remove_discount_items"
 
-    post "/:id/request_bills" => "request_bills#print",:as => "request_bill" ,:defaults => { :format => 'json' }
+    get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
+
+    #---------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]
+
     #--------- Payment ------------#
+    get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'
 
     post 'payment/cash' => 'payments#create'
@@ -148,6 +173,7 @@ Rails.application.routes.draw do
 
       get "/dining_queues/:id/assign"    =>"dining_queues#assign", :as => "assign"
       post "/dining_queues/assign_table" =>"dining_queues#assign_table", :as => "assign_table"
+      post "/dining_queues/cancel_queue" =>"dining_queues#cancel_queue", :as => "cancel_queue"
 
   end
 
@@ -241,8 +267,9 @@ Rails.application.routes.draw do
   #--------- Reports Controller Sections ------------#
   namespace :reports do
     resources :receipt_no, :only => [:index, :show]
-    resources :daily_sales, :only => [:index, :show]
-    resources :sale_items, :only => [:index, :show]
+    resources :dailysale, :only => [:index, :show]
+    resources :saleitem, :only => [:index, :show]
+    resources :shiftsale, :only => [:index, :show]
     # resources :sales, :only => [:index, :show]
     # resources :orders, :only => [:index, :show]
     # resources :customers, :only => [:index, :show]