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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2017-12-08 17:03:56 +06:30
parent 9310baa81a 2d2b7ecb4c
commit 725daaf7d4
5 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/reports/receipt_no_controller.rb
View File

@@ -21,7 +21,6 @@ authorize_resource :class => false
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@tax_profiles = TaxProfile.order('order_by asc')
@from = from
@to = to

12
app/models/license.rb
View File

@@ -61,7 +61,7 @@ class License
@license = response.parsed_response
if (@license["status"] == true)
assign()
assign(aes_key, aes_iv)
Rails.logger.info "License - " + response.parsed_response.to_s
@@ -79,7 +79,7 @@ class License
end
else
@license = Marshal.load(cache_license)
assign()
assign(aes_key, aes_iv)
Rails.logger.info 'API License'
return true
end
@@ -330,7 +330,7 @@ class License
end
# Assign db info for Cloud
def assign
def assign(aes_key, aes_iv)
# self.name = @license["name"]
# self.address_1 = @license["address_1"]
# self.address_2 = @license["address_2"]
@@ -354,10 +354,10 @@ class License
# self.plan_active_connections = @license["plan_active_connections"].to_i
# salt = @license["secret_key"]
key = Base64.decode64(ENV['AES_KEY'])
iv = Base64.decode64(ENV['AES_IV'])
key = Base64.decode64(aes_key)
iv = Base64.decode64(aes_iv)
if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )
if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )
host = Base64.decode64(@license["dbhost"])
dbschema = Base64.decode64(@license["dbschema"])
dbusername = Base64.decode64(@license["dbusername"])

33
app/models/my_aes_crypt.rb
View File

@@ -30,7 +30,7 @@ class MyAesCrypt
def export_to_file(passphrase)
file_path = "config/shops.json"
aes_key, aes_iv = export_key(passphrase)
tmpHash = {
tmpHash = {
"lookup" => passphrase,
"value" =>
{
@@ -40,27 +40,20 @@ class MyAesCrypt
}
shop_data = File.read(file_path)
if shop_data != ""
shop_json = JSON.parse(shop_data)
shop_json.each do |j|
byebug
if j == passphrase
j.each do |k|
return k["key"], k["iv"]
end
end
shop_json = JSON.parse(shop_data)
shop_json["data"].each do |j|
if j["lookup"] == passphrase
return j["value"]["key"], j["value"]["iv"]
end
shop_json << tmpHash
File.open(file_path, "w") { |io|
io.puts JSON.pretty_generate(shop_json)
}
else
File.open(file_path, "w") { |io|
io.write(tmpHash.to_json)
}
end
shop_json["data"] << tmpHash
File.open(file_path, "w") { |io|
io.puts JSON.pretty_generate(shop_json)
}
return aes_key, aes_iv
end

6
app/models/sale.rb
View File

@@ -764,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
query = Sale.all
if shift.present?
query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id")
elsif shift_sale_range.present?
query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id")
else
query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id")
end
return query
end
def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)

59
app/views/origami/addorders/detail.html.erb
View File

@@ -7,36 +7,41 @@
<div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
<%
@menu.each do |menu|
if menu.menu_category_id.nil?
%>
<!-- <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
-->
<li class="nav-item menu_category">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
</li>
<%
end
# Sub-Category
if !menu.menu_category_id.nil?
%>
<ul class="collapse" id="<%= menu.menu_category_id %>">
<li>
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" role="tab"> <%= menu.name%></a>
</li>
</ul>
<%
end
end
%>
<% @menu.each do |menu| %>
<% if menu.menu_category_id.nil?%>
<li class="nav-item menu_category">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
</li>
<% end%>
<!-- Sub-Category -->
<% if !menu.menu_category_id.nil? %>
<ul class="collapse" id="<%= menu.menu_category_id %>">
<li>
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" role="tab"> <%= menu.name%></a>
</li>
</ul>
<% end%>
<%end %>
<!-- <li class="nav-item menu_category">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>
<ul class="dropdown-menu multi-level">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
<li class="divider"></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li> -->
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
</ul>
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10">