|
|
@@ -13,6 +13,7 @@ use App\Models\MafOrder;
|
|
|
use App\Models\ObjectType;
|
|
|
use App\Models\Order;
|
|
|
use App\Models\OrderStatus;
|
|
|
+use App\Models\OrderView;
|
|
|
use App\Models\ProductSKU;
|
|
|
use App\Models\Role;
|
|
|
use App\Models\User;
|
|
|
@@ -30,16 +31,16 @@ class OrderController extends Controller
|
|
|
'header' => [
|
|
|
'id' => 'ID',
|
|
|
'name' => 'Название',
|
|
|
- 'user_id' => 'Менеджер',
|
|
|
- 'district_id' => 'Округ',
|
|
|
- 'area_id' => 'Район',
|
|
|
+ 'user_name' => 'Менеджер',
|
|
|
+ 'district_name' => 'Округ',
|
|
|
+ 'area_name' => 'Район',
|
|
|
'object_address' => 'Адрес объекта',
|
|
|
- 'object_type_id' => 'Тип объекта',
|
|
|
+ 'object_type_name' => 'Тип объекта',
|
|
|
'comment' => 'Комментарий',
|
|
|
'installation_date' => 'Дата выхода на монтаж',
|
|
|
'ready_date' => 'Дата готовности площадки',
|
|
|
- 'brigadier_id' => 'Бригадир',
|
|
|
- 'order_status_id' => 'Статус',
|
|
|
+ 'brigadier_name' => 'Бригадир',
|
|
|
+ 'order_status_name' => 'Статус',
|
|
|
'tg_group_name' => 'Имя группы в ТГ',
|
|
|
'tg_group_link' => 'Ссылка на группу в ТГ',
|
|
|
'products_with_count' => 'МАФы',
|
|
|
@@ -71,9 +72,9 @@ class OrderController extends Controller
|
|
|
public function index(Request $request)
|
|
|
{
|
|
|
session(['gp_orders' => $request->all()]);
|
|
|
- $model = new Order;
|
|
|
+ $model = new OrderView;
|
|
|
// fill filters
|
|
|
- $this->createFilters($model, 'user_id', 'district_id', 'area_id', 'object_type_id', 'brigadier_id', 'order_status_id', 'ready_to_mount');
|
|
|
+ $this->createFilters($model, 'user_name', 'district_name', 'area_name', 'object_type_name', 'brigadier_name', 'order_status_name', 'ready_to_mount');
|
|
|
$this->createDateFilters($model, 'installation_date', 'ready_date');
|
|
|
$this->data['ranges'] = [];
|
|
|
|
|
|
@@ -87,7 +88,7 @@ class OrderController extends Controller
|
|
|
$this->data['orders'] = $q->paginate(session('per_page', config('pagination.per_page')))->withQueryString();
|
|
|
|
|
|
foreach ($this->data['orders'] as $order) {
|
|
|
- $order->recalculateReadyToMount();
|
|
|
+ Order::where('id', $order->id)->first()->recalculateReadyToMount();
|
|
|
}
|
|
|
|
|
|
return view('orders.index', $this->data);
|