change split bill

This commit is contained in:
phyusin
2018-02-14 17:07:33 +06:30
parent 75cadc7ed3
commit 8898ba597a
4 changed files with 14 additions and 15 deletions

View File

@@ -38,11 +38,11 @@ class ApplicationController < 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

View File

@@ -60,9 +60,9 @@ class License
return true
end
else
@license = Marshal.load(cache_license)
assign(aes_key, aes_iv)
Rails.logger.info 'API License'
# @license = Marshal.load(cache_license)
# assign(aes_key, aes_iv)
# Rails.logger.info 'API License'
return true
end
end

View File

@@ -247,8 +247,8 @@ $('#back').on('click',function(){
function warnBeforeRedirect(linkURL) {
swal({
title: "Oops",
text: "Are you sure you want to Logout ?",
title: "Alert!",
text: "Are you sure you want to close cashier?",
type: "warning",
showCancelButton: true
}, function() {

View File

@@ -26,12 +26,11 @@
<div class="row m-l-5">
<div class="col-lg-3 col-md-3 col-sm-3">
<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| %>
<% active_class = "" %>
<% if order_index == 0 %>
<% active_class = "active" %>
<% end %>
<li class="order-row <%= active_class %>">
<li class="order-row">
<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
</li>
<% end %>