view fixed

app/Http/Controllers/Controller.php

@@ -73,7 +73,9 @@ class Controller extends BaseController
 
             $uniqueValues = $model::query()->distinct()->get($column)->pluck($column)->toArray();
             foreach ($uniqueValues as $k => $v) {
-                if(!$v) unset($uniqueValues[$k]);
+                if(!$v) {
+                    unset($uniqueValues[$k]);
+                }
             }
             $result = [];
             foreach ($uniqueValues as $val){

app/Models/Order.php

@@ -149,22 +149,29 @@ class Order extends Model
 
     public function productsWithCount(): Attribute
     {
-        $products = $this->products;
+        $products = $this->products_sku;
         $ret = [];
 
         foreach ($products as $product) {
-            if(isset($ret[$product->id])) {
-                $ret[$product->id]['count'] += 1;
+            if(isset($ret[$product->product->id])) {
+                $ret[$product->product->id]['count'] += 1;
             } else {
-                $ret[$product->id] = [
-                    'name' => $product->common_name,
+                $ret[$product->product->id] = [
+                    'name' => $product->product->article,
                     'count' => 1,
                 ];
             }
+            if($product->maf_order?->order_number) {
+
+                $ret[$product->product->id]['order_numbers'][] = $product->maf_order?->order_number;
+            }
         }
         $s = '';
+
         foreach ($ret as $product) {
-            $s .= $product['name'] . ' (' . $product['count'] . ')<br>';
+            ;
+            $order_numbers = (isset($product['order_numbers'])) ? ' (' . implode(', ', array_unique($product['order_numbers'])) . ')' : '';
+            $s .= '<div>' . $product['name'] . ' - ' . $product['count'] . $order_numbers . '</div>';
         }
 
         return Attribute::make(

resources/views/orders/show.blade.php

@@ -54,6 +54,7 @@
                             <tr>
                                 <th>№</th>
                                 <th>МАФ</th>
+                                <th>Тип</th>
                                 <th>Статус</th>
                                 <th>Номер заказа МАФ</th>
                                 <th>RFID</th>
@@ -70,7 +71,8 @@
                             @foreach($order->products_sku as $p)
                                 <tr>
                                     <td>{{ $loop->iteration }}</td>
-                                    <td>{!! $p->product->common_name !!}</td>
+                                    <td>{!! $p->product->article !!}</td>
+                                    <td>{!! $p->product->nomenclature_number !!}</td>
                                     <td>{{ $p->status }}</td>
                                     <td>{{ $p->maf_order?->order_number }}</td>
                                     <td>{{ $p->rfid }}</td>