Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

config/initializers/action_controller.rb

@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      # check for license file
+      #check for license file
       # if check_license
       #   current_license(ENV["SX_PROVISION_URL"])
       # else

config/locales/en.yml

@@ -122,6 +122,8 @@ en:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "CREDIT"
       other_payment: "Other Payment"
       percentage: "PERCENTAGE"
@@ -412,6 +414,7 @@ en:
         redeem_sales: "Redeem Sales"
         cash_sales: "Cash Sales"
         credit_sales: "Credit Sales"
+        alipay_sales: "Alipay Sales"
         foc_sales: "FOC Sales"
         foc_item: "Item FOC"
         net_amount: "Net Amount"

config/locales/mm.yml

@@ -117,6 +117,8 @@ mm:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "အကြွေး"
       other_payment: "အခြားငွေပေးဆောင်မှုများ"
       percentage: "ရာခိုင်နှုန်း"
@@ -404,6 +406,7 @@ mm:
         master_sales: "Master ရောင်းရငွေ"
         visa_sales: "Visa ရောင်းရငွေ"
         jcb_sales: "JCB ရောင်းရငွေ"
+        alipay_sales: "Alipay ရောင်းရငွေ"
         redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
         cash_sales: "ငွေသား ရောင်းရငွေ"
         credit_sales: "အကြွေး ရောင်းရငွေ"

config/routes.rb

@@ -78,15 +78,13 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
-       #---------Waste and Spoile --------------#
-    post 'sale/:sale_id/:type/waste_and_spoilage' => 'waste_spoile#waste_and_spoilage'
     end
 
     
   end
 
   #--------- Cashier ------------#
-  namespace :origami do
+  namespace :origami do    
 
     get "dashboard" => "dashboard#index" 
 
@@ -181,6 +179,9 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
+    post 'payment/paymal' => 'paymal#create'
+    post 'payment/alipay' => 'alipay#create'
+    post 'payment/junctionpay' => 'junctionpay#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -188,14 +189,17 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index"
     get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
+    get 'sale/:sale_id/:type/payment/others_payment/PAYMAL' => "paymal#index"
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
-    
+    post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage"
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -296,7 +300,9 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- System Settings ------------#
   namespace :settings do
-    resources :shops
+    resources :shops do
+      resources :display_images
+    end
     #employees
     resources :employees
     #menu
@@ -406,6 +412,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :shiftsale, :only => [:index, :show]
     resources :credit_payment, :only => [:index, :show]
     resources :void_sale, :only => [:index, :show]
+    resources :waste_and_spoilage, :only => [:index, :show]
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method