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

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

Browse Source
This commit is contained in:
phyusin
2018-05-04 10:37:51 +06:30
parent 5099ec6b8f 8d73269c28
commit 8cc81a6bad
2 changed files with 84 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/sale.rb
View File

@@ -1139,8 +1139,14 @@ def self.get_wastes_and_spoilages(from,to,status)
else else
type = "and sales.sale_status = 'waste'" type = "and sales.sale_status = 'waste'"
end end
query = Sale.all.where("sales.receipt_date between ? and ? #{type}",from,to) query = Sale.select("sales.sale_id,sales.receipt_no,sales.created_at,sales.total_amount,sales.grand_total,sales.rounding_adjustment,sales.shift_sale_id,sale_items.product_name,sale_items.product_code,sale_items.item_instance_code,sale_items.qty,sale_items.price,sale_items.unit_price,menu_categories.name")
.group("sales.receipt_no") .joins("JOIN sale_items ON sales.sale_id = sale_items.sale_id" +
" JOIN menu_item_instances ON sale_items.item_instance_code = menu_item_instances.item_instance_code" +
" JOIN menu_items ON menu_item_instances.menu_item_id = menu_items.id" +
" JOIN menu_categories ON menu_items.menu_category_id = menu_categories.id")
.where("sales.receipt_date between ? and ? #{type}",from,to)
.group("sales.receipt_no,menu_categories.id,sale_items.item_instance_code")
.order("sales.sale_id,menu_categories.name,sale_items.product_name")
end end
# def self.get_separate_tax(from,to,payment_method=nil) # def self.get_separate_tax(from,to,payment_method=nil)

55
app/views/reports/waste_and_spoilage/index.html.erb
View File

@@ -21,42 +21,65 @@
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">
<h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5> <h5 class="p-l-10 p-t-10">Report For <%= @sale_type? @sale_type : 'Waste' %></h5>
<% @sale_data.each do |sale| %> <% receipt_arr = Array.new %>
<% menu_cat_arr = Array.new %>
<% footer_arr = Array.new %>
<% count = 0 %>
<% waste_and_spoil_item_count = 0%> <% waste_and_spoil_item_count = 0%>
<% @sale_data.each do |sale| %>
<% if !receipt_arr.include?(sale.receipt_no) %>
<thead> <thead>
<td>&nbsp;</td>
<tr> <tr>
<td > <td >
<strong>Receipt No :<%= sale.receipt_no %></strong> <strong>Receipt No :<%= sale.receipt_no %></strong>
</td> </td>
<td></td> <td></td>
<td></td>
<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td> <td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
</tr> </tr>
</thead>
<tbody>
<tr> <tr>
<td ><strong>Item Name</strong></td> <td><strong>Menu Category</strong></td>
<td ><strong>Item Code</strong></td> <td><strong>Item Name</strong></td>
<td><strong>Item Code</strong></td>
<td><strong>Qty</strong></td> <td><strong>Qty</strong></td>
<td><strong>Price</strong></td> <td><strong>Price</strong></td>
<td><strong>Total Price</strong></td> <td><strong>Total Price</strong></td>
</tr> </tr>
</thead>
<% receipt_arr.push(sale.receipt_no) %>
<% menu_cat_arr.clear %>
<% count = 0 %>
<% end %>
<% sale.sale_items.each do |item| %> <tbody>
<% if !item.item_instance_code.nil?%> <% if !sale.item_instance_code.nil?%>
<% waste_and_spoil_item_count += item.qty.to_i%> <% waste_and_spoil_item_count += sale.qty.to_i %>
<tr> <tr>
<td><%= item.product_name %></td> <% if !menu_cat_arr.include?(sale.name) %>
<td><%= item.product_code %></td> <td><%= sale.name %></td>
<td><%= item.qty %></td> <% menu_cat_arr.push(sale.name) %>
<td><%= item.price %></td> <% else %>
<td><%= item.price %></td> <td>&nbsp;</td>
<% end %>
<td><%= sale.product_name %></td>
<td><%= sale.product_code %></td>
<td><%= sale.qty.to_i %></td>
<td><%= sale.unit_price %></td>
<td><%= sale.price %></td>
</tr> </tr>
<% end %> <% end %>
<% end %>
<% count = count + 1 %>
<% if sale.sale_items.count == count %>
<tr> <tr>
<td></td>
<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td> <td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td>
<td><span class="underline" style="text-align:right"> <td>
<span class="underline" style="text-align:right">
<strong><%= waste_and_spoil_item_count %></strong> <strong><%= waste_and_spoil_item_count %></strong>
<% waste_and_spoil_item_count = 0%>
</span></td> </span></td>
<td style="text-align:right"> <strong>Grand Total: </strong></td> <td style="text-align:right"> <strong>Grand Total: </strong></td>
<td > <td >
@@ -65,6 +88,8 @@
</span> </span>
</td> </td>
</tr> </tr>
<% footer_arr.push(sale.sale_id) %>
<% end %>
</tbody> </tbody>
<% end %> <% end %>
</table> </table>