Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui

# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php

app/Http/Controllers/Billplz/CallbackBillplzController.php

@@ -1,19 +1,21 @@
 <?php
 
-namespace App\Http\Controllers\Billplzs;
+namespace App\Http\Controllers\Billplz;
 
 use App\Classes\Modules\Billplzs\ControllersLogic\CallbackBillplzLogic;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class CallbackBillplzController
 {
+
     /**
      * @param Request $request
-     * @param BillplzBillLogic $logic
-     * @return JsonResponse
+     * @param CallbackBillplzLogic $logic
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
      */
-    public function callback(Request $request, CallbackBillplzLogic $logic): JsonResponse {
+    public function callback(Request $request, CallbackBillplzLogic $logic) {
         return $logic->execute($request);
     }
 

app/Http/Controllers/Billplz/CreateBillplzBillController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Billplzs;
+namespace App\Http\Controllers\Billplz;
 
 use App\Classes\Modules\Billplzs\ControllersLogic\CreateBillplzBillLogic;
 use Illuminate\Http\JsonResponse;
@@ -10,7 +10,7 @@ class CreateBillplzBillController
 {
     /**
      * @param Request $request
-     * @param BillplzBillLogic $logic
+     * @param CreateBillplzBillLogic $logic
      * @return JsonResponse
      */
     public function create(Request $request, CreateBillplzBillLogic $logic): JsonResponse {

app/Http/Controllers/Bookings/AutoPurchaseOrderFillController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\AutoPurchaseOrderFillLogic;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AutoPurchaseOrderFillController
+{
+    /**
+     * @param Request $request
+     * @param AutoPurchaseOrderFillLogic $logic
+     * @return JsonResponse
+     */
+    public function auto(Request $request, AutoPurchaseOrderFillLogic $logic): JsonResponse {
+        Auth()->login(User::find(1));
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreateProformaInvoiceTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateProformaInvoiceTransaction
+{
+    /**
+     * @param Request $request
+     * @param CreateProformaInvoiceTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateProformaInvoiceTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/RegenerateInvoiceBookingController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\RegenerateInvoiceBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RegenerateInvoiceBookingController
+{
+    /**
+     * @param Request $request
+     * @param RegenerateInvoiceBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function regenerate(Request $request, RegenerateInvoiceBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/UpdateBookingAmountController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateBookingAmountController
+{
+    /**
+     * @param Request $request
+     * @param CreateBookingRefundLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateBookingAmountLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}   

app/Http/Controllers/Transactions/CreateTransactionController.php

@@ -10,6 +10,6 @@ class CreateTransactionController
 {
 
     public function create(Request $request, CreateTransactionLogic $logic): JsonResponse {
-        return $logic->execute($request);
+        return $logic->logic($request);
     }
 }

app/Http/Controllers/Transactions/DeletePaymentProofDocumentController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\DeleteTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeletePaymentProofDocumentController
+{
+    public function delete(Request $request, DeleteTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Transactions/UpdatePaymentTransactionStatusController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\UpdatePaymentTransactionStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePaymentTransactionStatusController
+{
+    public function update(Request $request, UpdatePaymentTransactionStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/CreditWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\CreditWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreditWalletController
+{
+
+    public function credit(Request $request, CreditWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/DebitWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\DebitWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DebitWalletController
+{
+
+    public function debit(Request $request, DebitWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}