diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 3b5f2b39..ad63ff84 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -169,6 +169,7 @@ class BookingController extends Controller $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); $booking->timeout = $difference_in_seconds; + $booking->marking = $booking->user->marking; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); @@ -214,6 +215,7 @@ class BookingController extends Controller $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); $booking->timeout = $difference_in_seconds; + $booking->marking = $booking->user->marking; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); @@ -524,6 +526,7 @@ class BookingController extends Controller $term = $request->input('term'); $china_beneficiary = $request->input('china_beneficiary'); $rates = Rate::orderby('updated_at','desc')->first(); + $marking = $user = Auth::user()->marking; $creditLimit = SettingCredit::orderby('updated_at','desc')->first(); @@ -534,9 +537,7 @@ class BookingController extends Controller if($amount > $creditLimit->rmb_credit_limit){ return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400); } - - // TODO : get marking - $marking = "123X"; + switch ($term) { case "x1_cash": diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue index 1854f3d7..17501670 100644 --- a/resources/assets/js/pages/admin/booking/completed.vue +++ b/resources/assets/js/pages/admin/booking/completed.vue @@ -114,7 +114,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index f83004c3..091cfaa9 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 1d96b517..41400042 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index f8e1261e..0e626004 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index 8b00f363..dc0397c7 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -55,7 +55,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 5ad41ab0..1dce14bc 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -50,7 +50,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue index 7b46e04f..69808a3a 100644 --- a/resources/assets/js/pages/booking/completed.vue +++ b/resources/assets/js/pages/booking/completed.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue index f02e9ab1..d1de4156 100644 --- a/resources/assets/js/pages/booking/confirmation.vue +++ b/resources/assets/js/pages/booking/confirmation.vue @@ -60,7 +60,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue index 2375a6a6..f7ba1050 100644 --- a/resources/assets/js/pages/booking/po.vue +++ b/resources/assets/js/pages/booking/po.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/poComplete.vue b/resources/assets/js/pages/booking/poComplete.vue index 7f472ae4..5bb61d5d 100644 --- a/resources/assets/js/pages/booking/poComplete.vue +++ b/resources/assets/js/pages/booking/poComplete.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue index 693401f7..5fac361e 100644 --- a/resources/assets/js/pages/booking/transfer.vue +++ b/resources/assets/js/pages/booking/transfer.vue @@ -60,7 +60,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue index 24f4a72a..5ce467b5 100644 --- a/resources/assets/js/pages/booking/uploadPo.vue +++ b/resources/assets/js/pages/booking/uploadPo.vue @@ -97,7 +97,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}