Merge branch 'dillon/41-voucherify-phase-2b' into development

app/Http/Controllers/Companies/ListBusinessTypesController.php

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

app/Http/Controllers/Companies/ListCompanyTypesController.php

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

app/Http/Controllers/Companies/UpdateCompanyProfileController.php

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

app/Http/Controllers/Imports/ImportHoneyTrapController.php

@@ -34,12 +34,20 @@ class ImportHoneyTrapController
         $excelRows = $excelRows->toArray();
 
         $returnArray    = [];
-        $segment_name   = 'honey trap campaign';
-        $segment        = Segment::where('name', $segment_name)->first();
+        // $segment_name   = 'honey trap campaign';
+        // $segment        = Segment::where('name', $segment_name)->first();
+        $input_segment_id     = $request->input('segment_id');
+        if (!$input_segment_id) {
+            $row['status']    = 'Failed';
+            $row['message']   = 'segment_id cannot be empty';
+            $returnArray[]    = $row;
+            return response()->json($returnArray);
+        }
 
+        $segment        = Segment::where('id', $input_segment_id)->first();
         if (!$segment) {
             $row['status']    = 'Failed';
-            $row['message']   = '"' . $segment_name . '"' . ' not found';
+            $row['message']   = 'Segment not found';
             $returnArray[]    = $row;
             return response()->json($returnArray);
         }