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

update oqs view an d promotion form update

Browse Source
This commit is contained in:
Aung Myo
2017-11-10 14:32:21 +06:30
parent 7115ae0a97
commit 8db96beca0
7 changed files with 91 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,26 +70,26 @@ $(document).on('turbolinks:load', function() {
row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">'
+'<h6 class="card-">'
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+'</h6>'
// +'<h6 class="card-">'
+'<span class="order-zone-type font-14">'+data[field]["table_type"]+'- '+ data[field]["zone"] +' </span>'
// +'<span class="order-zone font-14">'+ data[field]["zone"] +'</span>'
+'<small class="float-right font-14">'+ data[field]["order_id"] +'</small>'
// +'</h6>'
+'<h6>'
+'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
// +'<h6>'
+'<span class="order-item font-16">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+'</h6>'
// +'</h6>'
+'<p class="card-text item-options">'+ options +'</p>'
+'<p class="card-text">'
+'<small class="text-muted">Order at'
+'<span class="card-text">'
+'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - '
+'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+'</small> '
+'</p>'
+'</span> '
+'</span>'
+'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
+'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '

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

@@ -37,26 +37,26 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
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>'
+'<div class="card-block">'
+'<h4 class="card-title">'
+'<span class="order-zone-type">'+items[field]["table_type"]+'- </span>'
+'<span class="order-zone">'+ items[field]["zone"] +'</span>'
+'<small class="pull-right">'+ items[field]["order_id"] +'- </small>'
+'</h4>'
// +'<h4 class="card-title">'
+'<span class="order-zone-type font-14">'+items[field]["table_type"]+'- </span>'
+'<span class="order-zone font-14">'+ items[field]["zone"] +'</span>'
+'<small class="pull-right font-14">'+ items[field]["order_id"] +'- </small>'
// +'</h4>'
+'<h4>'
+'<span class="order-item">'+ items[field]["item_name"] +'- </span>'
// +'<h4>'
+'<span class="order-item font-16">'+ items[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ items[field]["qty"] +'- </span>'
+'</h4>'
// +'</h4>'
+'<p class="card-text item-options">'+ options +'</p>'
+'<p class="card-text">'
+'<small class="text-muted">Order at'
+'<span class="card-text">'
+'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - '
+'<span class="order-by">'+ items[field]["item_order_by"] +'</span> '
+'</small> '
+'</p>'
+'</span> '
+'</span>'
+'<p class="hidden order-customer">'+ items[field]["customer_name"] +'</p> '
+'<p class="hidden assigned-order-item">'+ items[field]["assigned_order_item_id"] +'</p> '

5
app/assets/stylesheets/OQS.scss
View File

@@ -22,10 +22,5 @@
background-color: blue;
}
.order-item {
width: 49%;
font-size: 18px;
margin: 0px 0px 5px 0px;
}