diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index dd27197c..cd8c7ca2 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -54,9 +54,9 @@ class Api::OrdersController < Api::ApiController extra_time = '' params[:order_items].each { |i| - if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30' + if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' is_extra_time = true - if i["item_instance_code"] == 'Exti30' + if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' t = Time.now time = 30*60*i["quantity"].to_i extra_time = Time.at(time) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 050a4a18..c8916e44 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -9,7 +9,7 @@
- + <% end%> + <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %> +