added segregation by year

app/Http/Controllers/Controller.php

@@ -70,13 +70,15 @@ class Controller extends BaseController
     protected function createFilters(Model $model, string ...$columns): void
     {
         foreach ($columns as $column) {
-            $uniqueValues =  DB::table(($model)->getTable())
-                ->select($column)
-                ->distinct()
-                ->whereNull('deleted_at')
-                ->get()
-                ->pluck($column)
-                ->toArray();
+//            $uniqueValues =  DB::table(($model)->getTable())
+//                ->select($column)
+//                ->distinct()
+//                ->whereNull('deleted_at')
+//                ->get()
+//                ->pluck($column)
+//                ->toArray();
+            $uniqueValues = $model::query()->distinct()->get($column)->pluck($column)->toArray();
+
             $result = [];
             foreach ($uniqueValues as $val){
                 if(str_ends_with($column, '_id')) {

app/Http/Controllers/ProductController.php

@@ -19,7 +19,7 @@ class ProductController extends Controller
         'id'        => 'products',
         'header'    => [
             'id'                        => 'ID',
-            'year'                      => 'Год',
+//            'year'                      => 'Год',
             'article'                   => 'Артикул',
             'nomenclature_number'       => 'Номер номенклатуры',
             'manufacturer'              => 'Производитель',
@@ -77,7 +77,6 @@ class ProductController extends Controller
     {
         // validate data
         $request->validate([
-            'year' => 'required|integer|min:2000|max:' . (int)date('Y', strtotime('next year')),
             'import_file' => 'file',
         ]);
 
@@ -86,7 +85,7 @@ class ProductController extends Controller
         Storage::disk('upload')->put($path, $request->file('import_file')->getContent());
 
         // dispatch job
-        ImportCatalog::dispatch($path, $request->year, $request->user()->id);
+        ImportCatalog::dispatch($path, year(), $request->user()->id);
         Log::info('ImportCatalog job created!');
         return redirect()->route('catalog.index')->with(['success' => 'Задача импорта успешно создана!']);
     }

app/Models/MafOrder.php

@@ -2,14 +2,31 @@
 
 namespace App\Models;
 
+use App\Models\Scopes\YearScope;
+use Illuminate\Database\Eloquent\Attributes\ScopedBy;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+#[ScopedBy([YearScope::class])]
 class MafOrder extends Model
 {
     use SoftDeletes;
+
+// set year attribute to current selected year
+    protected static function boot(): void
+    {
+        parent::boot();
+        static::creating(function($attributes) {
+            if(!isset($attributes->year)) {
+                $attributes->year = year();
+            }
+        });
+    }
+
     protected $fillable = [
+        'year',
         'order_number',
         'user_id',
         'product_id',
@@ -28,4 +45,5 @@ class MafOrder extends Model
     {
         return $this->belongsTo(Product::class);
     }
+
 }

app/Models/Order.php

@@ -5,6 +5,8 @@ namespace App\Models;
 use App\Helpers\Price;
 use App\Models\Dictionary\Area;
 use App\Models\Dictionary\District;
+use App\Models\Scopes\YearScope;
+use Illuminate\Database\Eloquent\Attributes\ScopedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -14,6 +16,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 
+#[ScopedBy([YearScope::class])]
 class Order extends Model
 {
     use SoftDeletes;
@@ -24,7 +27,19 @@ class Order extends Model
     const STATUS_READY_TO_HAND_OVER = 3;
     const STATUS_HANDED_OVER = 4;
 
+    // set year attribute to current selected year
+    protected static function boot(): void
+    {
+        parent::boot();
+        static::creating(function($attributes) {
+            if(!isset($attributes->year)) {
+                $attributes->year = year();
+            }
+        });
+    }
+
     protected $fillable = [
+        'year',
         'user_id',
         'district_id',
         'area_id',

app/Models/Product.php

@@ -35,6 +35,17 @@ class Product extends Model
         'note',
     ];
 
+    // set year attribute to current selected year
+    protected static function boot(): void
+    {
+        parent::boot();
+        static::creating(function($attributes) {
+            if(!isset($attributes->year)) {
+                $attributes->year = year();
+            }
+        });
+    }
+
     protected $appends = ['product_price', 'installation_price', 'total_price',
                           'product_price_txt', 'installation_price_txt', 'total_price_txt',];
     protected function productPrice(): Attribute

app/Models/ProductSKU.php

@@ -2,16 +2,20 @@
 
 namespace App\Models;
 
+use App\Models\Scopes\YearScope;
+use Illuminate\Database\Eloquent\Attributes\ScopedBy;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+#[ScopedBy([YearScope::class])]
 class ProductSKU extends Model
 {
     use SoftDeletes;
 
     const DEFAULT_SORT_BY = 'created_at';
     protected $fillable = [
+        'year',
         'product_id',
         'order_id',
         'maf_order_id',
@@ -27,6 +31,17 @@ class ProductSKU extends Model
     ];
     public $table = 'products_sku';
 
+    // set year attribute to current selected year
+    protected static function boot(): void
+    {
+        parent::boot();
+        static::creating(function($attributes) {
+            if(!isset($attributes->year)) {
+                $attributes->year = year();
+            }
+        });
+    }
+
     /**
      * @return BelongsTo
      */

app/Models/Scopes/YearScope.php

@@ -13,6 +13,6 @@ class YearScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->where('year', year());
+        $builder->where($model->getTable() . '.year', year());
     }
 }

database/migrations/2025_03_24_153700_create_orders_table.php

@@ -13,6 +13,7 @@ return new class extends Migration
     {
         Schema::create('orders', function (Blueprint $table) {
             $table->id();
+            $table->unsignedInteger('year');
             $table->foreignId('user_id')->constrained('users')->restrictOnDelete();                 // менеджер
             $table->foreignId('district_id')->constrained('districts')->restrictOnDelete();         // округ
             $table->foreignId('area_id')->constrained('areas')->restrictOnDelete();                 // район

database/migrations/2025_04_05_231749_create_maf_orders_table.php

@@ -13,6 +13,7 @@ return new class extends Migration
     {
         Schema::create('maf_orders', function (Blueprint $table) {
             $table->id();
+            $table->unsignedInteger('year');
             $table->string('order_number')->nullable();
             $table->foreignId('user_id')->constrained('users');
             $table->foreignId('product_id')->constrained('products');

database/migrations/2025_04_11_145335_create_products_sku_table.php

@@ -15,6 +15,7 @@ return new class extends Migration
     {
         Schema::create('products_sku', function (Blueprint $table) {
             $table->id();
+            $table->unsignedInteger('year');
             $table->foreignId('product_id')                             // id продукта
                 ->constrained('products')
                 ->restrictOnDelete();

resources/views/catalog/index.blade.php

@@ -42,7 +42,6 @@
                 <div class="modal-body">
                     <form action="{{ route('catalog.import') }}" method="post" enctype="multipart/form-data">
                         @csrf
-                        @include('partials.input', ['title' => 'Год', 'name' => 'year', 'type' => 'number', 'min' => 2000, 'max' => (int) date('Y') + 1, 'value' => date('Y')])
                         @include('partials.input', ['title' => 'XLSX файл', 'name' => 'import_file', 'type' => 'file'])
                         @include('partials.submit', ['name' => 'Импорт'])
                     </form>