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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-24 19:04:55 +06:30
parent 5beb427dfe 6aed8f89c5
commit 3809413a6f
5 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/discounts_controller.rb
View File

@@ -29,14 +29,19 @@ class Origami::DiscountsController < BaseOrigamiController
# sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;
# sale.save # sale.save
if discount_items.length > 0 if discount_items.length > 0
puts discount_items.to_json
puts "dddddddddddd"
#save sale item for discount #save sale item for discount
discount_items.each do |di| discount_items.each do |di|
origin_sale_item = SaleItem.find(di["id"]) origin_sale_item = SaleItem.find(di["id"])
puts origin_sale_item.to_json
sale_item = SaleItem.new sale_item = SaleItem.new
sale_item.sale_id = sale_id sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
sale_item.product_name = di["name"] sale_item.product_name = di["name"]
sale_item.item_instance_code = origin_sale_item.item_instance_code
sale_item.product_alt_name = "" sale_item.product_alt_name = ""
sale_item.remark = "Discount" sale_item.remark = "Discount"

3
app/controllers/reports/saleitem_controller.rb
View File

@@ -16,7 +16,8 @@ class Reports::SaleitemController < BaseReportController
end end
end end
@sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED) @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
puts @sale_data.to_json
puts "SSSSSSSSSSS"
@account_cate_count = Hash.new {|hash, key| hash[key] = 0} @account_cate_count = Hash.new {|hash, key| hash[key] = 0}

3
app/models/sale.rb
View File

@@ -623,6 +623,7 @@ def self.get_item_query()
query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " + query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " +
"SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," + "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
"i.remark as status_type,"+
" i.unit_price as unit_price,i.product_name as product_name, mc.name as" + " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
" menu_category_name,mc.id as menu_category_id ") " menu_category_name,mc.id as menu_category_id ")
@@ -635,7 +636,7 @@ def self.get_item_query()
query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
query = query.where("i.item_instance_code IS NOT NULL") query = query.where("i.item_instance_code IS NOT NULL")
query = query.group("i.item_instance_code").order("mi.account_id, mi.menu_category_id") query = query.group("i.product_name").order("mi.account_id, mi.menu_category_id")
end end
def self.get_by_shift_items(shift_sale_range, shift, from, to, status) def self.get_by_shift_items(shift_sale_range, shift, from, to, status)

69
app/views/reports/saleitem/index.html.erb Executable file → Normal file
View File

