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-09-27 17:54:54 +06:30
parent d4484ce849
commit e7c2e3c007
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/OQS.js
View File

@@ -61,7 +61,7 @@ $(document).ready(function(){
var date = new Date(data[field]["created_at"]); var date = new Date(data[field]["created_at"]);
var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
row ='<div class="card queue_station" data-date="'+data[field]["order_id"]+'">' row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">' +'<div class="card-block">'
+'<h4 class="card-title">' +'<h4 class="card-title">'
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>' +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'

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

@@ -69,38 +69,38 @@ $(function(){
image_path = "/image/logo.png"; image_path = "/image/logo.png";
} }
row = '<div class="card custom-card">' row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head" style="line-height:14px;">' +'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<small class="col-md-9">'+ menu_items[field].name +'</small>' +'<small class="col-md-9">'+ menu_items[field].name +'</small>'
+"<div class='col-md-3 add_icon' data-item-code='" +"<div class='col-md-3 add_icon' data-item-code='"
+ menu_items[field].code +"' data-name='" + menu_items[field].code +"' data-name='"
+ menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '" + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
+ price +"' data-instance-code = '"+ code +"' data-instance = '" + price +"' data-instance-code = '"+ code +"' data-instance = '"
+ name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '" + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>" + options +"' data-image='"+image_path+"'>"
+"<i class='fa "+fa_plus+" '" +"<i class='fa "+fa_plus+" '"
+ 'style="margin-top:4px;">' + 'style="margin-top:4px;">'
+'</i></div>' +'</i>'
+'</div>' +'</div>'
+'</div>'
+"<div class='"+menu_item_box+"' data-item-code='" +"<div class='"+menu_item_box+"' data-item-code='"
+ menu_items[field].code +"' data-instance = '" + menu_items[field].code +"' data-instance = '"
+JSON.stringify(menu_items[field].instances)+"' data-id = '" +JSON.stringify(menu_items[field].instances)+"' data-id = '"
+JSON.stringify(menu_items[field].attributes)+"' data-item = '" +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
+JSON.stringify(item_attributes)+"' data-option = '" +JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(menu_items[field].options)+"' data-item-sets = '" +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>" +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>"
+"<div class='card-block custom-card-block'>" +"<div class='card-block custom-card-block'>"
+"<img id='logo' src='"+image_path+"'>" +"<img id='logo' src='"+image_path+"'>"
+"</div>"
+"</div>" +'<div class="card-footer custom-card-footer">'
+'<small>'+ price +'</small>'
+'<div class="card-footer custom-card-footer">' +'</div>'
+'<small>'+ price +'</small>' +'</div>';
+'</div>'
+'</div>';
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
} }
} }

2
app/assets/javascripts/channels/order_queue_station.js
View File

@@ -34,7 +34,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
if (oqs_id == items[field]["order_queue_station_id"]) { if (oqs_id == items[field]["order_queue_station_id"]) {
row ='<div class="card queue_station queue_station_box" data-date="'+items[field]["order_id"]+'">' row ='<div class="card queue_station animated shake queue_station_box" data-date="'+items[field]["order_id"]+'">'
+'<strong class="hidden">'+items[field]["order_id"]+'</strong>' +'<strong class="hidden">'+items[field]["order_id"]+'</strong>'
+'<div class="card-block">' +'<div class="card-block">'
+'<h4 class="card-title">' +'<h4 class="card-title">'

1
app/assets/stylesheets/addorder.scss
View File

@@ -9,6 +9,7 @@
background-color: #54A5AF; background-color: #54A5AF;
padding:5px; padding:5px;
color :#fff; color :#fff;
} }
.custom-card { .custom-card {