change split bill
This commit is contained in:
@@ -38,11 +38,11 @@ class ApplicationController < 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
|
||||||
|
|
||||||
|
|||||||
@@ -60,9 +60,9 @@ class License
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@license = Marshal.load(cache_license)
|
# @license = Marshal.load(cache_license)
|
||||||
assign(aes_key, aes_iv)
|
# assign(aes_key, aes_iv)
|
||||||
Rails.logger.info 'API License'
|
# Rails.logger.info 'API License'
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -247,8 +247,8 @@ $('#back').on('click',function(){
|
|||||||
|
|
||||||
function warnBeforeRedirect(linkURL) {
|
function warnBeforeRedirect(linkURL) {
|
||||||
swal({
|
swal({
|
||||||
title: "Oops",
|
title: "Alert!",
|
||||||
text: "Are you sure you want to Logout ?",
|
text: "Are you sure you want to close cashier?",
|
||||||
type: "warning",
|
type: "warning",
|
||||||
showCancelButton: true
|
showCancelButton: true
|
||||||
}, function() {
|
}, function() {
|
||||||
|
|||||||
@@ -26,12 +26,11 @@
|
|||||||
<div class="row m-l-5">
|
<div class="row m-l-5">
|
||||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||||
<ul class="nav nav-tabs tabs-left sideways">
|
<ul class="nav nav-tabs tabs-left sideways">
|
||||||
|
<li class="active">
|
||||||
|
<a href="#all_order" data-toggle="tab">All</a>
|
||||||
|
</li>
|
||||||
<% @orders.each.with_index(0) do |order, order_index| %>
|
<% @orders.each.with_index(0) do |order, order_index| %>
|
||||||
<% active_class = "" %>
|
<li class="order-row">
|
||||||
<% if order_index == 0 %>
|
|
||||||
<% active_class = "active" %>
|
|
||||||
<% end %>
|
|
||||||
<li class="order-row <%= active_class %>">
|
|
||||||
<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
|
<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user