merge with master

config/routes.rb

@@ -82,17 +82,19 @@ Rails.application.routes.draw do
     get "/:id/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
 
-    get "/:id/request_bills" => "request_bills#print"    
+    get "/:id/request_bills" => "request_bills#print"
 
     #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'
-    post 'payment_process' => 'payments#create'
-    post 'paypar_payment_process' => 'paypar_payments#create'
+    post 'payment/cash' => 'payments#create'
+    post 'payment/paypar' => 'paypar_payments#create'
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
+
     # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
+
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
-    post 'create_mpu_payment' => "mpu#create"
+    post 'payment/mpu' => "mpu#create"
     get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
 
     #---------Add Customer --------------#
@@ -100,7 +102,6 @@ Rails.application.routes.draw do
     get '/:sale_id/add_customer', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer'
     post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
-
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -167,8 +168,10 @@ Rails.application.routes.draw do
     resources :tax_profiles
     #lookups
     resources :lookups
-    #orders 
+    #orders
     resources :orders
+    #sales 
+    resources :sales
     #cashier_terminals
     resources :cashier_terminals
     #order_job_stations