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

check order item

Browse Source
This commit is contained in:
phyusin
2018-02-27 11:33:51 +06:30
parent 28a8b863aa
commit fc3cd1e72d
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/controllers/origami/split_bill_controller.rb
View File

@@ -147,15 +147,15 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
# puts order_id puts order_id
# puts order_ids.count puts order_ids.count
# puts order_id_count puts order_id_count
# puts order_items.count puts order_items.count
# puts order_item_count puts order_item_count
if !order_id.nil? if !order_id.nil?
if order_id_count > 1 if order_id_count > 1
# puts "order_id_count > 1" puts "order_id_count > 1"
updated_order_id = Array.new updated_order_id = Array.new
order_ids.each do |odr_id| order_ids.each do |odr_id|
@@ -165,8 +165,8 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
# puts "updated_order_id" puts "updated_order_id"
# puts updated_order_id puts updated_order_id
if !updated_order_id.empty? if !updated_order_id.empty?
order_ids.each do |odr_id| order_ids.each do |odr_id|
@@ -195,7 +195,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
# puts new_order_status puts new_order_status
if new_order_status if new_order_status
BookingOrder.find_by_order_id(odr_id).delete BookingOrder.find_by_order_id(odr_id).delete
@@ -223,7 +223,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
else else
# puts "order_id_count < 1" puts "order_id_count < 1"
new_order_status = true new_order_status = true
order_items.each do |order_item| order_items.each do |order_item|
orderItem = OrderItem.find_by_order_id(order_id) orderItem = OrderItem.find_by_order_id(order_id)
@@ -236,7 +236,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
# puts new_order_status puts new_order_status
if new_order_status if new_order_status
BookingOrder.find_by_order_id(order_id).delete BookingOrder.find_by_order_id(order_id).delete
@@ -266,7 +266,9 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
else else
if order_ids.count == 1 && order_id_count > 0 && order_item_count == 1 # puts order_ids
if order_ids.count == 1 && order_id_count == 0 && order_item_count == 1
BookingOrder.find_by_order_id(order_ids[0]).delete
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
order_items.each do |order_item| order_items.each do |order_item|
update_order_item(order_ids[0], order_item) update_order_item(order_ids[0], order_item)

2
app/views/origami/split_bill/index.html.erb
View File

@@ -214,7 +214,7 @@
<td><span id="receipt_no"><%= sale_data.receipt_no %></span></td> <td><span id="receipt_no"><%= sale_data.receipt_no %></span></td>
<td><span id="grand_total"><%= sale_data.grand_total %></span></td> <td><span id="grand_total"><%= sale_data.grand_total %></span></td>
<% if !@current_user.nil? && @current_user.role == 'cashier' %> <% if !@current_user.nil? && @current_user.role != 'waiter' %>
<td> <td>
<button type="button" class="btn btn-block waves-effect btn-primary btn_pay" id=<%= sale_data.sale_id %> >Pay</button> <button type="button" class="btn btn-block waves-effect btn-primary btn_pay" id=<%= sale_data.sale_id %> >Pay</button>
</td> </td>