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

config/locales/en.yml

@@ -412,6 +412,11 @@ en:
         master_sales: "Master Sales"
         visa_sales: "Visa Sales"
         jcb_sales: "JCB Sales"
+        unionpay_sales: "Unionpay Sales"
+        alipay_sales: "Alipay Sales"
+        paymal_sales: "Paymal Sales"
+        dinga_sales: "Dinga Sales"
+        junctionpay_sales: "JunctionPay Sales"
         redeem_sales: "Redeem Sales"
         cash_sales: "Cash Sales"
         credit_sales: "Credit Sales"

config/locales/mm.yml

@@ -408,6 +408,10 @@ mm:
         visa_sales: "Visa ရောင်းရငွေ"
         jcb_sales: "JCB ရောင်းရငွေ"
         alipay_sales: "Alipay ရောင်းရငွေ"
+        unionpay_sales: "Unionpay ရောင်းရငွေ"
+        paymal_sales: "Paymal ရောင်းရငွေ"
+        dinga_sales: "Dinga ရောင်းရငွေ"
+        junctionpay_sales: "JunctionPay ရောင်းရငွေ"
         redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
         cash_sales: "ငွေသား ရောင်းရငွေ"
         credit_sales: "အကြွေး ရောင်းရငွေ"

config/routes.rb

@@ -184,6 +184,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/paymal' => 'paymal#create'
     post 'payment/alipay' => 'alipay#create'
     post 'payment/junctionpay' => 'junctionpay#create'
+    post 'payment/dinga' => 'dinga#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -197,6 +198,7 @@ scope "(:locale)", locale: /en|mm/ do
     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"
+    get 'sale/:sale_id/:type/payment/others_payment/DINGA' => "dinga#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/:type/void' => 'void#overall_void'

config/secrets.yml

@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L