From ed8e9836fe2a9d2a5e7ee83c37460aa8928a9c7f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 19 Apr 2018 10:16:38 +0630
Subject: [PATCH] check and update qrcode payment

---
 app/controllers/origami/order_reservation_controller.rb | 5 ++---
 app/models/order_reservation.rb                         | 4 ++--
 app/views/origami/dinga/index.html.erb                  | 8 +++++---
 app/views/origami/paymal/index.html.erb                 | 2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index 87e8b18f..562eaaed 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -50,10 +50,9 @@ class Origami::OrderReservationController < BaseOrigamiController
       status = params[:status]
     end
 
-    # response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
 
-    result = {:status=> true, :message => " accepted !" }
-        render :json => result.to_json
+    render :json => response
   end
 
 end
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 21c76030..2fa99cf4 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -92,7 +92,7 @@ class OrderReservation < ApplicationRecord
           @status, @sale = Sale.request_bill(@order,current_user,current_user)
 
           #order status send to doemal
-          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
           #order reservation status updated
           update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
 
@@ -123,7 +123,7 @@ class OrderReservation < ApplicationRecord
 	      sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash")
 
 	      #order status send to doemal
-          # callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
+          callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
           #order reservation status updated
           update_order_reservation(order.id, saleObj.sale_id, DELIVERED)
 
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index e9205fbf..1a7bd798 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -118,7 +118,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
       </div>
       <div class="modal-body">
-        <input type="hidden" name="paypar_account_no" id="paypar_account_no" value="1011002923682533" />
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
         <input type="hidden" name="qr_code" id="qr_code" />
         <div class="row text-center m-t-20">
           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -325,9 +325,10 @@
 	    var customer_name = '';
 	    var membership_id = '';
 	    var membership_type = '';    
+	    var receipt_no  = $("#receipt_no").text() || 0;
 	    setTimeout(function(){
-	      code=getQRCode(); 
-	      if(sale_id != 0 && code != ""){    
+	      code=getQRCode();
+	      if(sale_id != 0 && code != ""){  
 	         $.ajax({
 	          type: "POST",
 	          url: "/origami/"+sale_id+"/send_account" ,
@@ -343,6 +344,7 @@
 						url:  "<%=origami_payment_paymal_path%>",
 						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+
 							if(result.status == true){
 								swal({
 									title: "Information!",
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index 5594eb13..6818fbad 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -328,6 +328,7 @@
 	    var payment_amount = parseFloat($("#used_amount").text());
 	    setTimeout(function(){
 	      code=getQRCode(); 
+	      alert(code)
 	      if(sale_id != 0 && code != ""){    
 	         $.ajax({
 	          type: "POST",
@@ -344,6 +345,7 @@
 						url:  "<%=origami_payment_paymal_path%>",
 						data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
 						success: function(result){
+							alert(result)
 							if(result.status == true){
 								swal({
 									title: "Information!",