diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 93caaf06..38066bbc 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -38,6 +38,7 @@ class BookingSupplierController extends Controller $supplier_booking = $booking->supplierBooking()->first(); $dt = new \DateTime($supplier_booking->created_at); $supplier_booking->date = $dt->format('j F Y'); + $supplier_booking->marking = $booking->user->marking; return response()->json($supplier_booking ,200); diff --git a/app/Http/Controllers/SettingActiveBankController.php b/app/Http/Controllers/SettingActiveBankController.php index 97c84dd6..0995e3f2 100644 --- a/app/Http/Controllers/SettingActiveBankController.php +++ b/app/Http/Controllers/SettingActiveBankController.php @@ -10,7 +10,7 @@ class SettingActiveBankController extends Controller public function index() { $active_bank_setting = SettingActiveBank::latest()->first(); - return response()->json($active_bank_setting, 201); + return response()->json($active_bank_setting, 200); } public function update(Request $request) diff --git a/app/Http/Controllers/SettingBeneficiaryController.php b/app/Http/Controllers/SettingBeneficiaryController.php index fdec75f7..eef947b1 100644 --- a/app/Http/Controllers/SettingBeneficiaryController.php +++ b/app/Http/Controllers/SettingBeneficiaryController.php @@ -12,8 +12,12 @@ class SettingBeneficiaryController extends Controller return SettingBeneficiary::all(); } - public function show(SettingBeneficiary $beneficiary) + public function show($beneficiary) { + if ($beneficiary == 0){ + response()->json(["company_name"=>"123", "account_number"=>"123"] , 201); + } + $beneficiary = SettingBeneficiary::find($beneficiary); return $beneficiary; } diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 9f20635c..6eaddec8 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -439,7 +439,7 @@ ctx.font = "13px Arial"; ctx.textAlign = "right"; //// Row 1 - ctx.fillText("Payment Voucher :", column1X, rowHeight[1] - 5); + ctx.fillText("Ref No. :", column1X, rowHeight[1] - 5); ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5); //// Row 2 ctx.fillText("Date :", column1X, rowHeight[2] - 5); @@ -448,7 +448,7 @@ ctx.fillText("Marking :", column1X, rowHeight[3] - 5); ctx.font = "bold 14px Arial"; ctx.fillStyle = "#0070D5"; - ctx.fillText("CIEF/605HOS", column3X, rowHeight[3] - 5); + ctx.fillText(binding.value.marking, column3X, rowHeight[3] - 5); ctx.fillStyle = "#000000"; ctx.font = "13px Arial"; //// Row 4