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

update add order menu category api

Browse Source
This commit is contained in:
Aung Myo
2017-07-27 16:40:35 +06:30
parent be0af338a8
commit 9b678b8523
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/api/restaurant/menu_categories/show.json.jbuilder
View File

@@ -13,22 +13,22 @@ if @menu.menu_items
if item.menu_item_instances.count == 1 then if item.menu_item_instances.count == 1 then
item_instance = item.menu_item_instances[0] item_instance = item.menu_item_instances[0]
json.price = item_instance.price json.price item_instance.price
json.is_available = item_instance.is_available json.is_available item_instance.is_available
json.is_on_promotion = item_instance.is_on_promotion json.is_on_promotion item_instance.is_on_promotion
json.promotion_price = item_instance.promotion_price json.promotion_price item_instance.promotion_price
json.item_attributes = item_instance.item_attributes json.item_attributes item_instance.item_attributes
elsif item.menu_item_instances.count > 1 then elsif item.menu_item_instances.count > 1 then
json.item_instances item.menu_item_instances do |is| json.item_instances item.menu_item_instances do |is|
json.item_instance_item_code = is.item_instance_code json.item_instance_item_code is.item_instance_code
json.item_instance_name = is.item_instance_name json.item_instance_name is.item_instance_name
json.price = is.price json.price is.price
json.is_available = is.is_available json.is_available is.is_available
json.is_on_promotion = is.is_on_promotion json.is_on_promotion is.is_on_promotion
json.promotion_price = is.promotion_price json.promotion_price is.promotion_price
json.item_attributes = is.item_attributes json.item_attributes is.item_attributes
end end
end end

27
app/views/origami/addorders/show.html.erb
View File

@@ -15,18 +15,7 @@
</div> </div>
<div class="col-md-6 col-lg-6"> <div class="col-md-6 col-lg-6">
<div class="card-columns menu_items_list" style="column-gap: 10px;"> <div class="card-columns menu_items_list" style="column-gap: 10px;">
<!-- append data -->
<!-- <div class="card">
<div class="card-header">
<small>Menu Name</small>
</div>
<div class="card-block">
<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>
</div>
<div class="card-footer">
<small>Price : 3000</small>
</div>
</div> -->
</div> </div>
</div> </div>
@@ -96,14 +85,14 @@ function show_details(url_item){
for(var field in menu_items) { for(var field in menu_items) {
if (menu_items[field].item_instances){ if (menu_items[field].item_instances){
console.log(menu_items[field].item_instances.price); console.log(menu_items[field].item_instances[0]);
var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2);
}else{ }else{
var price = parseFloat(menu_items[field].price).toFixed(2); var price = parseFloat(menu_items[field].price).toFixed(2);
} }
row = '<div class="card">' row = '<div class="card">'
+'<div class="card-header">' +'<div class="card-head" style="line-height:14px;">'
+'<small>'+ menu_items[field].name +'</small>' +'<small>'+ menu_items[field].name +'</small>'
+'</div>' +'</div>'
@@ -112,7 +101,7 @@ function show_details(url_item){
+'</div>' +'</div>'
+'<div class="card-footer">' +'<div class="card-footer">'
+'<small>'+ menu_items[field].price +'</small>' +'<small>'+ price +'</small>'
+'</div>'; +'</div>';
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
} }
@@ -127,6 +116,12 @@ function show_details(url_item){
<style type="text/css"> <style type="text/css">
.card-head{
height: 40px;
background-color: #54A5AF;
padding:5px;
color :#fff;
}
.card-block { .card-block {
padding: 0.3rem !important; padding: 0.3rem !important;
} }