|
|
@@ -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();
|