diff --git a/app/Classes/ControllersLogic/Orders/CreateOrder.php b/app/Classes/ControllersLogic/Orders/CreateOrder.php deleted file mode 100644 index 73854ee..0000000 --- a/app/Classes/ControllersLogic/Orders/CreateOrder.php +++ /dev/null @@ -1,36 +0,0 @@ -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; - } - -} \ No newline at end of file diff --git a/app/Classes/ControllersLogic/Orders/UpdateOrderStep.php b/app/Classes/ControllersLogic/Orders/UpdateOrderStep.php deleted file mode 100644 index aae4144..0000000 --- a/app/Classes/ControllersLogic/Orders/UpdateOrderStep.php +++ /dev/null @@ -1,15 +0,0 @@ -execute($request); - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/ControllersLogic/Companies/ListCompanyLogic.php b/app/Classes/Modules/ControllersLogic/Companies/ListCompanyLogic.php index 5ad0432..51115f0 100644 --- a/app/Classes/Modules/ControllersLogic/Companies/ListCompanyLogic.php +++ b/app/Classes/Modules/ControllersLogic/Companies/ListCompanyLogic.php @@ -1,10 +1,4 @@ input('reference_no'), $request->input('packages')); $confirmed = $this->checkPackingListIsComplete($packingListObject->getPackages()); + dd($confirmed); $this->updatesPackingList->execute($orderObject, $packingListObject, $confirmed); diff --git a/app/Http/Controllers/Companies/CompanyController.php b/app/Http/Controllers/Companies/CompanyController.php deleted file mode 100644 index e69de29..0000000 diff --git a/app/Http/Controllers/Companies/ListCompanyController.php b/app/Http/Controllers/Companies/ListCompanyController.php index 20620c8..f8b5e6c 100644 --- a/app/Http/Controllers/Companies/ListCompanyController.php +++ b/app/Http/Controllers/Companies/ListCompanyController.php @@ -1,10 +1,4 @@ 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(); diff --git a/app/Traits/ChecksIfPackingListIsComplete.php b/app/Traits/ChecksIfPackingListIsComplete.php index 0b2ac55..7c33f47 100644 --- a/app/Traits/ChecksIfPackingListIsComplete.php +++ b/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; } } diff --git a/routes/api.php b/routes/api.php index 701e8ec..b17edc2 100644 --- a/routes/api.php +++ b/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');