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

update addorder

Browse Source
This commit is contained in:
Aung Myo
2017-08-18 19:09:09 +06:30
parent 3dbabdc1b9
commit 3b8a518357
3 changed files with 132 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/api/restaurant/menu/_menu_item.json.jbuilder
View File

@@ -28,13 +28,13 @@ json.options item.item_options
# elsif item.menu_item_instances.count > 1 then # elsif item.menu_item_instances.count > 1 then
json.instances item.menu_item_instances do |is| json.instances item.menu_item_instances do |is|
json.code = is.item_instance_code json.code is.item_instance_code
json.name = is.item_instance_name json.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

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

@@ -1,43 +1,48 @@
if @menu.menu_items if @menu.menu_items
json.menu_items @menu.menu_items do |item| json.menu_items @menu.menu_items do |item|
#Menu Item Information #Menu Item Information
json.item_code item.item_code # json.item_code item.item_code
json.name item.name # json.name item.name
json.alt_name item.alt_name # json.alt_name item.alt_name
json.type item.type # json.type item.type
json.min_qty item.min_qty # json.min_qty item.min_qty
# json.min_selectable_item item.min_selectable_item # json.min_selectable_item item.min_selectable_item
# json.max_selectable_item item.max_selectable_item # json.max_selectable_item item.max_selectable_item
#Item instance #Item instance
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
#Child Menu items #Child Menu items
if (item.menu_item_sets) then # if (item.menu_item_sets) then
json.set_items item.menu_item_sets.each do |item| # json.set_items item.menu_item_sets.each do |item|
json.partial! 'api/restaurant/menu/menu_item', item: item # json.partial! 'api/restaurant/menu/menu_item', item: item
end # end
end #end
# if category.menu_items
# json.items category.menu_items do |item|
json.partial! 'api/restaurant/menu/menu_item', item: item
# end
# end
end end
end end

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

@@ -49,9 +49,51 @@
</div> </div>
</div> </div>
</div> </div>
<!-- Large modal -->
<button class="btn btn-primary" data-toggle="modal" data-target=".sx_item_detailModal">Large modal</button>
<div class="modal fade sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header" style="background-color: #54A5AF;">
<h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-5">
<%= image_tag "logo.png" ,width: '', height: '', :style => '' %>
<br><br>
<div class="form-group">
<h4 class="col-md-12">Quantity</h4>
<input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
</div>
<div class="form-group row">
<h4 class="col-md-6">Total</h4>
<h4 class="col-md-6" id="total_price"> 2500 Ks</h4>
</div>
</div>
<div class="col-md-7">
<h4>Options</h4>
<h4>Attributes</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
<button type="button" class="btn btn-success" data-dismiss="modal" id="save_order">Add Order</button>
</div>
</div>
</div>
</div>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -59,29 +101,27 @@
<h4 class="modal-title"></h4> <h4 class="modal-title"></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<table width="100%" class="table table-striped">
<table width="100%" class="table table-striped"> <thead>
<thead> <tr>
<tr> <th style="">Item Name</th>
<th style="">Item Name</th> <th style="">Quantity</th>
<th style="">Quantity</th> <th></th>
<th></th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody> <tr>
<tr> <td class="item_name" id="modal-item-name"></td>
<td class="item_name" id="modal-item-name"></td> <td>
<td> <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
<input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100"> </td>
</td> <td>
<td> <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
<button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button> </td>
</td> </tr>
</tr> </tbody>
</tbody> </table>
</table> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button> <button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
<button type="button" class="btn btn-success" data-dismiss="modal" id="save">Update</button> <button type="button" class="btn btn-success" data-dismiss="modal" id="save">Update</button>
@@ -114,28 +154,21 @@ $(function(){
data: {}, data: {},
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
console.log(data);
var menu_items_list = $('.menu_items_list'); var menu_items_list = $('.menu_items_list');
menu_items_list.empty(); menu_items_list.empty();
menu_items = data.menu_items; menu_items = data.menu_items;
console.log(data); console.log(data);
for(var field in menu_items) { for(var field in menu_items) {
if (menu_items[field].item_instances){
var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2); var code = menu_items[field].instances[0].code
var is_available = menu_items[field].item_instances[1].is_available var name = menu_items[field].instances[0].name
var is_on_promotion = menu_items[field].item_instances[1].is_on_promotion var price = parseFloat(menu_items[field].instances[0].price).toFixed(2);
var item_attributes = menu_items[field].item_instances[1].item_attributes var is_available = menu_items[field].instances[0].is_available
var item_instance_code = menu_items[field].item_instances[1].item_instance_item_code var is_on_promotion = menu_items[field].instances[0].is_on_promotion
var item_instance_name = menu_items[field].item_instances[1].item_instance_name var item_attributes = menu_items[field].instances[0].item_attributes
var promotion_price = menu_items[field].item_instances[1].promotion_price var promotion_price = menu_items[field].instances[0].promotion_price
}else{
var price = parseFloat(menu_items[field].price).toFixed(2);
var is_available = menu_items[field].is_available
var is_on_promotion = menu_items[field].is_on_promotion
var item_attributes = menu_items[field].item_attributes
var item_instance_code = menu_items[field].item_instance_item_code
var item_instance_name = menu_items[field].item_instance_name
var promotion_price = menu_items[field].promotion_price
}
row = '<div class="card">' row = '<div class="card">'
+'<div class="card-head" style="line-height:14px;">' +'<div class="card-head" style="line-height:14px;">'
@@ -148,8 +181,8 @@ $(function(){
+'data-available="'+ is_available +'"' +'data-available="'+ is_available +'"'
+'data-promotion="'+ is_on_promotion +'"' +'data-promotion="'+ is_on_promotion +'"'
+'data-attributes="'+ item_attributes +'"' +'data-attributes="'+ item_attributes +'"'
+'data-instance-code="'+ item_instance_code +'"' +'data-instance-code="'+ code +'"'
+'data-instance="'+ item_instance_name +'"' +'data-instance="'+ name +'"'
+'data-promotion-price="'+ promotion_price +'"' +'data-promotion-price="'+ promotion_price +'"'
+'>' +'>'
+'<i class="fa fa-plus "' +'<i class="fa fa-plus "'
@@ -157,12 +190,14 @@ $(function(){
+'</i></div>' +'</i></div>'
+'</div>' +'</div>'
+'<div class="card-block">' +'<div class="menu_item_box" data-toggle="modal" data-target=".sx_item_detailModal">'
+'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' +'<div class="card-block">'
+'</div>' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>'
+'</div>'
+'<div class="card-footer">' +'<div class="card-footer">'
+'<small>'+ price +'</small>' +'<small>'+ price +'</small>'
+'</div>'
+'</div>'; +'</div>';
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
} }
@@ -230,6 +265,14 @@ $(function(){
$('#modal-qty').val(qty); $('#modal-qty').val(qty);
}); });
//click item row for update qty
$(document).on('click', '.menu_item_box', function(event){
data = $(this).parent().children().children('.add_icon');
$('#title_name').text(data.attr('data-name'));
console.log(data);
});
//click remove buttom in modal box //click remove buttom in modal box
$('#sx_itemModal').on('click','#remove', function(){ $('#sx_itemModal').on('click','#remove', function(){
$('.summary-items tr').filter(function(){ $('.summary-items tr').filter(function(){
@@ -359,7 +402,7 @@ $(function(){
.modal-dialog { .modal-dialog {
left:auto; left:auto;
right: auto; right: auto;
width: 600px; width: 100%;
padding-top: 100px; padding-top: 100px;
} }