From 298fc9a3f078bde7a449a58c0f742b28c4412321 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 30 Mar 2018 15:48:55 +0630
Subject: [PATCH] merge with second display

---
 app/assets/javascripts/origami.js             |  3 +++
 app/views/origami/alipay/index.html.erb       |  1 +
 app/views/origami/junction_pay/index.html.erb |  1 +
 config/initializers/action_controller.rb      | 10 +++++-----
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 1cbc63ed..42fca385 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -24,6 +24,9 @@ _IN_DUTIES_			= "/&nbsp;&nbsp;&nbsp;IN DUTIES";
 _JCB_				= "/&nbsp;&nbsp;&nbsp;JCB PAYMENT";
 _MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
 _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
+_ALIPAY_			= "/&nbsp;&nbsp;&nbsp;Alipay";
+_JUNCTIONPAY_		= "/&nbsp;&nbsp;&nbsp;JunctionPay";
+_PAYMAL_			= "/&nbsp;&nbsp;&nbsp;Paymal";
 _OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
 _OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
 _PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
diff --git a/app/views/origami/alipay/index.html.erb b/app/views/origami/alipay/index.html.erb
index a9959512..abd065fb 100755
--- a/app/views/origami/alipay/index.html.erb
+++ b/app/views/origami/alipay/index.html.erb
@@ -124,6 +124,7 @@
 <script>
 	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
+		setHeaderBreadCrumb(_ALIPAY_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		
diff --git a/app/views/origami/junction_pay/index.html.erb b/app/views/origami/junction_pay/index.html.erb
index cdbdc47d..76be5380 100755
--- a/app/views/origami/junction_pay/index.html.erb
+++ b/app/views/origami/junction_pay/index.html.erb
@@ -120,6 +120,7 @@
 <script>
 	var cashier_type = "<%= @cashier_type %>";  
 	$(document).ready(function() {
+		setHeaderBreadCrumb(_JUNCTIONPAY_);
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 20c5624c..dcfcfed5 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end