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-12-08 16:46:01 +06:30
parent e04ef1e223 e4a4c7aba4
commit 2d2b7ecb4c
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/reports/receipt_no_controller.rb
View File

@@ -21,7 +21,6 @@ authorize_resource :class => false
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@tax_profiles = TaxProfile.order('order_by asc') @tax_profiles = TaxProfile.order('order_by asc')
@from = from @from = from
@to = to @to = to

6
app/models/sale.rb
View File

@@ -764,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
query = Sale.all query = Sale.all
if shift.present? if shift.present?
query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a) query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id") .group("sales.sale_id")
elsif shift_sale_range.present? elsif shift_sale_range.present?
query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a) query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id") .group("sales.sale_id")
else else
query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to) query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.group("sales.sale_id") .group("sales.sale_id")
end end
return query
end end
def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)

59
app/views/origami/addorders/detail.html.erb
View File

@@ -7,36 +7,41 @@
<div class="row m-t--20"> <div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" > <ul class="nav nav-tabs flex-column" role="tablist" >
<% <% @menu.each do |menu| %>
@menu.each do |menu| <% if menu.menu_category_id.nil?%>
if menu.menu_category_id.nil? <li class="nav-item menu_category">
%> <p class="hidden menu-id"><%= menu.id %></p>
<!-- <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>"> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
--> </li>
<% end%>
<li class="nav-item menu_category"> <!-- Sub-Category -->
<p class="hidden menu-id"><%= menu.id %></p> <% if !menu.menu_category_id.nil? %>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a> <ul class="collapse" id="<%= menu.menu_category_id %>">
</li> <li>
<% <p class="hidden menu-id"><%= menu.id %></p>
end <a class="nav-link" data-toggle="tab" role="tab"> <%= menu.name%></a>
</li>
# Sub-Category </ul>
if !menu.menu_category_id.nil? <% end%>
%> <%end %>
<ul class="collapse" id="<%= menu.menu_category_id %>"> <!-- <li class="nav-item menu_category">
<li> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>
<p class="hidden menu-id"><%= menu.id %></p> <ul class="dropdown-menu multi-level">
<a class="nav-link" data-toggle="tab" role="tab"> <%= menu.name%></a> <li><a href="#">Action</a></li>
</li> <li><a href="#">Another action</a></li>
</ul> <li><a href="#">Something else here</a></li>
<% <li class="divider"></li>
end <li><a href="#">Separated link</a></li>
end <li class="divider"></li>
%> <li><a href="#">One more separated link</a></li>
</ul>
</li> -->
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>"> <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a> <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10"> <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">