diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 9d5edf7e..bebc6f99 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -125,10 +125,16 @@ $(function() { add = ''; menu_item_box = 'set_item_box'; data_target = 'sx_item_set_detailModal'; - code = menu_items[field].code; name = menu_items[field].name; - price = 0;//parseFloat( menu_items[field].price).toFixed(2); + instances = menu_items[field].instances; + $(instances).each(function(i){ + if (instances[i].is_default == true) { + price = parseFloat(instances[i].price).toFixed(2); + }else{ + price = 0; + } + }); is_available = menu_items[field].is_available ; is_on_promotion = 0; item_attributes = menu_items[field].attributes; @@ -266,8 +272,8 @@ $(function() { $('#set_item_instances').text(instances); $('#set_name').text(data.attr('data-name')); $('#set_item_code').text(data.attr('data-item-code')); - // $('#set_total_price').text(data.attr('data-price')); - $('#set_total_price').text(0); + $('#set_total_price').text(data.attr('data-price')); + // $('#set_total_price').text(0); $('#set_unit_price').text(data.attr('data-price')); // $('#set_unit_price').text(0); }); diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 5bb8a02a..bf4008a2 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -73,6 +73,7 @@ class Origami::HomeController < BaseOrigamiController instance_item_sets.each do |instance_item| item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name arr_instance_item_sets.push(item_instance_name) + item.price = item.price.to_f + instance_item["price"].to_f end item.set_menu_items = arr_instance_item_sets end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 68f8ffe0..7ffac1f0 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -67,6 +67,7 @@ class Origami::RoomsController < BaseOrigamiController instance_item_sets.each do |instance_item| item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name arr_instance_item_sets.push(item_instance_name) + item.price = item.price.to_f + instance_item["price"].to_f end item.set_menu_items = arr_instance_item_sets end