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

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

Browse Source
This commit is contained in:
Aung Myo
2018-02-09 14:20:22 +06:30
parent 54cb5b0c87 a62e1bae4c
commit 69db4656ba
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/addorder.js
View File

@@ -125,10 +125,16 @@ $(function() {
add = ''; add = '';
menu_item_box = 'set_item_box'; menu_item_box = 'set_item_box';
data_target = 'sx_item_set_detailModal'; data_target = 'sx_item_set_detailModal';
code = menu_items[field].code; code = menu_items[field].code;
name = menu_items[field].name; 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_available = menu_items[field].is_available ;
is_on_promotion = 0; is_on_promotion = 0;
item_attributes = menu_items[field].attributes; item_attributes = menu_items[field].attributes;
@@ -266,8 +272,8 @@ $(function() {
$('#set_item_instances').text(instances); $('#set_item_instances').text(instances);
$('#set_name').text(data.attr('data-name')); $('#set_name').text(data.attr('data-name'));
$('#set_item_code').text(data.attr('data-item-code')); $('#set_item_code').text(data.attr('data-item-code'));
// $('#set_total_price').text(data.attr('data-price')); $('#set_total_price').text(data.attr('data-price'));
$('#set_total_price').text(0); // $('#set_total_price').text(0);
$('#set_unit_price').text(data.attr('data-price')); $('#set_unit_price').text(data.attr('data-price'));
// $('#set_unit_price').text(0); // $('#set_unit_price').text(0);
}); });

1
app/controllers/origami/home_controller.rb
View File

@@ -73,6 +73,7 @@ class Origami::HomeController < BaseOrigamiController
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name 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) arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end end
item.set_menu_items = arr_instance_item_sets item.set_menu_items = arr_instance_item_sets
end end

1
app/controllers/origami/rooms_controller.rb
View File

@@ -67,6 +67,7 @@ class Origami::RoomsController < BaseOrigamiController
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name 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) arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end end
item.set_menu_items = arr_instance_item_sets item.set_menu_items = arr_instance_item_sets
end end