Front fixes

.env.example

@@ -47,3 +47,5 @@ JWT_SECRET=c05c4346dc03362dabbf94c18a1befe78e9b301837f3163e43a57201d9cc09cb
 
 # Default pagination limit
 PAGINATION_LIMIT=2000
+
+WORDS_IN_TABLE_CELL_LIMIT=15

app/Http/Controllers/OrderController.php

@@ -88,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::where('id', $order->id)->first()->recalculateReadyToMount();
+            Order::where('id', $order->id)->first()?->recalculateReadyToMount();
         }
 
         return view('orders.index', $this->data);

config/app.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-
+    'words_in_table_cell_limit' => env('WORDS_IN_TABLE_CELL_LIMIT', 7),
     /*
     |--------------------------------------------------------------------------
     | Application Name

resources/views/catalog/index.blade.php

@@ -3,17 +3,17 @@
 @section('content')
 
     <div class="row mb-3">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Каталог</h3>
         </div>
-        <div class="col-6 text-end">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#importModal">
+        <div class="col-md-6 text-end">
+            <button type="button" class="btn btn-sm mb-1 btn-primary" data-bs-toggle="modal" data-bs-target="#importModal">
                 Импорт
             </button>
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exportModal">
+            <button type="button" class="btn btn-sm mb-1 btn-primary" data-bs-toggle="modal" data-bs-target="#exportModal">
                 Экспорт
             </button>
-            <a href="{{ route('catalog.create') }}" class="btn btn-primary">Добавить</a>
+            <a href="{{ route('catalog.create') }}" class="btn btn-sm mb-1 btn-primary">Добавить</a>
 
         </div>
     </div>

resources/views/maf_orders/edit.blade.php

@@ -3,7 +3,7 @@
 @section('content')
 
     <div class="px-3 row">
-        <div class="col-xl-6">
+        <div class="col-xl-6 mb-3 mb-xl-0">
             <form class="row" action="{{ route('maf_order.update', $maf_order) }}" method="post">
                 <div class="">
                     <h4>Заказ МАФ</h4>
@@ -20,7 +20,7 @@
                     @if($maf_order->products_sku->count())
                         <div class="row">
                             <div class="buttons offset-md-4 col-md-8 ">
-                                <a href="{{ url()->previous() }}" class="btn btn-primary">Назад</a>
+                                <a href="{{ url()->previous() }}" class="btn btn-sm btn-primary">Назад</a>
                             </div>
                         </div>
                     @else
@@ -28,7 +28,7 @@
                         @if($maf_order->status == 'заказан')
                             <div class="row mt-3">
                                 <div class="buttons offset-md-4 col-md-8 ">
-                                    <a href="#" class="btn btn-primary" onclick="$('#set-status').submit();">На складе</a>
+                                    <a href="#" class="btn btn-sm btn-primary" onclick="$('#set-status').submit();">На складе</a>
                                 </div>
                             </div>
                         @endif

resources/views/maf_orders/index.blade.php

@@ -7,7 +7,7 @@
             <h3>Заказы МАФ</h3>
         </div>
         <div class="col-6 text-end">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addModal">
+            <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addModal">
                 Добавить
             </button>
 

resources/views/orders/index.blade.php

@@ -6,7 +6,7 @@
             <h3>Площадки</h3>
         </div>
         <div class="col-6 text-end">
-            <a href="{{ route('order.create') }}" class="btn btn-primary">Создать</a>
+            <a href="{{ route('order.create') }}" class="btn btn-sm btn-primary">Создать</a>
         </div>
     </div>
 

resources/views/orders/show.blade.php

@@ -8,29 +8,29 @@ use App\Models\Order;
 
     <div class="px-3">
         <div class="row mb-2">
-            <div class="col-6">
+            <div class="col-md-6">
                 <h3>
                     Площадка {{ $order->object_address }}
                     <div class="badge text-bg-{{ Order::STATUS_COLOR[$order->order_status_id] }}" >{{ $order->orderStatus->name }}</div>
                 </h3>
             </div>
-            <div class="col-6 text-end">
-                <a href="{{ route('order.edit', ['order' => $order, 'previous_url' => $previous_url]) }}" class="btn btn-primary">Редактировать</a>
+            <div class="col-md-6 text-end">
+                <a href="{{ route('order.edit', ['order' => $order, 'previous_url' => $previous_url]) }}" class="btn btn-sm mb-1 btn-primary">Редактировать</a>
                 @if(hasRole('admin') && ($order->order_status_id == Order::STATUS_NEW))
                     <a href="#" onclick="if(confirm('Удалить площадку?')) $('form#destroy').submit();"
-                       class="btn btn-danger">Удалить</a>
+                       class="btn btn-sm mb-1 btn-danger">Удалить</a>
                     <form action="{{ route('order.destroy', $order) }}" method="post" class="d-none" id="destroy">
                         @csrf
                         @method('DELETE')
                     </form>
                 @endif
                 @if(in_array($order->order_status_id, [Order::STATUS_READY_TO_MOUNT, Order::STATUS_IN_MOUNT]) && $order->isAllMafConnected())
-                    <a href="{{ route('order.generate-installation-pack', $order) }}" class="btn btn-primary">Документы для монтажа</a>
+                    <a href="{{ route('order.generate-installation-pack', $order) }}" class="btn btn-sm mb-1 btn-primary">Документы для монтажа</a>
                 @endif
                 @if($order->canCreateHandover())
-                    <a href="{{ route('order.generate-handover-pack', $order) }}" class="btn btn-primary">Документы для сдачи</a>
+                    <a href="{{ route('order.generate-handover-pack', $order) }}" class="btn btn-sm mb-1 btn-primary">Документы для сдачи</a>
                 @endif
-                <a href="{{ $previous_url ?? route('order.index', session('gp_orders')) }}" class="btn btn-outline-secondary">Назад</a>
+                <a href="{{ $previous_url ?? route('order.index', session('gp_orders')) }}" class="btn btn-sm mb-1 btn-outline-secondary">Назад</a>
 
             </div>
         </div>
@@ -153,7 +153,7 @@ use App\Models\Order;
                 </div>
 
             </div>
-            <div class="col-xl-9">
+            <div class="col-xl-9 overflow-x-scroll">
                 <h4>МАФы заказа</h4>
 
                 <div id="selected_maf">
@@ -230,10 +230,10 @@ use App\Models\Order;
                             </tbody>
                         </table>
                         <div>
-                            <a href="{{ route('order.get-maf', $order) }}" class="btn btn-primary btn-sm @disabled($order->ready_to_mount == 'Нет' )">Привязать все МАФы</a>
-                            <a href="{{ route('order.revert-maf', $order) }}" class="btn btn-primary btn-sm">Отвязать все МАФы</a>
-                            <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#moveModal">Перенести МАФы</button>
-                            <button class="btn btn-sm btn-warning" id="create-reclamation-button">Создать рекламацию</button>
+                            <a href="{{ route('order.get-maf', $order) }}" class="btn btn-primary btn-sm mb-1 @disabled($order->ready_to_mount == 'Нет' )">Привязать все МАФы</a>
+                            <a href="{{ route('order.revert-maf', $order) }}" class="btn btn-primary btn-sm mb-1">Отвязать все МАФы</a>
+                            <button class="btn btn-primary btn-sm mb-1" data-bs-toggle="modal" data-bs-target="#moveModal">Перенести МАФы</button>
+                            <button class="btn btn-sm mb-1 btn-warning" id="create-reclamation-button">Создать рекламацию</button>
                             <form action="{{ route('reclamations.create', $order) }}" method="post" class="visually-hidden" id="create-reclamation-form">
                                 @csrf
                             </form>

resources/views/partials/submit.blade.php

@@ -1,10 +1,10 @@
 <div class="row">
     <div class="@if(!($right ?? null)) offset-md-{{ $offset ?? 4 }} col-md-{{ (isset($offset)) ? 12 - $offset : 8  }} @endif buttons">
-        <button type="submit" class="btn btn-primary text-white">{{ $name ?? 'Сохранить' }}</button>
+        <button type="submit" class="btn btn-sm mb-1 btn-primary text-white">{{ $name ?? 'Сохранить' }}</button>
         @if(isset($delete) && !($deleteDisabled ?? false))
-            <a href="#" class="btn btn-danger delete">{{ $delete['title'] ?? 'Удалить' }}</a>
+            <a href="#" class="btn btn-sm mb-1 btn-danger delete">{{ $delete['title'] ?? 'Удалить' }}</a>
         @endif
-        <a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Назад</a>
+        <a href="{{ url()->previous() }}" class="btn btn-sm mb-1 btn-outline-secondary">Назад</a>
     </div>
 </div>
 

resources/views/partials/table.blade.php

@@ -108,7 +108,9 @@
                                 <img src="{{ $string->$headerName }}" alt="" class="img-thumbnail maf-img">
                             </a>
                         @else
-                            {!! $string->$headerName !!}
+                            <p title="{!! $string->$headerName !!}">
+                                {!! \Illuminate\Support\Str::words($string->$headerName, config('app.words_in_table_cell_limit'), ' ...') !!}
+                            </p>
                         @endif
                     </td>
                 @endforeach

resources/views/reclamations/edit.blade.php

@@ -13,7 +13,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-xl-5 border-end">
+            <div class="col-xl-5 border-end mb-3 mb-xl-0">
                 <form action="{{ route('reclamations.update', $reclamation) }}" method="post">
 
                     @csrf
@@ -31,7 +31,7 @@
                     @include('partials.submit', ['name' => 'Сохранить', 'offset' => 5])
                 </form>
             </div>
-            <div class="col-xl-7">
+            <div class="col-xl-7 overflow-x-scroll">
                 <table class="table">
                     <thead>
                     <tr>

resources/views/reports/index.blade.php

@@ -79,14 +79,14 @@
             <div class="col-12 border-top my-3"></div>
             <div class="row align-items-center">
                 <div class="col-xl-6">
-                    <div class="ms-5 ps-5" style="max-height: 50vh">
+                    <div class="ms-md-5 ps-md-5" style="max-height: 50vh">
                         <canvas id="total_orders" class="mx-4"></canvas>
                     </div>
                 </div>
 
                 <div class="col-xl-6 ">
                     <div class=" mb-3">
-                        <canvas id="order_types" class="mx-4"></canvas>
+                        <canvas id="order_types" style="max-height: 50vh" class="mx-4"></canvas>
                     </div>
                 </div>
             </div>