Jelajahi Sumber

contracts: CRUD, removed contract fields from order

Alexander Musikhin 7 bulan lalu
induk
melakukan
e907511882

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

@@ -9,7 +9,6 @@ use App\Models\MafOrder;
 use App\Models\ObjectType;
 use App\Models\Order;
 use App\Models\OrderStatus;
-use App\Models\Product;
 use App\Models\ProductSKU;
 use App\Models\Role;
 use App\Models\User;
@@ -29,8 +28,6 @@ class OrderController extends Controller
             'area_id'                   => 'Район',
             'object_address'            => 'Адрес объекта',
             'object_type_id'            => 'Тип объекта',
-            'contract_date'             => 'Дата договора',
-            'contract_number'           => 'Номер договора',
             'comment'                   => 'Комментарий',
             'installation_date'         => 'Дата выхода на монтаж',
             'ready_date'                => 'Дата готовности площадки',
@@ -46,7 +43,6 @@ class OrderController extends Controller
             'object_address',
             'tg_group_name',
             'tg_group_link',
-            'contract_number',
         ],
     ];
 
@@ -69,7 +65,7 @@ class OrderController extends Controller
         $model = new Order;
         // fill filters
         $this->createFilters($model, 'user_id', 'district_id', 'area_id', 'object_type_id', 'brigadier_id', 'order_status_id', 'ready_to_mount');
-        $this->createDateFilters($model, 'contract_date', 'installation_date', 'ready_date');
+        $this->createDateFilters($model, 'installation_date', 'ready_date');
         $this->data['ranges'] = [];
 
         $q = $model::query();

+ 0 - 2
app/Http/Requests/Order/StoreOrderRequest.php

@@ -28,8 +28,6 @@ class StoreOrderRequest extends FormRequest
             'area_id'           => 'required|exists:areas,id',
             'object_address'    => 'required|string|min:5',
             'object_type_id'    => 'required|exists:object_types,id',
-            'contract_date'     => 'nullable|date',
-            'contract_number'   => 'nullable|string',
             'comment'           => 'nullable|string',
             'installation_date' => 'nullable|date',
             'ready_date'        => 'nullable|date',

+ 0 - 2
app/Models/Order.php

@@ -73,8 +73,6 @@ class Order extends Model
         'area_id',
         'object_address',
         'object_type_id',
-        'contract_date',
-        'contract_number',
         'comment',
         'installation_date',
         'ready_date',

+ 29 - 0
database/migrations/2025_04_23_131244_remove_fields_from_orders_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            $table->dropColumn(['contract_number', 'contract_date']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            $table->date('contract_date')->nullable()->after('object_type_id');
+            $table->string('contract_number')->nullable()->after('contract_date');
+        });
+    }
+};

+ 0 - 4
resources/views/orders/edit.blade.php

@@ -24,10 +24,6 @@
 
                 @include('partials.select', ['name' => 'object_type_id', 'title' => 'Тип объекта', 'options' => $objectTypes, 'value' => $order->object_type_id ?? old('object_type_id'), 'required' => true, 'first_empty' => true])
 
-                @include('partials.input', ['name' => 'contract_date', 'title' => 'Дата договора', 'type' => 'date', 'value' => $order->contract_date ?? old('contract_date')])
-
-                @include('partials.input', ['name' => 'contract_number', 'title' => 'Номер договора', 'value' => $order->contract_number ?? old('contract_number')])
-
                 @include('partials.textarea', ['name' => 'comment', 'title' => 'Комментарий', 'value' => $order->comment ?? old('comment')])
 
                 @include('partials.input', ['name' => 'installation_date', 'title' => 'Дата выхода на монтаж', 'type' => 'date', 'value' => $order->installation_date ?? old('installation_date')])

+ 0 - 2
resources/views/orders/show.blade.php

@@ -29,8 +29,6 @@
 
                 <div>Тип объекта: {{ $order->objectType->name }}</div>
                 <div>Статус объекта: {{ $order->orderStatus->name }}</div>
-                <div>Дата договора: {{ $order->contract_date }}</div>
-                <div>Номер договора: {{ $order->contract_тumber }}</div>
                 <div>Комментарий: {{ $order->comment }}</div>
                 <div>Дата выхода на монтаж: {{ $order->installation_date }}</div>
                 <div>Дата готовности площадки: {{ $order->ready_date }}</div>