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

change some func: for order rervation

Browse Source
This commit is contained in:
phyusin
2018-08-21 10:37:51 +06:30
parent 49ace265dc
commit d49bc3be2e
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/reports/order_reservation_controller.rb
View File

@@ -6,7 +6,7 @@ class Reports::OrderReservationController < BaseReportController
from, to = get_date_range_from_params
@shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
@shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
@shift = ''
if params[:shift_name].to_i != 0

2
app/views/reports/order_reservation/index.html.erb
View File

@@ -98,7 +98,7 @@
discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge
if !JSON.parse(order_reservation.taxes).empty?
if !JSON.parse(order_reservation.taxes).nil? && !JSON.parse(order_reservation.taxes).empty?
JSON.parse(order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1]

2
app/views/reports/order_reservation/index.xls.erb
View File

@@ -71,7 +71,7 @@
discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge
if !JSON.parse(order_reservation.taxes).empty?
if !JSON.parse(order_reservation.taxes).nil? && !JSON.parse(order_reservation.taxes).empty?
JSON.parse(order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1]

2
app/views/reports/stock_check/index.html.erb
View File

@@ -3,7 +3,7 @@
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Stock Check Report</li>
<span class="float-right">
<%= link_to 'Back', inventory_path %>
<%= link_to 'Back', reports_stock_check_index_path %>
</span>
</ol>
</div>

2
app/views/transactions/order_reservations/index.html.erb
View File

@@ -117,7 +117,7 @@
discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge
if !JSON.parse(order_reservation.taxes).empty?
if !JSON.parse(order_reservation.taxes).nil? && !JSON.parse(order_reservation.taxes).empty?
JSON.parse(order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1]

2
app/views/transactions/order_reservations/show.html.erb
View File

@@ -105,7 +105,7 @@
discount_amount = @order_reservation.discount_amount
delivery_fee = @order_reservation.delivery_fee ? @order_reservation.delivery_fee : 0.0
convenience_charge = @order_reservation.convenience_charge
if !JSON.parse(@order_reservation.taxes).empty?
if !JSON.parse(@order_reservation.taxes).nil? && !JSON.parse(@order_reservation.taxes).empty?
JSON.parse(@order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1]