From 1d23e913d5b1d08952d94f7a066e704f6ab0e406 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Sun, 22 Jul 2018 15:42:48 +0800
Subject: [PATCH] added order_no and patment_for to calculation controller
 function

---
 app/Http/Controllers/BookingController.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index dd00550d..a26c4508 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -545,6 +545,8 @@ class BookingController extends Controller
         $amount = $request->input('amount');
         $term = $request->input('term');
         $china_beneficiary = $request->input('china_beneficiary');
+        $order_no = $request->input('order_no');
+        $payment_for = $request->input('payment_for');
         $rates = Rate::orderby('updated_at','desc')->first();
         $marking = $user = Auth::user()->marking;
         $taxrate = SettingTaxRate::latest()->first()->tax_rate;
@@ -564,11 +566,11 @@ class BookingController extends Controller
         switch ($term) {
          case "x1_cash":
              $rate = $rates->x1_cash;
-             $payment_method = "cash";
+             $payment_method = "CASH";
              break;
          case "x1_cheque":
              $rate = $rates->x1_cheque;
-             $payment_method = "Cheque";
+             $payment_method = "CHEQUE";
              break;
          case "x1_ba":
              $rate = $rates->x1_ba;
@@ -576,11 +578,11 @@ class BookingController extends Controller
              break;
          case "x2_cash":
              $rate = $rates->x2_cash;
-             $payment_method = "Cash";
+             $payment_method = "CASH";
              break;
          case "x2_cheque":
              $rate = $rates->x2_cheque;
-             $payment_method = "Cheque";
+             $payment_method = "CHEQUE";
              break;
          case "x2_ba":
              $rate = $rates->x2_ba;
@@ -607,6 +609,8 @@ class BookingController extends Controller
  
          return response()->json([
              'date' => date('Y-m-d'),
+             'order_no' => $order_no,
+             'payment_for' => $payment_for,
              'marking' => $marking,
              'payment_method' => $payment_method,
              'china_beneficary' => $china_beneficiary,