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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

Browse Source
This commit is contained in:
Aung Myo
2018-02-08 11:09:21 +06:30
parent 38dc13ecf7 7ae8b44f4b
commit 8e2ec90ee6
33 changed files with 303 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
//= require custom.js
$(document).on('turbolinks:load', function() {
var oqs_id = "";
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')
$(".oqs_append").addClass('hide')
@@ -37,7 +38,8 @@ $(document).on('turbolinks:load', function() {
$(".oqs_append").removeClass('hide');
$(this).addClass('oqs_active');
$(".queue_station").addClass('queue_station_box');
var oqs_id = $(this).find(".oqs-id").text();
oqs_id = $(this).find(".oqs-id").text();
console.log(oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url);
@@ -142,8 +144,7 @@ $(document).on('turbolinks:load', function() {
type: 'GET',
url: '/oqs/' + orderNo,
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);
@@ -156,10 +157,19 @@ $(document).on('turbolinks:load', function() {
});
}
}
var order_item_row = "<tr>" +
if (oqs_id > 0){
var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
"</tr>";
}else{
var order_item_row = "<tr>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
"</tr>";
}
$("#oqs-order-details-table").children("tbody").append(order_item_row);
}
}

22
app/assets/javascripts/channels/call_waiter.js
View File

@@ -7,15 +7,27 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
received: function(data) {
table = data.table
time = data.time
// for Notificaiotn message
var element = "#notify-wrapper"
var placementFrom = "top";
var placementAlign = "center";
var animateEnter = "";
var animateExit = "";
var colorName = "alert-warning";
var text = " Calling Waiter <br> "+table.name ;
if (time == 'print_error') {
var colorName = "alert-danger";
var placementFrom = "center";
var placementAlign = "center";
var text = " Hello <br> "+table ;
style =""
}else{
var colorName = "alert-warning";
var placementFrom = "top";
var placementAlign = "center";
var text = " Calling Waiter <br> "+table.name ;
style ="width:180px !important;"
}
if (text != null || colorName != null){
showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
@@ -43,7 +55,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
enter: animateEnter,
exit: animateExit
},
template: '<div data-notify="container" style="width:180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
template: '<div data-notify="container" style="'+style+'" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
'<button type="button" aria-hidden="true" class="close notify-close float-right m-l-5 m-t--5" data-notify="dismiss">×</button>' +
'<span data-notify="icon"></span> ' +
'<span data-notify="title">{1}</span> ' +