>
<%=sale_item.account_id%>
+ <%=sale_item.qty%>
<%=sale_item.product_name%>@<%=sale_item.unit_price%>
@@ -71,7 +86,7 @@
Sub Total: <%=sub_total%> <%= number_with_precision(sub_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
@@ -350,7 +364,7 @@
Sub Total: <%= sub_total %> <%= number_with_precision(sub_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
<%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%>
@@ -359,7 +373,7 @@
Discount: (<%= @obj_sale.total_discount rescue 0%>) (<%= number_with_precision(@obj_sale.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)
<% if @status_sale == "sale" %>
@@ -382,15 +396,15 @@
Change Tax
<% end %>
- <%= @obj_sale.total_tax rescue 0%> <%= number_with_precision(@obj_sale.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Rounding Adj: <%= @obj_sale.rounding_adjustment rescue 0%> <%= number_with_precision(@obj_sale.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Grand Total: <%= @obj_sale.grand_total rescue 0%> <%= number_with_precision(@obj_sale.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
<% end %>
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+ <% if period_type != false %>
+
+
+ <%= t("views.right_panel.detail.select_period") %>
+
+ <%= t("views.right_panel.detail.select_period") %>
+ Today
+ Yesterday
+ This week
+ Last week
+ Last 7 days
+ This month
+ Last month
+ Last 30 days
+ This year
+ Last year
+
+
+
+
+ Select Type
+
+ Select Type
+ Revenue Only
+ All Type
+ Discount Only
+ Void Only
+ Foc Only
+ Promotion Only
+ Other Amount Only
+
+
+
+
+
+ <%= t("views.right_panel.detail.from") %>
+
+
+ <%= t("views.right_panel.detail.to") %>
+
+
+ All Shift
+
+
+
+
+
+
+ <% end %>
+
+ <% end %>
+
+
+
+
+ <%= render :partial=>'shift_sale_report_filter',
+ :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %>
+
+
+
+
+
+
+ <% time_arr = Array.new %>
+ <% menu_cat_arr = Array.new %>
+ <% footer_arr = Array.new %>
+ <% count = 0 %>
+ <% waste_and_spoil_item_count = 0%>
+ <% total_qty = 0 %>
+ <% time_count = 0 %>
+ <% @sale_data.each do |sale| %>
+ <% if !time_arr.include?(sale.date_format) %>
+ <% time_count = time_count + 1 %>
+
+
+
+
+ Time :<%= sale.date_format %>
+
+ Date :
+
+ Menu Category Item Code Item Name Qty Price Total Price
+
+ <% time_arr.push(sale.date_format) %>
+ <% menu_cat_arr.clear %>
+ <% count = 0 %>
+ <% end %>
+
+
+ <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "foc" && sale.price > 0
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "Discount"
+ total_qty += sale.total_item*(-1)
+ end %>
+ <% if sale.status_type =="promotion" && @type == "promotion"
+ total_qty += sale.total_item*(-1)
+ end %>
+
+ <% if !sale.item_code.nil?%>
+ <% waste_and_spoil_item_count += sale.qty.to_i %>
+
+ <% if !menu_cat_arr.include?(sale.menu_category_name) %>
+ <%= sale.menu_category_name %>
+ <% menu_cat_arr.push(sale.menu_category_name) %>
+ <% else %>
+
+ <% end %>
+ <%= sale.item_code %>
+ <%= sale.product_name %>
+ <%= sale.total_item.to_i %>
+ <%= sale.unit_price %>
+ <%= sale.price %>
+ <%= sale.date_format %>
+
+ <% end %>
+
+
+
+
+ <% @hourly_total_qty.each do |qty| %>
+ <% qty_count = qty["total_qty"] %>
+ <% logger.debug ' qty count+++++++++++++++++++++++++' %>
+ <% logger.debug qty_count %>
+ <% #logger.debug ' normal count+++++++++++++++++++++++++' %>
+ <% #logger.debug sale.sale_items.count %>
+ <% end %>
+
+ <% count = count + 1 %>
+ <% logger.debug 'count ------------------------------------' %>
+ <% logger.debug count %>
+ <% if sale.sale_items.count == count %>
+
+
+ Total Qty:
+ <%= total_qty%> Grand Total:
+
+ <% footer_arr.push(sale.sale_id) %>
+ <% end %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+ <%= render :partial=>'shift_sale_report_filter',
+ :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_hourly_saleitem_index_path} %>
+
+
+
+
+
+
+ <% time_arr = Array.new %>
+ <% acc_arr = Array.new %>
+ <% sale_item_count =0 %>
+ <% menu_cat_arr = Array.new %>
+ <% footer_arr = Array.new %>
+ <% count = 0 %>
+ <% waste_and_spoil_item_count = 0%>
+ <% total_qty = 0 %>
+ <% time_count = 0 %>
+ <% grand_total = 0 %>
+ <% @sale_data.each do |sale| %>
+ <% if !time_arr.include?(sale.date_format) %>
+ <% sale_item_count =1 %>
+ <% time_count = time_count + 1 %>
+
+
+
+
+ Time :<%= sale.date_format %>
+
+
+
+ Menu Category Item Code Item Name Qty Price Total Price
+
+ <% time_arr.push(sale.date_format) %>
+ <% menu_cat_arr.clear %>
+ <% count = 0 %>
+ <% else %>
+ <% sale_item_count =sale_item_count +1 %>
+ <% end %>
+
+ <% if @print_settings.precision.to_i > 0
+ precision = @print_settings.precision
+ else
+ precision = 0
+ end
+ #check delimiter
+ if @print_settings.delimiter
+ delimiter = ","
+ else
+ delimiter = ""
+ end
+ %>
+
+ <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "foc" && sale.price > 0
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "Discount"
+ total_qty += sale.total_item*(-1)
+ end %>
+ <% if sale.status_type =="promotion" && @type == "promotion"
+ total_qty += sale.total_item*(-1)
+ end %>
+
+
+ <% if sale.status_type == "foc" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% if sale.status_type == "Discount" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% if sale.status_type == "promotion" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% grand_total += sale.grand_total %>
+
+ <% if !sale.item_code.nil?%>
+ <% waste_and_spoil_item_count += sale.qty.to_i %>
+
+ <% if !menu_cat_arr.include?(sale.menu_category_name) %>
+ <%= sale.menu_category_name %>
+ <% menu_cat_arr.push(sale.menu_category_name) %>
+ <% else %>
+
+ <% end %>
+ <%= sale.item_code %>
+ <%= sale.product_name %>
+ <%= sale.total_item.to_i %>
+ <%= sale.unit_price.to_i %>
+ <%= sale.grand_total.to_i %>
+ <%= sale.date_format %>
+
+ <% end %>
+
+ <% count = count + 1 %>
+ <% @hourly_total_qty.each do |hr| %>
+ <% if hr["date"].to_s == sale.date_format.to_s && hr["total_qty"].to_i ==sale_item_count%>
+
+ Total Qty:
+
+
+ <%= total_qty.to_i %>
+ <% total_qty = 0%>
+
+ Grand Total:
+
+
+ <%= grand_total.to_i %>
+ <% grand_total = 0 %>
+
+
+
+ <% footer_arr.push(sale.sale_id) %>
+ <% else %>
+
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <% time_arr = Array.new %>
+ <% acc_arr = Array.new %>
+ <% sale_item_count =0 %>
+ <% menu_cat_arr = Array.new %>
+ <% footer_arr = Array.new %>
+ <% count = 0 %>
+ <% waste_and_spoil_item_count = 0%>
+ <% total_qty = 0 %>
+ <% time_count = 0 %>
+ <% grand_total = 0 %>
+ <% @sale_data.each do |sale| %>
+ <% if !time_arr.include?(sale.date_format) %>
+ <% sale_item_count =1 %>
+ <% time_count = time_count + 1 %>
+
+
+
+
+ Time :<%= sale.date_format %>
+
+
+
+ Menu Category Item Code Item Name Qty Price Total Price
+
+ <% time_arr.push(sale.date_format) %>
+ <% menu_cat_arr.clear %>
+ <% count = 0 %>
+ <% else %>
+ <% sale_item_count =sale_item_count +1 %>
+ <% end %>
+
+ <% if @print_settings.precision.to_i > 0
+ precision = @print_settings.precision
+ else
+ precision = 0
+ end
+ #check delimiter
+ if @print_settings.delimiter
+ delimiter = ","
+ else
+ delimiter = ""
+ end
+ %>
+
+ <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "foc" && sale.price > 0
+ total_qty += sale.total_item
+ end %>
+ <% if sale.status_type == "Discount"
+ total_qty += sale.total_item*(-1)
+ end %>
+ <% if sale.status_type =="promotion" && @type == "promotion"
+ total_qty += sale.total_item*(-1)
+ end %>
+
+
+ <% if sale.status_type == "foc" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% if sale.status_type == "Discount" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% if sale.status_type == "promotion" && sale.grand_total < 0
+ grand_total += sale.grand_total*(-1)
+ end %>
+
+ <% grand_total += sale.grand_total %>
+
+ <% if !sale.item_code.nil?%>
+ <% waste_and_spoil_item_count += sale.qty.to_i %>
+
+ <% if !menu_cat_arr.include?(sale.menu_category_name) %>
+ <%= sale.menu_category_name %>
+ <% menu_cat_arr.push(sale.menu_category_name) %>
+ <% else %>
+
+ <% end %>
+ <%= sale.item_code %>
+ <%= sale.product_name %>
+ <%= sale.total_item.to_i %>
+ <%= sale.unit_price.to_i %>
+ <%= sale.grand_total.to_i %>
+ <%= sale.date_format %>
+
+ <% end %>
+
+ <% count = count + 1 %>
+ <% @hourly_total_qty.each do |hr| %>
+ <% if hr["date"].to_s == sale.date_format.to_s && hr["total_qty"].to_i ==sale_item_count%>
+
+ Total Qty:
+
+
+ <%= total_qty.to_i %>
+ <% total_qty = 0%>
+
+ Grand Total:
+
+
+ <%= grand_total.to_i %>
+ <% grand_total = 0 %>
+
+
+
+ <% footer_arr.push(sale.sale_id) %>
+ <% else %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+
+
+
+
+
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index a56d6808..5abe8a0b 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -95,7 +95,6 @@
total_qty += sale.total_item*(-1)
end %>
-
<% if sale.status_type == "foc" && sale.grand_total < 0
total_item_foc += sale.grand_total*(-1)
end %>
@@ -249,9 +248,21 @@
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %>
<%= total_qty%>
-
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
-
<%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%>
+
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
+
<%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%>
+ <% if @type =="" || @type =="all" || @type.nil? %>
+
+
+ Total FOC Amount
+ <%= number_with_precision(@foc_data , precision:precision.to_i,delimiter:delimiter)%>
+
+
+ <%= t("views.right_panel.detail.net_amount") %>
+ <%= number_with_precision(grand_total -@foc_data , precision:precision.to_i,delimiter:delimiter)%>
+ <% end %>
<% end %>
<% if @type == "other"%>
@@ -296,6 +307,7 @@
\ No newline at end of file
diff --git a/app/views/reports/waste_and_spoilage/index-bk.html.erb b/app/views/reports/waste_and_spoilage/index-bk.html.erb
new file mode 100644
index 00000000..d034fce3
--- /dev/null
+++ b/app/views/reports/waste_and_spoilage/index-bk.html.erb
@@ -0,0 +1,99 @@
+
+
+
+
+ <%= render :partial=>'shift_sale_report_filter',
+ :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %>
+
+
+
+
+
+
+ Report For <%= @sale_type? @sale_type : 'Waste' %>
+ <% receipt_arr = Array.new %>
+ <% menu_cat_arr = Array.new %>
+ <% footer_arr = Array.new %>
+ <% count = 0 %>
+ <% waste_and_spoil_item_count = 0%>
+ <% @sale_data.each do |sale| %>
+ <% if !receipt_arr.include?(sale.receipt_no) %>
+
+
+
+
+ Receipt No :<%= sale.receipt_no %>
+
+ Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %>
+
+ Menu Category Item Name Item Code Qty Price Total Price
+
+ <% receipt_arr.push(sale.receipt_no) %>
+ <% menu_cat_arr.clear %>
+ <% count = 0 %>
+ <% end %>
+
+
+ <% if !sale.item_instance_code.nil?%>
+ <% waste_and_spoil_item_count += sale.qty.to_i %>
+
+ <% if !menu_cat_arr.include?(sale.name) %>
+ <%= sale.name %>
+ <% menu_cat_arr.push(sale.name) %>
+ <% else %>
+
+ <% end %>
+ <%= sale.product_name %>
+ <%= sale.product_code %>
+ <%= sale.qty.to_i %>
+ <%= sale.unit_price %>
+ <%= sale.price %>
+
+ <% end %>
+
+ <% count = count + 1 %>
+ <% if sale.sale_items.count == count %>
+
+ Total Qty:
+
+
+ <%= waste_and_spoil_item_count %>
+ <% waste_and_spoil_item_count = 0%>
+
+ Grand Total:
+
+
+ <%= sale.grand_total %>
+
+
+
+ <% footer_arr.push(sale.sale_id) %>
+ <% end %>
+
+ <% end %>
+
+
+
+
+
+
diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb
index 879a9bd5..e81eb1ca 100755
--- a/app/views/reports/waste_and_spoilage/index.html.erb
+++ b/app/views/reports/waste_and_spoilage/index.html.erb
@@ -18,46 +18,47 @@
-
+
Report For <%= @sale_type? @sale_type : 'Waste' %>
- <% receipt_arr = Array.new %>
- <% menu_cat_arr = Array.new %>
- <% footer_arr = Array.new %>
- <% count = 0 %>
- <% waste_and_spoil_item_count = 0%>
- <% @sale_data.each do |sale| %>
- <% if !receipt_arr.include?(sale.receipt_no) %>
-
-
+
+
+
Menu Category Item Name Item Code Qty Price Total Price Total Price
- <% receipt_arr.push(sale.receipt_no) %>
- <% menu_cat_arr.clear %>
- <% count = 0 %>
- <% end %>
-
+
+
- <% if !sale.item_instance_code.nil?%>
+ <% receipt_arr = Array.new %>
+ <% menu_cat_arr = Array.new %>
+ <% footer_arr = Array.new %>
+ <% count = 0 %>
+ <% waste_and_spoil_item_count = 0%>
+ <% grand_total = 0%>
+ <% unless @sale_data.blank? %>
+ <% @sale_data.each do |sale| %>
+ <% if !sale.item_instance_code.nil?%>
<% waste_and_spoil_item_count += sale.qty.to_i %>
+ <% grand_total += sale.grand_total.to_i %>
+ <% end %>
- <% if !menu_cat_arr.include?(sale.name) %>
+ <% if !menu_cat_arr.include?(sale.name) %>
<%= sale.name %>
<% menu_cat_arr.push(sale.name) %>
<% else %>
@@ -68,33 +69,35 @@
<%= sale.qty.to_i %>
<%= sale.unit_price %>
<%= sale.price %>
-
- <% end %>
-
+
+
+
<% count = count + 1 %>
- <% if sale.sale_items.count == count %>
+ <% if @sale_data.length == count %>
Total Qty:
+ Total Qty:
<%= waste_and_spoil_item_count %>
<% waste_and_spoil_item_count = 0%>
Grand Total:
-
+
- <%= sale.grand_total %>
+ <%= grand_total %>
-
+
<% footer_arr.push(sale.sale_id) %>
<% end %>
-
- <% end %>
+ <% end %>
+ <% end %>
+
+
-