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

receipt bill issue

Browse Source
This commit is contained in:
phyusin
2018-05-04 11:51:14 +06:30
parent 62636cc8c9
commit 162327ac4c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ $(function() {
$("#accepted").on("click", function(){ $("#accepted").on("click", function(){
if($(this).text().trim() == "ACCEPT"){ if($(this).text().trim() == "ACCEPT"){
$("#status").text($(this).attr("data-value"));
var requested_time = $("#requested_date_time").text(); var requested_time = $("#requested_date_time").text();
$("#requested_order_time").text(requested_time); $("#requested_order_time").text(requested_time);
showTimePicker(requested_time); showTimePicker(requested_time);
@@ -65,6 +66,7 @@ $(function() {
var waiting_time = new Date(date_time+' '+$("#waiting_time").val()); var waiting_time = new Date(date_time+' '+$("#waiting_time").val());
// requested_time.setHours(requested_time.getHours() - 1); // requested_time.setHours(requested_time.getHours() - 1);
// console.log(requested_time); // console.log(requested_time);
// console.log(date_time);
if(waiting_time.getTime() < requested_time.getTime()){ if(waiting_time.getTime() < requested_time.getTime()){
var time_diff = (requested_time.getTime() - waiting_time.getTime()); var time_diff = (requested_time.getTime() - waiting_time.getTime());
var expected_time = (Math.floor(time_diff) / 1000) / 60; var expected_time = (Math.floor(time_diff) / 1000) / 60;
@@ -282,7 +284,7 @@ function timeFormat(date){
var isMidday = date.getHours() == 12; var isMidday = date.getHours() == 12;
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), var time = [date.getHours() - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') + date.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM'); (isPM ? ' PM' : ' AM');
return time; return time;
} }

1
app/pdf/receipt_bill_pdf.rb
View File

@@ -206,7 +206,6 @@ class ReceiptBillPdf < Prawn::Document
total_price = item.price #item.qty*item.unit_price - comment for room charges total_price = item.price #item.qty*item.unit_price - comment for room charges
price = item.unit_price price = item.unit_price
product_name = item.product_name product_name = item.product_name
total_qty += item.qty
y_position = cursor y_position = cursor

4
app/views/origami/order_reservation/index.html.erb
View File

@@ -355,13 +355,13 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="body-td align-left"> <td colspan="2" class="body-td align-left">
<span class="font-13">ADDRESS</span><br> <span class="font-13">ADDRESS</span><br>
<b id="address"></b> <b id="address"></b>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="body-td align-left"> <td colspan="2" class="body-td align-left">
<span class="font-13">DELEVERY</span><br> <span class="font-13">DELEVERY</span><br>
<b id="delivery_to"></b> <b id="delivery_to"></b>
</td> </td>