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

check token for cloud

Browse Source
This commit is contained in:
phyusin
2018-05-11 17:52:52 +06:30
parent c65bf1c163
commit 7d45e6ca81
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/channels/order_reservation.js
View File

@@ -8,7 +8,7 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel'
var order = data.data;
if(order.length > 0){
$('.custom-table.'+shop_code+'_order_reserve_cable tbody').html("");
$(".nav-item ."+shop_code+" .red > a > p.num").text(order.length);
$("."+shop_code+" > .nav-item.red > a > p.num").text(order.length);
$.each(order, function(key,value){
var active_class = "";
if(key==0){

2
app/assets/javascripts/order_reservation.js
View File

@@ -147,6 +147,8 @@ $(function() {
return false;
}
});
$('button[data-dismiss="modal"]').on('click', function(){ $(this).parent().parent().parent().parent().modal('hide'); });
});
function check_emp_access_code(access_code,type) {

2
app/controllers/concerns/token_verification.rb
View File

@@ -18,7 +18,7 @@ module TokenVerification
# Rails.logger.debug "token - " + token.to_s
if(options.length !=0 && options["from"] == "DOEMAL")
if(ENV["SERVER_MODE"] === "cloud")
from = "local" #request.subdomain.downcase + "." + request.domain.downcase
from = request.subdomain.downcase + "." + request.domain.downcase #"local"
aes = MyAesCrypt.new
return aes.checkKeyForAuth(from, token)
end

6
app/views/origami/order_reservation/index.html.erb
View File

@@ -30,8 +30,8 @@
<!-- end count function -->
<div class="row m-t--10">
<div class="col-lg-5 col-md-5 col-sm-5 div_order_margin">
<ul class="nav nav-tabs tab-col-teal" role="tablist">
<li class="nav-item <%= @shop.shop_code %> red m-b-5" data-color="#F44336" data-type="pending">
<ul class="nav nav-tabs tab-col-teal <%= @shop.shop_code %>" role="tablist">
<li class="nav-item red m-b-5" data-color="#F44336" data-type="pending">
<a class="nav-link" data-toggle="tab" href="#pending" role="tab">
<p class="num p-t-5">
<%= pending_count %>
@@ -579,7 +579,7 @@
</div>
<div class="modal-body doemal_new_orderBody">
<div class="form-group text-center">
You have new order <b><span id="new_order"></span></b> at <b><span id="new_order_date"></span></b>
You have new order <b><span id="new_order"></span></b> requested for <b><span id="new_order_date"></span></b>
</div>
</div>
<div class="modal-footer ">