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

change order reservation data

Browse Source
This commit is contained in:
phyusin
2018-05-09 19:10:11 +06:30
parent fe306dc26b
commit 0127b23e93
9 changed files with 113 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/channels/order_reservation.js
View File

@@ -17,7 +17,7 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel'
var rowCount = key+1;
var date = new Date(value.created_at);
var time = timeFormat(date);
var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate()>10?date.getDate() : '0'+date.getDate());
var created_at = date.getFullYear() +'-'+ (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >=10?date.getDate() : '0'+date.getDate());
var delivery_type = "";
if(value.delivery_type == "service"){

55
app/assets/javascripts/order_reservation.js
View File

@@ -2,6 +2,9 @@
$(function() {
$("#discount").hide();
$(".expected_time").hide();
$('#accepted').hide();
$('#cancel').hide();
$(".tbl_customer").hide();
$(function() {
$('.first-1').click();
});
@@ -11,8 +14,9 @@ $(function() {
$(".nav-item").on("click", function(){
type = $(this).attr("data-type");
refreshDetailData();
$('#accepted').show();
$('#cancel').show();
$('#accepted').hide();
$('#cancel').hide();
$(".tbl_customer").hide();
if (type == "pending") {
$(".first-1").click();
$('#accepted').text("ACCEPT");
@@ -26,13 +30,14 @@ $(function() {
$('#accepted').text("READY TO DELIVERY");
$('#accepted').attr("data-value","delivery");
}else if(type == "completed"){
// $('#cancel').hide();
$(".fourth-1").click();
$('#accepted').text("PICK-UP");
$('#accepted').text("COMPLETE");
$('#accepted').attr("data-value","completed");
}else if(type == "processed"){
$(".fifth-1").click();
$('#accepted').hide();
$('#cancel').hide();
// $('#accepted').hide();
// $('#cancel').hide();
}
// console.log(type);
});
@@ -94,7 +99,7 @@ $(function() {
$(".time_interval").on("click",function(){
var type = '';
if($(".timer_type").hasClass("selected-item")){
type = '+';
type = 'after';
}
var minutes = $(this).attr("data-value");
// console.log(type);
@@ -104,14 +109,14 @@ $(function() {
var order_id = $('#order_id').text();
var ref_no = $('#ref_no').text();
var callback = $('#callback_url').text();
var requested_time = new Date($("#requested_date_time").text());
if(type == 'plus'){
requested_time.setMinutes(requested_time.getMinutes() + minutes);
}else{
requested_time.setMinutes(requested_time.getMinutes() - minutes);
}
// var requested_time = new Date($("#requested_date_time").text());
// if(type == 'after'){
// requested_time.setMinutes(requested_time.getMinutes() + minutes);
// }else{
// requested_time.setMinutes(requested_time.getMinutes() - minutes);
// }
// console.log(requested_time);
callback_url(callback,ref_no,order_id,status,type,minutes,requested_time);
callback_url(callback,ref_no,order_id,status,type,minutes);
});
$(document).on('click','.access_number', function(event){
@@ -201,20 +206,30 @@ function show_order_detail(url,sr_no){
dataType: "json",
success: function(data) {
// console.log(data);
$(".tbl_customer").show();
if(data.status != "delivered"){
$('#accepted').show();
if(data.status != "ready_to_delivery" && data.status != "send_to_kitchen"){
$('#cancel').show();
}
}else{
$('#accepted').hide();
$('#cancel').hide();
}
var delivery = data["delivery"];
var items = data["order_items"];
var item_list = $('.summary-items');
var newDate = new Date(data.requested_time);
var time = timeFormat(newDate);
var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() > 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() > 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time;
var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() >= 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time;
if((data.expected_waiting_time!=undefined) && (data.expected_waiting_time!=null)){
var expDate = new Date(data.expected_waiting_time);
var exptime = timeFormat(expDate);
var expected_time = expDate.getFullYear() + '-' + (expDate.getMonth() > 10? expDate.getMonth() : '0' + (expDate.getMonth() + 1)) +'-'+ (expDate.getDate() > 10? expDate.getDate() : '0' + expDate.getDate()) +' '+exptime;
// var expDate = new Date(data.expected_waiting_time);
// var exptime = timeFormat(expDate);
// var expected_time = expDate.getFullYear() + '-' + (expDate.getMonth() >= 10? expDate.getMonth() : '0' + (expDate.getMonth() + 1)) +'-'+ (expDate.getDate() >= 10? expDate.getDate() : '0' + expDate.getDate()) +' '+exptime;
$('.expected_time').show();
$('#expected_time').text(expected_time? expected_time : '');
$('#expected_time').text(data.expected_waiting_time? data.expected_waiting_time : '');
}else{
$('.expected_time').hide();
$('#expected_time').text('');
@@ -334,7 +349,7 @@ function callback_url(callback,ref_no,order_id,status,min_type,time,exptime,reas
$.ajax({
type: "POST",
url: url,
data: {order_id: order_id, status: status, expected_time: expected_time, remark: reason, access_code: access_code},
data: {order_id: order_id, status: status, min_type: min_type, expected_time: waiting_time, remark: reason, access_code: access_code},
dataType: "json",
success: function(data) {
if (data.status) {
@@ -383,7 +398,7 @@ function showNewOrder(order_reservation){
if((order_reservation!=undefined) && (order_reservation!=null) && (order_reservation!="")){
var date = new Date(order_reservation.requested_time);
var time = timeFormat(date);
var requested_date = date.getFullYear() + '-' + (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() > 10? date.getDate() : '0' + date.getDate()) +' '+time;
var requested_date = date.getFullYear() + '-' + (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >= 10? date.getDate() : '0' + date.getDate()) +' '+time;
//audio play
var audio = new Audio('/beep-07.wav'); // define your audio
// setTimeout(function(){