Bugfix/company deletable which has user v12

lang/en.json

@@ -100,6 +100,7 @@
 
     "Terms of Service": "Terms of Service",
     "Thank you for your support!": "Thank you for your support!",
+    "This company has registered users and cannot be deleted.": "This company has registered users and cannot be deleted.",
     "This password reset link will expire in :count minutes.": "This password reset link will expire in :count minutes.",
     "This verification link will expire in :count minutes.": "This verification link will expire in :count minutes.",
     "Total": "Total",

lang/tr.json

@@ -99,6 +99,7 @@
 
     "Terms of Service": "Hizmet Şartları",
     "Thank you for your support!": "Desteğiniz için teşekkür ederiz!",
+    "This company has registered users and cannot be deleted.": "Bu şirkete kayıtlı kullanıcılar olduğu için bu şirket silinemez.",
     "This password reset link will expire in :count minutes.": "Bu şifre oluşturma linki :count dakika içerisinde sonlanacak.",
     "This verification link will expire in :count minutes.": "Bu doğrulama linki :count dakika içerisinde sonlanacak.",
     "Total": "Toplam",

modules/SystemUser/Http/Requests/CompanyRequest.php

@@ -45,6 +45,22 @@ public function rulesForUpdate()
         ];
     }
 
+    public function rulesForDelete()
+    {
+        return [
+            'id' => [
+                'required',
+                function ($attribute, $value, $fail) {
+                    $company = $this->model()->find($value);
+
+                    if ($company && $company->users()->exists()) {
+                        $fail(__('This company has registered users and cannot be deleted.'));
+                    }
+                },
+            ],
+        ];
+    }
+
     public function messages()
     {
         return [

src/Http/Controllers/BaseController.php

@@ -388,6 +388,8 @@ public function update($id, $submoduleId = null)
      */
     public function destroy($id, $submoduleId = null)
     {
+        $this->getFormRequestClass();
+
         $params = $this->request->route()->parameters();
 
         $id = last($params);

src/Http/Requests/Request.php

@@ -3,11 +3,14 @@
 namespace Unusualify\Modularous\Http\Requests;
 
 use Closure;
+use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+use Unusualify\Modularity\Services\MessageStage;
 use Unusualify\Modularous\Traits\ManageTraits;
 
 abstract class Request extends FormRequest
@@ -45,12 +48,48 @@ public function rules()
             case 'PUT':
                 return $this->mergeRules(array_merge($this->rulesForAll(), $this->rulesForUpdate()));
 
+            case 'DELETE':
+                return $this->rulesForDelete();
+
             default:break;
         }
 
         return [];
     }
 
+    public function rulesForDelete()
+    {
+        return [];
+    }
+
+    protected function prepareForValidation()
+    {
+        if ($this->method() === 'DELETE' && $this->route()) {
+            $parameters = $this->route()->parameters();
+
+            if (! empty($parameters) && ! $this->has('id')) {
+                $this->merge(['id' => last($parameters)]);
+            }
+        }
+    }
+
+
+    protected function failedValidation(Validator $validator)
+    {
+        if ($this->method() === 'DELETE') {
+            $response = response()->json([
+                'message' => $validator->errors()->first(),
+                'errors' => $validator->errors(),
+                'variant' => MessageStage::ERROR->value,
+            ], 422);
+
+            throw new ValidationException($validator, $response);
+        }
+
+        parent::failedValidation($validator);
+    }
+
+
     public function mergeRules($rules)
     {
         $locales = getLocales();

vue/src/js/hooks/useTable.js

@@ -847,7 +847,11 @@ export default function useTable (props, context) {
       }
 
       let successCallback = (res) => {
-        if(res.status === 200) {
+        if (res.status === 422) {
+          if (runAlert && res.data?.message) {
+            store.dispatch(ACTIONS.SHOW_ALERT, res.data)
+          }
+        } else if (res.status === 200) {
 
           if(runAlert && res.data.variant && res.data.message){
             store.dispatch(ACTIONS.SHOW_ALERT, res.data)

vue/src/js/store/api/datatable.js

@@ -53,7 +53,10 @@ export default {
     // const url = window[import.meta.env.VUE_APP_NAME].ENDPOINTS.destroy.replace(':id', id)
     // var url = window[import.meta.env.VUE_APP_NAME].ENDPOINTS.index.replace(':id', item.id);
     url = url.replace(':id', id)
-    axios.delete(url).then(function (resp) {
+    console.log(url)
+    axios.delete(url, {
+      validateStatus: status => (status >= 200 && status < 300) || status === 422
+    }).then(function (resp) {
       if (callback && typeof callback === 'function') callback(resp)
     }, function (resp) {
       const error = {
@@ -68,7 +71,9 @@ export default {
   forceDelete (url, id, callback, errorCallback) {
     // const url = window[import.meta.env.VUE_APP_NAME].ENDPOINTS.forceDelete
     url = url.replace(':id', id)
-    axios.put(url, { id }).then(function (resp) {
+    axios.put(url, { id }, {
+      validateStatus: status => (status >= 200 && status < 300) || status === 422
+    }).then(function (resp) {
       if (callback && typeof callback === 'function') callback(resp)
     }, function (resp) {
       const error = {
@@ -83,7 +88,9 @@ export default {
   restore (url, id, callback) {
     // const url = window[import.meta.env.VUE_APP_NAME].ENDPOINTS.restore
     url = url.replace(':id', id)
-    axios.put(url, { id }).then(function (resp) {
+    axios.put(url, { id }, {
+      validateStatus: status => (status >= 200 && status < 300) || status === 422
+    }).then(function (resp) {
       if (callback && typeof callback === 'function') callback(resp)
     }, function (resp) {
       const error = {
@@ -121,7 +128,6 @@ export default {
       if (errorCallback && typeof errorCallback === 'function') errorCallback(error)
     })
   },
-
   bulkPublish (url, params, callback) {
     // const url = window[import.meta.env.VUE_APP_NAME].CMS_URLS.bulkPublish
     axios.post(url, { ids: params.ids, publish: params.toPublish }).then(function (resp) {