Ver Fonte

fix edit and show order

Alexander Musikhin há 7 meses atrás
pai
commit
07590274a3

+ 0 - 1
app/Http/Controllers/OrderController.php

@@ -176,7 +176,6 @@ class OrderController extends Controller
             $mafOrder->decrement('in_stock');
             unset($mafOrder, $product_sku);
         }
-        $order->update(['order_status_id' => Order::STATUS_READY_TO_MOUNT]);
         return redirect()->route('order.show', $order);
     }
 

+ 31 - 7
app/Models/Order.php

@@ -19,13 +19,40 @@ use Illuminate\Support\Facades\DB;
 #[ScopedBy([YearScope::class])]
 class Order extends Model
 {
+
+
     use SoftDeletes;
     const DEFAULT_SORT_BY = 'created_at';
 
     const STATUS_NEW = 1;
-    const STATUS_READY_TO_MOUNT = 2;
-    const STATUS_READY_TO_HAND_OVER = 3;
-    const STATUS_HANDED_OVER = 4;
+    const STATUS_NOT_READY = 2;
+    const STATUS_READY_NO_MAF = 3;
+    const STATUS_READY_TO_MOUNT = 4;
+    const STATUS_IN_MOUNT = 5;
+    const STATUS_DUTY = 6;
+    const STATUS_READY_TO_HAND_OVER = 7;
+    const STATUS_NOT_HANDED_OVER_WITH_NOTES = 8;
+    const STATUS_HANDED_OVER_WITH_NOTES = 9;
+    const STATUS_HANDED_OVER = 10;
+
+    const STATUS_PROBLEM = 11;
+
+    //ПЛ не готова; ПЛ готова нет МАФ; Готов к монтажу; В монтаже; Долг;Готов к сдаче;Не сдан, замечания;Сдан с замечаниями;Сдан;Проблема
+
+    const STATUS_NAMES = [
+        self::STATUS_NEW => 'Новая',
+        self::STATUS_NOT_READY => 'Не готова',
+        self::STATUS_READY_NO_MAF => 'Готова, нет МАФ',
+        self::STATUS_READY_TO_MOUNT => 'Готова к монтажу',
+        self::STATUS_IN_MOUNT => 'В монтаже',
+        self::STATUS_DUTY => 'Долг',
+        self::STATUS_READY_TO_HAND_OVER => 'Готова к сдаче',
+        self::STATUS_NOT_HANDED_OVER_WITH_NOTES => 'Не сдана, замечания',
+        self::STATUS_HANDED_OVER_WITH_NOTES => 'Сдана с замечаниями',
+        self::STATUS_HANDED_OVER => 'Сдана',
+        self::STATUS_PROBLEM => 'Проблема',
+    ];
+
 
     // set year attribute to current selected year
     protected static function boot(): void
@@ -111,6 +138,7 @@ class Order extends Model
     {
         $needs = [];
         foreach ($this->products_sku as $sku) {
+            if($sku->maf_order) continue;
             $needs[$sku->product_id]['needs'] = (isset($needs[$sku->product_id])) ? $needs[$sku->product_id]['needs'] + 1 : 1;
         }
 
@@ -133,10 +161,6 @@ class Order extends Model
             }
         }
 
-        if($this->order_status_id > self::STATUS_NEW) {
-            $result = true;
-        }
-
        $this->update(['ready_to_mount' => ($result) ? 'Да' : 'Нет']);
     }
 

+ 3 - 4
database/seeders/OrderStatusSeeder.php

@@ -13,9 +13,8 @@ class OrderStatusSeeder extends Seeder
      */
     public function run(): void
     {
-        OrderStatus::query()->updateOrCreate(['id' => Order::STATUS_NEW], ['name' => 'Новый']);
-        OrderStatus::query()->updateOrCreate(['id' => Order::STATUS_READY_TO_MOUNT], ['name' => 'Готов к монтажу']);
-        OrderStatus::query()->updateOrCreate(['id' => Order::STATUS_READY_TO_HAND_OVER], ['name' => 'Готов к сдаче']);
-        OrderStatus::query()->updateOrCreate(['id' => Order::STATUS_HANDED_OVER], ['name' => 'Сдан']);
+        foreach (Order::STATUS_NAMES as $id => $name) {
+            OrderStatus::query()->updateOrCreate(['id' => $id], ['name' => $name]);
+        }
     }
 }

+ 1 - 1
resources/views/orders/show.blade.php

@@ -120,7 +120,7 @@
                         @csrf
                         <div id="select_maf_form">
                             <input type="text" class="form-control mb-2" placeholder="Поиск площадки" id="search_order">
-                            <select id="select_order" name="new_order_id" class="form-select mb-3" multiple required></select>
+                            <select id="select_order" name="new_order_id" class="form-select mb-3" size="30" multiple required></select>
                             <a href="#" class="btn btn-primary" id="moveMaf">Перенести</a>
                         </div>
                     </form>