diff --git a/app/Http/Requests/Admin/PermissionManagement/StoreRequest.php b/app/Http/Requests/Admin/PermissionManagement/StoreRequest.php index 25c9c1a..e3dab74 100644 --- a/app/Http/Requests/Admin/PermissionManagement/StoreRequest.php +++ b/app/Http/Requests/Admin/PermissionManagement/StoreRequest.php @@ -23,7 +23,7 @@ class StoreRequest extends FormRequest { return [ 'name' => 'required|unique:permissions,name|string|max:255', - 'name_fa' => 'required|unique:permissions,name|string|max:255', + 'name_fa' => 'required|unique:permissions,name_fa|string|max:255', ]; } } diff --git a/app/Models/CallHistory.php b/app/Models/CallHistory.php index 4f5f01e..4633580 100644 --- a/app/Models/CallHistory.php +++ b/app/Models/CallHistory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model; class CallHistory extends Model { - /** @use HasFactory<\Database\Factories\CallHistoryFactory> */ use HasFactory; protected $guarded = ['id']; @@ -15,7 +14,7 @@ class CallHistory extends Model { $event = Event::query()->where('id', $event_id)->first(); - self::create([ + self::query()->create([ 'call_id' => $call->id, 'telephone_id' => $call->telephone_id, 'caller_phone_number' => $call->caller_phone_number, diff --git a/app/Models/Category.php b/app/Models/Category.php index b57bcab..159bad8 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Category extends Model { - /** @use HasFactory<\Database\Factories\CategoryFactory> */ use HasFactory; protected $guarded = ['id']; } diff --git a/app/Models/City.php b/app/Models/City.php index 3f3ec29..05fc89f 100644 --- a/app/Models/City.php +++ b/app/Models/City.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class City extends Model { - /** @use HasFactory<\Database\Factories\CityFactory> */ use HasFactory; + protected $guarded = []; } diff --git a/app/Models/Event.php b/app/Models/Event.php index 9dce7e8..e687502 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Event extends Model { - /** @use HasFactory<\Database\Factories\EventFactory> */ use HasFactory; + protected $guarded = []; } diff --git a/app/Models/Permission.php b/app/Models/Permission.php index e559c90..87455f1 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -9,4 +9,5 @@ use Spatie\Permission\Models\Permission as SpatiePermission; class Permission extends SpatiePermission { use HasFactory; + protected $guarded = []; } diff --git a/app/Models/Province.php b/app/Models/Province.php index 115498c..9ae60b9 100644 --- a/app/Models/Province.php +++ b/app/Models/Province.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Province extends Model { - /** @use HasFactory<\Database\Factories\ProvinceFactory> */ use HasFactory; + protected $guarded = []; } diff --git a/app/Models/Role.php b/app/Models/Role.php index a129360..1371e16 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -9,4 +9,5 @@ use Spatie\Permission\Models\Role as SpatieRole; class Role extends SpatieRole { use HasFactory; + protected $guarded = []; } diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index c726755..d56d29b 100644 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -8,4 +8,6 @@ return [ 'notification_server_is_down' => 'Notification Server Is Down', 'the_operator_is_offline' => 'The Operator Is Offline', 'operator_could_not_connect' => 'Operator Could Not Connect', + 'combination_of_category_and_subcategory_does_not_exist' => 'Combination of Category and Subcategory Does Not Exist', + 'telephone_id_is_in_use' => 'Telephone ID Is In Use', ]; diff --git a/resources/lang/fa/messages.php b/resources/lang/fa/messages.php index 6cdc4a1..c45de66 100644 --- a/resources/lang/fa/messages.php +++ b/resources/lang/fa/messages.php @@ -9,4 +9,5 @@ return [ 'the_operator_is_offline' => 'اپراتور آفلاین است.', 'operator_could_not_connect' => 'عدم اتصال اپراتور', 'combination_of_category_and_subcategory_does_not_exist' => 'ترکیب موضوع و زیر موضوع نا معتبر می باشد', + 'telephone_id_is_in_use' => 'این تلفن درحال استفاده است', ]; diff --git a/routes/web.php b/routes/web.php index 3c21171..1726c4b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,7 +25,7 @@ Route::prefix('server')->group(function () { ->group(function () { Route::get('/info', 'info')->name('info'); Route::post('/change_password', 'changePassword')->name('changePassword'); - Route::post('/permissions', 'permissions')->name('permissions'); + Route::get('/permissions', 'permissions')->name('permissions'); }); Route::prefix('users') @@ -53,7 +53,7 @@ Route::prefix('server')->group(function () { ->middleware('auth:sanctum') ->controller(CategoryController::class) ->group(function () { - Route::get('/categories', 'list'); + Route::get('/list', 'list'); }); Route::middleware('auth:sanctum')