Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

app/controllers/api/payment/callback_controller.rb

@@ -0,0 +1,15 @@
+class Api::Payment::CallbackController < Api::ApiController
+
+	skip_before_action  :authenticate
+
+  def kbzpay
+    Rails.logger.info params[:Request]
+    callback_value = params[:Request]
+    trade_status = params[:Request][:trade_status]
+    total_amount = params[:Request][:total_amount]
+    if trade_status == "PAY_SUCCESS"
+      merch_order_id = params[:Request][:merch_order_id]
+    end
+  end
+
+end

app/controllers/api/payment/mobilepayment_controller.rb

@@ -28,7 +28,7 @@ class Api::Payment::MobilepaymentController < Api::ApiController
             new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
             rounding_adj = new_total-saleObj.grand_total
             saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)
-            
+
           end
         end
       end
@@ -41,7 +41,7 @@ class Api::Payment::MobilepaymentController < Api::ApiController
         @cash ={"change_amount"=>sale_payment[3],"balance_amount"=>sale_payment[4] ,"receipt_url"=>''}
       end
       @out = true,@cash
-    
+
     else
       @out =false,"Something wrong!"
       sale_payment = SalePayment.new
@@ -53,8 +53,4 @@ class Api::Payment::MobilepaymentController < Api::ApiController
 
   end
 
-  def kbz_pay
-    
-  end
-
 end

app/controllers/origami/payments_controller.rb

@@ -102,6 +102,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
+      status, qr = KbzPay.pay(amount, receipt_no)
+
       filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount,nil,nil,nil)
 
       result = {