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

fix receipt no detail report

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-07-21 12:43:27 +06:30
parent 567a716fe3
commit afcb3158fc
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/sale.rb
View File

@@ -1178,9 +1178,9 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range, shift, from, to, paymen
query = Sale.includes(:sale_items).select("sales.*, sale_payments.*")
.select("customers.customer_id, customers.name as customer_name, df.name, df.type")
.where("sale_status= 'completed' and sale_payments.payment_amount != 0 #{payment_type}")
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.joins("join bookings on bookings.sale_id = sales.sale_id")
.joins("left join dining_facilities df on df.id = bookings.dining_facility_id")
.joins("INNER JOIN sale_payments on sale_payments.sale_id = sales.sale_id")
.joins("INNER JOIN bookings on bookings.sale_id = sales.sale_id")
.joins("LEFT JOIN dining_facilities df on df.id = bookings.dining_facility_id")
.group("sales.sale_id")
if customer_filter.present?
@@ -1203,12 +1203,13 @@ end
def self.get_shift_sales_by_receipt_no_detail(shift_sale_range, shift, from, to, payment_type, customer_filter)
## => left join -> show all sales although no orders
puts customer_filter
query = Sale.includes([:survey, :sale_payments])
.select("sales.*, SUM(sale_payments.payment_amount) AS payments_for_credits_amount")
.select("dining_facilities.type AS table_type, dining_facilities.name AS table_name")
.select("customers.customer_id, customers.name AS customer_name, customers.company AS customer_company")
.joins(:booking => :dining_facility)
.joins("INNRE JOIN bookings on bookings.sale_id = sales.sale_id")
.joins("LEFT JOIN dining_facilities df on df.id = bookings.dining_facility_id")
.joins("INNER JOIN sale_payments sp ON sp.sale_id = sales.sale_id")
.left_joins(:payments_for_credits)
.completed

12
app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb
View File

@@ -18,7 +18,12 @@
<option value="9">Last year</option>
</select>
</div>
<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
</div>
<% if defined? @payment_methods %>
<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.select_payments") %></label>
@@ -31,11 +36,6 @@
</div>
<% end %>
<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" id="customer_filter" >
</div>
<div class="col-lg-2 col-md-2 col-sm-2 col-mbl-view mbl-style">
<!-- <label class="">Select Shift Period</label> -->
<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.from") %></label>