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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

Browse Source
This commit is contained in:
Zoey
2019-05-28 09:34:48 +06:30
parent 4328ab1cea 2f2836b1a2
commit 0c66cd3425
6 changed files with 133 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/sale.rb
View File

@@ -879,6 +879,7 @@ def self.daily_sales_list(from,to)
total_sale.each do |sale| total_sale.each do |sale|
grand_total = sale.grand_total grand_total = sale.grand_total
amount_received = sale.amount_received
old_grand_total = sale.old_grand_total old_grand_total = sale.old_grand_total
total_discount = sale.total_discount total_discount = sale.total_discount
void_amount = sale.void_amount void_amount = sale.void_amount

4
app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
View File

@@ -47,8 +47,8 @@
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" >
</select> </select>
</div> </div>
<div class="col-lg-12 col-md-12 col-sm-12 margin-top-20 text-right"> <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20" style="margin-top: 20px;">
<br>
<input type="submit" value="Generate Report" class='btn btn-primary'> <input type="submit" value="Generate Report" class='btn btn-primary'>
</div> </div>
</div> </div>

6
app/views/reports/receipt_no/index.html.erb
View File

@@ -158,7 +158,11 @@
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<% end %> <% end %>
<%end%> <%end%>
<td><%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <% if result.old_grand_total.nil? %>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%else%>
<td><%= number_with_precision(result.old_grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%end%>
<td><%= result.rounding_adjustment.to_f rescue '-' %></td> <td><%= result.rounding_adjustment.to_f rescue '-' %></td>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td> <td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>

2
app/views/reports/shiftsale/index.html.erb
View File

@@ -90,7 +90,7 @@
<tr> <tr>
<td> <td>
<%= result[:cashier_terminal_name] rescue '-'%> <%= result[:shift_id].to_i %> <%= result[:cashier_terminal_name] rescue '-'%>
</td> </td>
<td> <td>
<%= result[:employee_name] rescue '-'%> <%= result[:employee_name] rescue '-'%>

13
config/initializers/action_controller.rb
View File

@@ -17,15 +17,17 @@ class ActionController::Base
logger.info 'License is nil' logger.info 'License is nil'
# redirect_to root_url(:host => request.domain) + "store_error" # redirect_to root_url(:host => request.domain) + "store_error"
render :json => [{ status: false, message: 'Invalid Access!'}] render :json => [{ status: false, message: 'Invalid Access!'}]
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
def current_license(url) def current_license(url)
@@ -146,4 +148,3 @@ class ActionController::API
end end
end end

19
config/puma.rb
View File

@@ -1,10 +1,9 @@
# application_path="#{File.expand_path("../..", __FILE__)}" application_path="#{File.expand_path("../..", __FILE__)}"
# directory application_path directory application_path
# # environment ENV.fetch("RAILS_ENV") { "production" } environment "production"
# environment "production" pidfile "#{application_path}/tmp/puma/pid"
# pidfile "#{application_path}/tmp/puma/pid" state_path "#{application_path}/tmp/puma/state"
# state_path "#{application_path}/tmp/puma/state" stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" port ENV.fetch("PORT") { 62158 }
# port ENV.fetch("PORT") { 62158 } workers 2
# workers 2 preload_app!
# preload_app!