git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with second display

Browse Source
This commit is contained in:
phyusin
2018-03-30 15:48:55 +06:30
parent 40175d64cd
commit 298fc9a3f0
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/origami.js
View File

@@ -24,6 +24,9 @@ _IN_DUTIES_ = "/   IN DUTIES";
_JCB_ = "/   JCB PAYMENT"; _JCB_ = "/   JCB PAYMENT";
_MASTER_ = "/   MASTER PAYMENT"; _MASTER_ = "/   MASTER PAYMENT";
_MPU_ = "/   MPU PAYMENT"; _MPU_ = "/   MPU PAYMENT";
_ALIPAY_ = "/   Alipay";
_JUNCTIONPAY_ = "/   JunctionPay";
_PAYMAL_ = "/   Paymal";
_OTHER_CHARGES_ = "/   CHARGES"; _OTHER_CHARGES_ = "/   CHARGES";
_OTHER_PAYMENTS_ = "/   OTHER PAYMENT"; _OTHER_PAYMENTS_ = "/   OTHER PAYMENT";
_PAYMENTS_ = "/   PAYMENT"; _PAYMENTS_ = "/   PAYMENT";

1
app/views/origami/alipay/index.html.erb
View File

@@ -124,6 +124,7 @@
<script> <script>
var cashier_type = "<%= @cashier_type %>"; var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() { $(document).ready(function() {
setHeaderBreadCrumb(_ALIPAY_);
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";

1
app/views/origami/junction_pay/index.html.erb
View File

@@ -120,6 +120,7 @@
<script> <script>
var cashier_type = "<%= @cashier_type %>"; var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() { $(document).ready(function() {
setHeaderBreadCrumb(_JUNCTIONPAY_);
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){} if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}

10
config/initializers/action_controller.rb
View File

@@ -20,11 +20,11 @@ class ActionController::Base
end end
else else
#check for license file #check for license file
if check_license # if check_license
current_license(ENV["SX_PROVISION_URL"]) # current_license(ENV["SX_PROVISION_URL"])
else # else
redirect_to activate_path # redirect_to activate_path
end # end
end end
end end