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

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-07-03 10:26:26 +06:30
parent 399825b98c dac4c59007
commit 15cbac995f
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/sale.rb
View File

@@ -281,8 +281,8 @@ class Sale < ApplicationRecord
# sale_tax.tax_payable_amount = total_taxable * tax.rate # sale_tax.tax_payable_amount = total_taxable * tax.rate
# substract , to give after discount # substract , to give after discount
total_taxable = total_taxable - total_discount total_tax = total_taxable - total_discount
sale_tax.tax_payable_amount = total_taxable * tax.rate / 100 sale_tax.tax_payable_amount = total_tax * tax.rate / 100
#new taxable amount is standard rule for step by step #new taxable amount is standard rule for step by step
# total_taxable = total_taxable + sale_tax.tax_payable_amount # total_taxable = total_taxable + sale_tax.tax_payable_amount

1
config/puma.rb
View File

@@ -44,4 +44,5 @@ environment ENV.fetch("RAILS_ENV") { "development" }
# end # end
# Allow puma to be restarted by `rails restart` command. # Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart plugin :tmp_restart

9
config/puma.rb.save
View File

@@ -1,9 +0,0 @@
lapplication_path = '/home/superuser/Application/production/sxrestaurant'
directory application_path
environment 'production'
daemonize true
pidfile "#{application_path}/tmp/pids/puma.pid"
state_path "#{application_path}/tmp/pids/puma.state"
stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
bind 'tcp://0.0.0.0:9292'
workers 2