@@ -59,18 +59,21 @@
<% acc_arr = Array.new %> <% acc_arr = Array.new %>
<% cate_arr = Array.new %> <% cate_arr = Array.new %>
<% sub_total = 0.0 %> <% sub_total = 0 %>
<% count = 0%> <% count = 0 %>
<% total_price = 0.0 %> <% total_price = 0 %>
<% cate_count = 0 %> <% cate_count = 0 %>
<% acc_count = 0%> <% acc_count = 0 %>
<% grand_total = 0%> <% grand_total = 0 %>
<% total_qty = 0%> <% total_qty = 0 %>
<% total_amount = 0 %> <% total_amount = 0 %>
<% discount = 0%> <% discount = 0 %>
<% total_item_foc = 0 %>
<% total_item_dis = 0 %>
<% @sale_data.each do |sale| %> <% @sale_data.each do |sale| %>
<% total_qty += sale.total_item %>
<% total_qty += sale.total_item %>
<% if !acc_arr.include?(sale.account_id) %> <% if !acc_arr.include?(sale.account_id) %>
<tr> <tr>
@@ -102,55 +105,67 @@
<td><%= sale.total_item rescue '-' %></td> <td><%= sale.total_item rescue '-' %></td>
<td><%= sale.unit_price rescue '-' %></td> <td><%= sale.unit_price rescue '-' %></td>
<td><%= sale.grand_total rescue '-' %></td> <td><%= sale.grand_total rescue '-' %></td>
</tr> </tr>
<!-- sub total --> <!-- sub total -->
<% @menu_cate_count.each do |key,value| %> <% @menu_cate_count.each do |key,value| %>
<% if sale.menu_category_id == key %> <% if sale.menu_category_id == key %>
<% count = count + 1 %> <% count = count + 1 %>
<% sub_total += sale.grand_total %> <% sub_total += sale.grand_total %>
<% if count == value %> <% if count == value %>
<tr> <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.sub_total") %></td> <td><%= t("views.right_panel.detail.sub_total") %></td>
<td ><span class="underline"><%= sub_total %></span></td> <td ><span class="underline"><%= sub_total %></span></td>
</tr> </tr>
<% if sale.status_type === "foc"
total_item_foc += sale.grand_total
end %>
<% if sale.status_type === "Discount"
total_item_dis += sale.grand_total
end %>
<% sub_total = 0.0%> <% sub_total = 0.0%>
<% count = 0%> <% count = 0%>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<!-- end sub total --> <!-- end sub total -->
<% end %> <% end %>
<tr style="border-top:2px solid grey;"> <tr style="border-top:2px solid grey;">
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td> <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
<td><span><%= total_qty%></span></td> <td><span><%= total_qty%></span></td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td> <td><%= t("views.right_panel.detail.net_amount") %></td>
<td><span><%= grand_total%></span></td> <td><span><%= grand_total%></span></td>
</tr> </tr>
<% end %> <% end %>
<tr> <!-- <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.cash_received") %></td> <td><%= t("views.right_panel.detail.cash_received") %></td>
<td><span><%= @cash_data - @change_amount %></span></td> <td><span><%= @cash_data - @change_amount %></span></td>
</tr> </tr> -->
<tr> <!-- <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.card_sales") %></td> <td><%= t("views.right_panel.detail.card_sales") %></td>
<td><span><%= @card_data %></span></td> <td><span><%= @card_data %></span></td>
</tr> </tr> -->
<tr> <!-- <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.credit_sales") %></td> <td><%= t("views.right_panel.detail.credit_sales") %></td>
<td><span><%= @credit_data %></span></td> <td><span><%= @credit_data %></span></td>
</tr> -->
<tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= total_item_foc %></span></td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= total_item_dis %></span></td>
</tr> </tr>
<tr> <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
@@ -162,12 +177,18 @@
<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td> <td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= @discount_data %></span></td> <td><span><%= @discount_data %></span></td>
</tr> </tr>
<tr> <!-- <tr>
<td colspan="5">&nbsp;</td> <td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.grand_total") %></td> <td><%= t("views.right_panel.detail.grand_total") %></td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> --> <!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> <!-- <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
</tr> </tr> -->
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.grand_total") %></td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<!--<td><span class="double_underline"><%= grand_total + total_item_foc.abs+ total_item_dis.abs+ @foc_data+@discount_data%></span></td>
</tr> -->
</tbody> </tbody>
</table> </table>
</div> </div>

2
config/locales/en.yml
View File

@@ -279,6 +279,7 @@ en:
additional_parameters: "Additional parameters" additional_parameters: "Additional parameters"
title: "Title" title: "Title"
discount: "Discount" discount: "Discount"
item_discount: "Item Discount"
point: "Point" point: "Point"
bonus: "Bonus" bonus: "Bonus"
rebate: "Rebate" rebate: "Rebate"
@@ -402,6 +403,7 @@ en:
cash_sales: "Cash Sales" cash_sales: "Cash Sales"
credit_sales: "Credit Sales" credit_sales: "Credit Sales"
foc_sales: "FOC Sales" foc_sales: "FOC Sales"
foc_item: "Item FOC"
net_amount: "Net Amount" net_amount: "Net Amount"
sale_item_report: "Sale Item Report" sale_item_report: "Sale Item Report"
select_period: "Select Period" select_period: "Select Period"