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

update OQS and cashier

Browse Source
This commit is contained in:
Aung Myo
2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,28 +66,28 @@ $(document).on('turbolinks:load', function() {
}
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 animated " data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">'
// +'<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>'
+'<div class="row">'
+'<span class="col-md-4 order-zone-type font-13">'+data[field]["table_type"]+'-'+ data[field]["zone"] +'</span>'
+'<span class="order-zone hidden font-14">'+ data[field]["zone"] +'</span>'
+'<span class="col-md-8"><small class="float-right font-13">'+data[field]["order_id"]+'</small></span>'
+'</div>'
// +'<h6>'
+'<span class="order-item font-16">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ data[field]["qty"] +' </span>'
// +'</h6>'
+'<p class="m-b--10">'
+'<span class="order-item font-15">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty"> [x'+ data[field]["qty"] +'] </span>'
+'</p>'
+'<p class="card-text item-options">'+ options +'</p>'
+'<span class="card-text">'
+'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - '
+'<span class="text-muted">Order at - '
+'<span class="order-at">'+ show_date +'</span> <br>'
+'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+'Order By - <span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+'</span> '
+'</span>'
@@ -114,6 +114,7 @@ $(document).on('turbolinks:load', function() {
$(document).on('click', '.queue_station', function(event){
var orderZone=$(this).children().children().children('.order-zone').text().trim();
var orderZoneType=$(this).children().children().children('.order-zone-type').text().trim();
// var orderItem=$(this).children().children().children('.order-item').text();
var assigned_item_id = $(this).children().find(".assigned-order-item").text();
var orderQty = $(this).children().children().children('.order-qty').text();
@@ -121,8 +122,8 @@ $(document).on('turbolinks:load', function() {
var orderAt = $(this).children().children().children().children('.order-at').text();
var orderCustomer = $(this).children().children('.order-customer').text();
var order_status = $(this).children().children('.order-status').text();
$('#order-title').text("ORDER DETAILS - " + orderZone);
$('.cus_name').removeClass('hidden');
$('#order-title').text("ORDER DETAILS - " + orderZoneType);
$('#order-by').text(orderBy);
$('#order-at').text(orderAt);
$('#order-customer').text(orderCustomer);
@@ -134,7 +135,8 @@ $(document).on('turbolinks:load', function() {
type: 'GET',
url: '/oqs/' + orderZone,
data: { 'status' : order_status },
success: function(res){
success: function(res){
for (i = 0; i < res.length; i++) {
var data = JSON.stringify(res[i]);
var parse_data = JSON.parse(data);

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

@@ -52,7 +52,7 @@ $(document).ready(function() {
$('.datepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY',
clearButton: true,
clearButton: false,
weekStart: 1,
time: false
});

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

@@ -37,26 +37,27 @@ 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 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 font-16">'+ items[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ items[field]["qty"] +'- </span>'
// +'</h4>'
+'<div class="row">'
+'<span class="col-md-4 order-zone-type font-13">'+items[field]["table_type"]+'-'+ items[field]["zone"] +'</span>'
+'<span class="order-zone hidden font-14">'+ items[field]["zone"] +'</span>'
+'<span class="col-md-8"><small class="float-right font-13">'+items[field]["order_id"]+'</small></span>'
+'</div>'
+'<p class="m-b--10">'
+'<span class="order-item font-15">'+ items[field]["item_name"] +'- </span>'
+'<span class="order-qty"> [x'+ items[field]["qty"] +'] </span>'
+'</p>'
+'<p class="card-text item-options">'+ options +'</p>'
+'<span class="card-text">'
+'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - '
+'<span class="text-muted">Order at - '
+'<span class="order-at">'+ show_date +'</span> <br>'
+'<span class="order-by">'+ items[field]["item_order_by"] +'</span> '
+'</span> '
+'</span>'
+'Order By - <span class="order-by">'+ items[field]["item_order_by"] +'</span> '
+'</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> '
@@ -73,8 +74,12 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
var $divs = $("div.queue_station");
var SortListDivs = $divs.sort(function (a, b) {
first = $(a).attr('data-date');
next = $(b).attr('data-date');
console.log(first);
console.log("hi")
console.log(next);
return parseInt(next.substring(4, 16)) - parseInt(first.substring(4, 16));
});
$("#oqs_container").html(SortListDivs);

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

@@ -21,6 +21,51 @@
color: #fff !important;
background-color: blue;
}
.cashier_number{
width: 33%;
height:58px;
line-height:58px;
text-align:center;
background:#54A5AF;
// float:left;
// margin:2px;
font-size:20px;
color:white;
// cursor:pointer;
}
.del_cashier_number{
opacity:0.6,
}
.pay{
width: 86%;
height:174px;
line-height:174px;
text-align:center;
font-size:20px;
color:white;
}
.long{
width:43%;
}
.orange{
background-color:#FF7F50;
}
.red {
background-color:#F44336;
}
.green{
background-color: #009900;
}
.left{
margin-left:1px;
}
.bottom{
margin-bottom:1px;
}
.border-left{
border-left:1px solid #fff;
}