From e7c2e3c0077c94c3ce8907007c665cc9254abe49 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 27 Sep 2017 17:54:54 +0630 Subject: [PATCH] update addorder --- app/assets/javascripts/OQS.js | 2 +- app/assets/javascripts/addorder.js | 58 +++++++++---------- .../channels/order_queue_station.js | 2 +- app/assets/stylesheets/addorder.scss | 1 + 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 64ebc678..c48807b3 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -61,7 +61,7 @@ $(document).ready(function(){ var date = new Date(data[field]["created_at"]); var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); - row ='
' + row ='
' +'
' +'

' +''+data[field]["table_type"]+'- ' diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 01d42309..0e626507 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -69,38 +69,38 @@ $(function(){ image_path = "/image/logo.png"; } - row = '
' - +'
' - +''+ menu_items[field].name +'' - +"
" - +"' - +'
' - +'
' + row = '
' + +'
' + +''+ menu_items[field].name +'' + +"
" + +"' + +'' + +'
' + +'
' - +"
" + +"
" - +"
" - +"" + +"
" + +"" + +"
" - +"
" - - +'' - +'
'; + +'' + +'
'; $('.menu_items_list').append(row); } } diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index 1b9351cf..4fb7d214 100644 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -34,7 +34,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann if (oqs_id == items[field]["order_queue_station_id"]) { - row ='
' + row ='
' +'' +'
' +'

' diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 88adca00..d81a2d85 100644 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -9,6 +9,7 @@ background-color: #54A5AF; padding:5px; color :#fff; + } .custom-card {