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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-04-27 13:47:54 +06:30
parent 172c2136cc
commit 11473c7fcd
9 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,14 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', {
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var requested_date = date.getDate() + '-' + date.getMonth() + '-' + date.getFullYear()
var month = 0;
if(parseInt(newDate.getMonth()) > 10){
month = parseInt(newDate.getMonth()) + 1;
}
else{
month = '0' + (parseInt(newDate.getMonth()) + 1);
}
var requested_date = date.getFullYear() +'-'+ month +'-'+ date.getDate();
row = '<tr class="custom-tr first-'+rowCount+'" style="" data-id="'+order.order_reservation_id+'" data-sr-no="'+rowCount+'">'
+'<td width ="5%" class="align-left">'+rowCount

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

@@ -63,6 +63,25 @@ $(function() {
var delivery = data["delivery"];
var items = data["order_items"];
var item_list = $('.summary-items');
var date = new Date(data.requested_time);
var newDate = new Date(date.getTime() + (date.getTimezoneOffset() * 60000));
var isPM = newDate.getHours() >= 12;
var isMidday = newDate.getHours() == 12;
var time = [newDate.getHours() - (isPM && !isMidday ? 12 : 0),
newDate.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var month = 0;
if(parseInt(newDate.getMonth()) > 10){
month = parseInt(newDate.getMonth()) + 1;
}
else{
month = '0' + (parseInt(newDate.getMonth()) + 1);
}
var requested_date = newDate.getFullYear() + '-' + month +'-'+ newDate.getDate() +' '+time;
item_list.empty();
if(items!=undefined && items!=""){
@@ -84,9 +103,10 @@ $(function() {
$('.summary-items').append(row);
}
$('#requested_date_time').text(requested_date);
$('#sub_total').text(data.total_amount);
$('#delivery_fee').text(delivery.delivery_fee);
$('#total_charges').text(0);
$('#delivery_fee').text(delivery.delivery_fee? delivery.delivery_fee : '0.0');
$('#total_charges').text(data.convenience_charge?data.convenience_charge : '0.0');
$('#total_tax').text(data.total_tax);
$('#grand_total').text(data.grand_total);
@@ -100,9 +120,9 @@ $(function() {
$('#callback_url').text(data.callback_url);
$('#order_id').text(data.order_reservation_id);
if(delivery.provider == "direct_delivery"){
if(delivery.delivery_type == "service"){
$("#delivery_info").text("(DELIVERY)");
}else if(delivery.provider == "self_pick_up"){
}else if(delivery.delivery_type == "self_pick_up"){
$("#delivery_info").text("(PICK-UP)");
}

3
app/assets/stylesheets/order_reservation.scss
View File

@@ -85,4 +85,7 @@
}
.tr-active{
background-color : #FFCDD2;
}
.div_order_margin {
margin: 0px 0px 0px -5px !important
}