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_material_ui

Browse Source
This commit is contained in:
Aung Myo
2017-11-30 12:05:28 +06:30
parent 6cb7c1e0c4 d15be90a9e
commit a871bf3789
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/shift_sale.rb
View File

@@ -52,10 +52,10 @@ class ShiftSale < ApplicationRecord
self.total_taxes = self.total_taxes + saleobj.total_tax
self.grand_total = self.grand_total + saleobj.grand_total
self.cash_sales = self.cash_sales.to_f + cash.to_f
self.credit_sales = self.credit_sales.to_i + credit.to_f
self.other_sales = self.other_sales.to_i + other_sales.to_f
self.nett_sales = self.nett_sales + (saleobj.total_amount.to_f - saleobj.total_discount) #self.grand_total.to_i - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
self.credit_sales = self.credit_sales.to_f + credit.to_f
self.other_sales = self.other_sales.to_f + other_sales.to_f
self.nett_sales = self.nett_sales + (saleobj.total_amount.to_f - saleobj.total_discount) #self.grand_total.to_f - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_f + tax.to_f
self.total_rounding = self.total_rounding + saleobj.rounding_adjustment
self.total_receipt = self.total_receipt + 1
if saleobj.customer.customer_type == "Dinein"
@@ -79,10 +79,10 @@ class ShiftSale < ApplicationRecord
self.total_taxes = self.total_taxes - saleobj.total_tax
self.grand_total = self.grand_total - saleobj.grand_total
self.cash_sales = self.cash_sales.to_f - cash.to_f
self.credit_sales = self.credit_sales.to_i - credit.to_f
self.other_sales = self.other_sales.to_i - other_sales.to_f
self.credit_sales = self.credit_sales.to_f - credit.to_f
self.other_sales = self.other_sales.to_f - other_sales.to_f
self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - self.total_discounts) #self.grand_total.to_i - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_i - tax.to_f
self.commercial_taxes = self.commercial_taxes.to_f - tax.to_f
self.total_rounding = self.total_rounding - saleobj.rounding_adjustment
self.total_void = self.total_void + saleobj.grand_total
if saleobj.customer.customer_type == "Dinein"

2
app/views/settings/set_menu_items/_form.html.erb
View File

@@ -12,7 +12,7 @@
<%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
<%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
<%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
<%= f.input :is_available,:input_html => {:class => "col-md-9"} %>

2
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -12,7 +12,7 @@
<%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
<%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
<%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
<%= f.input :is_available,:input_html => {:class => "col-md-9"} %>