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

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

@@ -84,7 +84,8 @@ scope "(:locale)", locale: /en|mm/ do
   end
 
   #--------- Cashier ------------#
-  namespace :origami do
+  namespace :origami do    
+
     get "dashboard" => "dashboard#index" 
 
     get "quick_service" => "quick_service#index"
@@ -178,6 +179,8 @@ 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/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,10 +191,14 @@ scope "(:locale)", locale: /en|mm/ do
     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"
     get 'table/:table_id/table_invoice/:invoice_id' => "table_invoices#show", :as => "table_invoice_show"
@@ -245,6 +252,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :second_display #second display routes
 
     post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
+
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -398,6 +406,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