Alexander Musikhin há 7 meses atrás
pai
commit
e8a25880e5

+ 3 - 3
app/Http/Controllers/ProductSKUController.php

@@ -8,17 +8,17 @@ use App\Models\ProductSKU;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
-// Склад - Заказы МАФ
+// Склад - МАФ
 class ProductSKUController extends Controller
 {
     protected array $data = [
         'active'    => 'product_sku',
-        'title'     => 'Заказы МАФ',
+        'title'     => 'МАФ',
         'id'        => 'product_sku',
         'header'    => [
             'id'                                => 'ID',
 
-            'order-id'                          => 'ID площадки',
+            'order-common_name'                 => 'Площадка',
 
             'status'                            => 'Статус',
             'rfid'                              => 'RFID',

+ 9 - 0
app/Models/Order.php

@@ -41,6 +41,8 @@ class Order extends Model
         'ready_to_mount',
     ];
 
+    public $appends = ['common_name'];
+
     public function products_sku(): HasMany
     {
         return $this->hasMany(ProductSKU::class, 'order_id', 'id');
@@ -119,5 +121,12 @@ class Order extends Model
 
        $this->update(['ready_to_mount' => ($result) ? 'Да' : 'Нет']);
     }
+
+    public function commonName(): Attribute
+    {
+        return Attribute::make(
+            get: fn($value) => (string) $this->district->shortname . ', ' . $this->area->name . ', ' . $this->object_address,
+        );
+    }
 }
 

+ 1 - 0
resources/views/layouts/menu.blade.php

@@ -1,4 +1,5 @@
 <li class="nav-item"><a class="nav-link" href="{{ route('order.index') }}">Площадки</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ route('product_sku.index') }}">МАФ</a></li>
 <li class="nav-item"><a class="nav-link" href="{{ route('maf_order.index') }}">Заказы МАФ</a></li>
 
 <li class="nav-item"><a class="nav-link" href="{{ route('catalog.index') }}">Каталог</a></li>

+ 1 - 1
resources/views/products_sku/index.blade.php

@@ -28,7 +28,7 @@
         </div>
     </div>
 
-    <!-- Модальное окно добавления-->
+    <!-- Модальное окно редактирования -->
     <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">

+ 1 - 1
routes/web.php

@@ -60,7 +60,7 @@ Route::middleware('auth:web')->group(function () {
     Route::get('order/{order}/get-maf', [OrderController::class, 'getMafToOrder'])->name('order.get-maf');
     Route::get('order/destroy', [OrderController::class, 'destroy'])->name('order.destroy');
 
-    // Склад
+    // Склад (МАФ)
     Route::get('product_sku', [ProductSKUController::class, 'index'])->name('product_sku.index');
     Route::get('product_sku/{product_sku}', [ProductSKUController::class, 'show'])->name('product_sku.show');
     Route::post('product_sku/store', [ProductSKUController::class, 'store'])->name('product_sku.store');