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

check product sale report

Browse Source
This commit is contained in:
phyusin
2018-02-26 11:24:47 +06:30
parent 7043eccb73
commit 5523ff6fc1
7 changed files with 125 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/controllers/oqs/home_controller.rb
View File

@@ -14,19 +14,19 @@ class Oqs::HomeController < BaseOqsController
@queue_stations = OrderQueueStation.all
@queue_completed_item = completed_order(@filter)
# if !@queue_completed_item.empty?
# @queue_completed_item.each do |queue_item|
# if !queue_item.set_menu_items.nil?
# instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
# arr_instance_item_sets = Array.new
# instance_item_sets.each do |instance_item|
# item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
# arr_instance_item_sets.push(item_instance_name)
# end
# queue_item.set_menu_items = arr_instance_item_sets
# end
# end
# end
if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item|
if !queue_item.set_menu_items.nil?
instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
queue_item.set_menu_items = arr_instance_item_sets
end
end
end
if !@filter.nil?
@count = queue_items_count_query(false,@filter)

2
app/controllers/origami/payments_controller.rb
View File

@@ -87,7 +87,7 @@ class Origami::PaymentsController < BaseOrigamiController
#end rounding adjustment
sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
rebate_amount = nil

7
app/controllers/reports/product_sale_controller.rb
View File

@@ -2,18 +2,19 @@ class Reports::ProductSaleController < BaseReportController
authorize_resource :class => false
def index
order_by = 'desc'
@order_by = 'desc'
if !params[:order_by].nil?
order_by = params[:order_by]
@order_by = params[:order_by]
end
@sale_data = Sale.get_menu_item_query(order_by)
@sale_data = Sale.get_menu_item_query(@order_by)
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
respond_to do |format|
format.html
format.json
format.xls
end
end

2
app/models/sale.rb
View File

@@ -877,7 +877,7 @@ def self.get_menu_item_query(order_by)
" LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
" LEFT JOIN sales s ON s.sale_id = si.sale_id")
.group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
.order("si.qty #{order_by}, menu_items.menu_category_id desc")
.order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
end
#product sale report query

8
app/views/oqs/home/index.html.erb
View File

@@ -83,13 +83,13 @@
<span class="order-qty">
<%= qid.qty %>
</span> ]
<% if !qid.set_menu_items.nil?
qid.set_menu_items.each do |item_instance|%>
<% if !qid.set_menu_items.nil? %>
<% qid.set_menu_items.each do |item_instance|%>
<br><span class="font-12">
<%= item_instance %>
</span>
<% end
end %>
<% end %>
<% end %>
</p>
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>

2
app/views/origami/payments/show.html.erb
View File

@@ -441,7 +441,7 @@
var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
var total = $('#amount_due').text();
var amt = parseFloat(total) - parseFloat(othertotal);
$('#cash').text(parseFloat(amt).toFixed(1));
$('#cash').text(parseFloat(amt).toFixed(2));
update_balance();
break;
}

44
app/views/reports/product_sale/index.html.erb
View File

@@ -1,3 +1,4 @@
<div class="div_product_sale">
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
@@ -26,6 +27,17 @@
</div>
<div class="table-responsive">
<% 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 %>
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
@@ -38,19 +50,7 @@
<th><%= t("views.right_panel.detail.total") %></th>
</tr>
</thead>
<tbody>
<% 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
%>
<tbody id="tbd_data">
<% unless @sale_data.blank? %>
<% acc_arr = Array.new %>
<% cate_arr = Array.new %>
@@ -101,27 +101,21 @@
</div>
</div>
</div>
</div>
<script>
var order_status = '';
<script type="text/javascript">
$(function(){
if(order_status == ''){
$('#order_by').val('desc');
}else{
$('#order_by').val(''+order_status+'');
}
$('#order_by').val('<%= @order_by %>');
});
$('#order_by').on('change', function(){
var order_by = $("#order_by").val();
order_status = order_by;
$('.div_product_sale').html("");
$.ajax({
type: 'GET',
data: {'order_by' : order_by},
datatype: 'JSON',
url: '?',
url: '?order_by='+order_by,
success: function(data) {
// window.location.reload();
$('.div_product_sale').html(data);
}
});
});