large commit

app/Classes/ControllersLogic/Orders/CreateOrder.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\ControllersLogic\Orders;
-
-
-use App\Classes\Constants;
-use App\Classes\Modules\Orders\Steps\GenerateOrderSteps;
-use App\Classes\Modules\Steps\ModularStep;
-use App\Models\Order;
-use Illuminate\Http\Request;
-
-class CreateOrder
-{
-    public function execute(String $companyId, Request $request){
-        $order = new Order;
-
-        $order->company_id = $companyId;
-        $order->warehouse_id = $request->input('warehouse_id');
-        $order->marking = $request->input('marking');
-        $order->current_step = Constants::ORDER_PROCESSING_STEP;
-
-        if($order->save()){
-            // Generate Order Steps
-            $modularStep = new ModularStep();
-            $orderSteps = (new GenerateOrderSteps([$modularStep->warehouseModule($order->warehouse_id !== null)]))->getSteps()->toArray();
-            $order->orderSteps()->createMany($orderSteps);
-
-            // confirm order
-            return (new UpdateOrderStep())->execute($order->id, $request);
-
-        }
-
-        return false;
-    }
-
-}

app/Classes/ControllersLogic/Orders/UpdateOrderStep.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Classes\ControllersLogic\Orders;
-
-
-use App\Classes\Modules\Orders\Steps\OrderStepUpdate;
-use Illuminate\Http\Request;
-
-class UpdateOrderStep
-{
-    public function execute(String $orderId, Request $request){
-        return (new OrderStepUpdate($orderId))->execute($request);
-    }
-
-}

app/Classes/Modules/ControllersLogic/Companies/ListCompanyLogic.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 29/04/2019
- * Time: 11:44 AM
- */
 
 namespace App\Classes\Modules\ControllersLogic\Companies;
 

app/Classes/Modules/ControllersLogic/Orders/PackingList/UpdatePackingListLogic.php

@@ -44,6 +44,7 @@ class UpdatePackingListLogic
             $packingListObject = new PackingListObject($request->input('reference_no'), $request->input('packages'));
 
             $confirmed = $this->checkPackingListIsComplete($packingListObject->getPackages());
+            dd($confirmed);
 
             $this->updatesPackingList->execute($orderObject, $packingListObject, $confirmed);
 

app/Http/Controllers/Companies/ListCompanyController.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 29/04/2019
- * Time: 11:43 AM
- */
 
 namespace App\Http\Controllers\Companies;
 

app/Http/Controllers/Orders/OrderController.php

@@ -32,37 +32,6 @@ class OrderController extends Controller
         return OrderResource::collection($orders);
     }
 
-    public function updatePackingList(String $orderId, Request $request){
-        dd($request->input('packages'));
-        $packingList = PackingList::updateOrCreate(['order_id' => $orderId],['reference_no' => $request->input('reference_no')]);
-        $confirmed = true;
-        $packages = [];
-
-        foreach ($request->input('packages') as $package) {
-            if(trim($package['description']) !== '' || $package['description'] !== null){
-                $packages[] = $package;
-                if($package['width'] == 0 || $package['length'] == 0 || $package['height'] == 0){
-
-                    $confirmed = false;
-                }
-            }
-        }
-
-        if(empty($packages)){
-            $confirmed = false;
-        }
-
-        $packingList->packages()->delete();
-        $packingList->packages()->createMany($packages);
-
-        $packingList->confirmed = $confirmed;
-
-        if($packingList->save()){
-
-        }
-        return 408;
-    }
-
     public function orderShippingArrangement(String $orderId, Request $request){
         $shippingArrangement = ShippingArrangement::updateOrCreate(['order_id' => $orderId],['container_no' => $request->input('container_no'), 'seal_no' => $request->input('seal_no')]);
         $shippingArrangement->shippingSchedule()->delete();

app/Traits/ChecksIfPackingListIsComplete.php

@@ -12,7 +12,7 @@ trait ChecksIfPackingListIsComplete
         }
 
         foreach ($packages as $package) {
-            if($package['width'] == 0 || $package['length'] == 0 || $package['height'] == 0){
+            if($package['width'] == 0 || $package['length'] == 0 || $package['height'] == 0 || $package['description'] == ''){
                 return false;
             }
         }

routes/api.php

@@ -32,7 +32,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
     Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Companies'], function () {
 
         // List companies
-        Route::get('/list/{pagination?}', 'CompanyController@index')->name('list');
+        Route::get('/list/{pagination?}', 'ListCompanyController@list')->name('list');
 
         // search companies
         Route::get('/search', 'SearchCompanyController@search')->name('search');