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);