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

Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service

Browse Source
This commit is contained in:
Aung Myo
2018-02-21 17:16:14 +06:30
parent a07d46facc 1385c2c842
commit e3c54f6841
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ class Origami::SplitBillController < BaseOrigamiController
if booking if booking
if booking.sale_id.nil? if booking.sale_id.nil?
sale = Sale.new sale = Sale.new
status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, get_cashier_by_terminal) status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, current_user)
sale_data = Sale.find_by_sale_id(sale_id) sale_data = Sale.find_by_sale_id(sale_id)
else else
status = true status = true
@@ -127,6 +127,7 @@ class Origami::SplitBillController < BaseOrigamiController
if !orders.nil? if !orders.nil?
orders.each do |order| orders.each do |order|
BookingOrder.find_by_order_id(order["id"]).delete
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order["id"]}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order["id"]})
end end
elsif !order_items.nil? elsif !order_items.nil?
@@ -193,6 +194,8 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
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
BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
@@ -232,6 +235,8 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
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
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
@@ -326,7 +331,6 @@ class Origami::SplitBillController < BaseOrigamiController
instance_item_sets = JSON.parse(orderItem.set_menu_items) instance_item_sets = JSON.parse(orderItem.set_menu_items)
instance_item_sets.each_with_index do |instance_item, instance_index| instance_item_sets.each_with_index do |instance_item, instance_index|
instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s
"[{\"item_instance_code\":\"psi002in001\",\"quantity\":\"2\",\"price\":\"5500.0\"}]"
set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'].to_i, 'price' => instance_item["price"]}) set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'].to_i, 'price' => instance_item["price"]})
end end
orderItem.set_menu_items = instance_item_sets.to_json orderItem.set_menu_items = instance_item_sets.to_json

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

@@ -229,8 +229,10 @@
<div> <div>
<button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button> <button type="button" class="btn bg-default btn-block waves-effect" id="back" ><i class="material-icons">reply</i> Back </button>
<button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button> <button id="equal_split" class="btn btn-block waves-effect bg-blue">= Split</button>
<% if !@orders.empty? %>
<button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button> <button id="order_split" class="btn btn-block waves-effect bg-blue">By Order</button>
<button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button> <button id="order_item_split" class="btn btn-block waves-effect bg-blue">By Order Item</button>
<% end %>
</div> </div>
</div> </div>
<!-- Column Three --> <!-- Column Three -->