tests passing, needs some manual testing
This commit is contained in:
@@ -12,6 +12,7 @@ use App\Exceptions\ItemStillHasConsumables;
|
||||
use App\Exceptions\ItemStillHasLicenses;
|
||||
use App\Models\Manufacturer;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\MessageBag;
|
||||
|
||||
class BulkManufacturersController extends Controller
|
||||
{
|
||||
@@ -19,7 +20,7 @@ class BulkManufacturersController extends Controller
|
||||
{
|
||||
$this->authorize('delete', Manufacturer::class);
|
||||
|
||||
$errors = [];
|
||||
$errors = new MessageBag();
|
||||
foreach ($request->ids as $id) {
|
||||
$manufacturer = Manufacturer::find($id);
|
||||
if (is_null($manufacturer)) {
|
||||
@@ -29,18 +30,18 @@ class BulkManufacturersController extends Controller
|
||||
try {
|
||||
DeleteManufacturerAction::run(manufacturer: $manufacturer);
|
||||
} catch (ItemStillHasAssets $e) {
|
||||
$errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_assets', ['manufacturer_name' => $manufacturer->name]);
|
||||
$errors->add('error', trans('admin/manufacturers/message.delete.bulk_assoc_assets', ['manufacturer_name' => $manufacturer->name]));
|
||||
} catch (ItemStillHasAccessories $e) {
|
||||
$errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_accessories', ['manufacturer_name' => $manufacturer->name]);
|
||||
$errors->add('error', trans('admin/manufacturers/message.delete.bulk_assoc_accessories', ['manufacturer_name' => $manufacturer->name]));
|
||||
} catch (ItemStillHasConsumables $e) {
|
||||
$errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_consumables', ['manufacturer_name' => $manufacturer->name]);
|
||||
$errors->add('error', trans('admin/manufacturers/message.delete.bulk_assoc_consumables', ['manufacturer_name' => $manufacturer->name]));
|
||||
} catch (ItemStillHasComponents $e) {
|
||||
$errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_components', ['manufacturer_name' => $manufacturer->name]);;
|
||||
$errors->add('error', trans('admin/manufacturers/message.delete.bulk_assoc_components', ['manufacturer_name' => $manufacturer->name]));
|
||||
} catch (ItemStillHasLicenses $e) {
|
||||
$errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_licenses', ['manufacturer_name' => $manufacturer->name]);;
|
||||
$errors->add('error', trans('admin/manufacturers/message.delete.bulk_assoc_licenses', ['manufacturer_name' => $manufacturer->name]));
|
||||
} catch (\Exception $e) {
|
||||
report($e);
|
||||
$errors[] = trans('general.something_went_wrong');
|
||||
$errors->add('error', trans('general.something_went_wrong'));
|
||||
}
|
||||
}
|
||||
if (count($errors) > 0) {
|
||||
|
||||
Reference in New Issue
Block a user