Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -19,6 +19,7 @@ use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
 use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
 use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds;
+use App\Classes\Modules\Exports\Services\ExportsWhiteFormTransactions;
 
 class ExportCustomersToExcelController
 {
@@ -54,6 +55,13 @@ class ExportCustomersToExcelController
         return $response;
     }
 
+    public function whiteFormTransactions(Request $request){
+        $exportsTransactions = new ExportsWhiteFormTransactions($request);
+        $response = $exportsTransactions->download('white-form-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
     public function walletTransactions(Request $request){
         $exportsTransactions = new ExportsWalletTransactions($request);
         $response = $exportsTransactions->download('wallet-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);

app/Http/Controllers/Imports/ImportUpdateDebtorController.php

@@ -14,6 +14,7 @@ use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 use Maatwebsite\Excel\Excel as ExcelFileTypes;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Log;
 
 class ImportUpdateDebtorController
 {
@@ -26,16 +27,17 @@ class ImportUpdateDebtorController
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
         $file = json_decode($object->getFiles()[0])->file_info->original->file;
 
+        Log::info('ImportUpdateDebtorController file: ' . $file);
+
         $filesystemDriver = Storage::getDefaultDriver();
         if($filesystemDriver === 's3'){
-            $file = Storage::disk('s3')->path('documents/' . $file);
+            Excel::import(new ImportsDebtor(), $file, 's3');
+        }
+        else{
+            $file = 'documents/' . $file;
+            Excel::import(new ImportsDebtor(), $file);
         }
-        //Shipping Portal requires the following (NOT TESTED)
-        // else{
-        //     $file = 'documents/' . $file;
-        // }
 
-        Excel::import(new ImportsDebtor(), $file);
         return [];
     }
 }

app/Http/Controllers/Remarks/CreateRemarkController.php

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

app/Http/Controllers/Remarks/DeleteRemarkController.php

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

app/Http/Controllers/Remarks/FetchRemarkController.php

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

app/Http/Controllers/Remarks/ListRemarksController.php

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

app/Http/Controllers/Remarks/UpdateRemarkController.php

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

app/Http/Controllers/Transactions/ApproveBillGroupPaymentVerificationController.php

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

app/Http/Controllers/Transactions/CreateBillGroupPaymentProofDocumentController.php

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

app/Http/Controllers/Transactions/CreateBillGroupPaymentTransactionController.php

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

app/Http/Controllers/Transactions/CreateSupplierBillGroupController.php

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

app/Http/Controllers/Transactions/DeleteBillGroupController.php

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

app/Http/Controllers/Transactions/ListBillGroupsController.php

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\ListBillGroupsLogic;
+
+
+class ListBillGroupsController
+{
+    /**
+     * @param Request $request
+     * @param ListBillGroupsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListBillGroupsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Transactions/UpdateGroupTransferFeeController.php

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