From 162327ac4cf999d19e1796c6b864685c17cdbf59 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 4 May 2018 11:51:14 +0630
Subject: [PATCH] receipt bill issue

---
 app/assets/javascripts/order_reservation.js        | 4 +++-
 app/pdf/receipt_bill_pdf.rb                        | 1 -
 app/views/origami/order_reservation/index.html.erb | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 0f438831..990e4a74 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -33,6 +33,7 @@ $(function() {
 
   $("#accepted").on("click", function(){
     if($(this).text().trim() == "ACCEPT"){
+      $("#status").text($(this).attr("data-value"));
       var requested_time = $("#requested_date_time").text();
       $("#requested_order_time").text(requested_time);
       showTimePicker(requested_time);
@@ -65,6 +66,7 @@ $(function() {
     var waiting_time = new Date(date_time+' '+$("#waiting_time").val());
     // requested_time.setHours(requested_time.getHours() - 1);
     // console.log(requested_time);
+    // console.log(date_time);
     if(waiting_time.getTime() < requested_time.getTime()){
       var time_diff = (requested_time.getTime() - waiting_time.getTime());
       var expected_time = (Math.floor(time_diff) / 1000) / 60;
@@ -282,7 +284,7 @@ function timeFormat(date){
   var isMidday = date.getHours() == 12;
   var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), 
           date.getMinutes() || '00'].join(':') +
-         (isPM ? ' PM' : 'AM');
+         (isPM ? ' PM' : ' AM');
   return time;
 }
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 95a6a277..59e6a320 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -206,7 +206,6 @@ class ReceiptBillPdf < Prawn::Document
                 total_price   = item.price #item.qty*item.unit_price - comment for room charges
                 price         = item.unit_price
                 product_name  = item.product_name
-                total_qty    += item.qty
 
                 y_position = cursor
 
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index a15b45aa..89c4b4e9 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -355,13 +355,13 @@
                   </td>
                 </tr>
                 <tr>
-                  <td class="body-td align-left">
+                  <td colspan="2" class="body-td align-left">
                      <span class="font-13">ADDRESS</span><br>
                      <b id="address"></b>
                   </td>
                 </tr>
                 <tr>
-                  <td class="body-td align-left">
+                  <td colspan="2" class="body-td align-left">
                      <span class="font-13">DELEVERY</span><br>
                      <b id="delivery_to"></b>
                   </td>