fix for mac, fix template

app/Http/Controllers/MafOrderController.php

@@ -59,15 +59,17 @@ class MafOrderController extends Controller
         return redirect()->route('maf_order.index');
     }
 
-    public function show(MafOrder $maf_order)
+    public function show(Request $request, MafOrder $maf_order)
     {
         $this->data['maf_order'] = $maf_order;
+        $this->data['previous_url'] = $request->get('previous_url');
         return view('maf_orders.edit', $this->data);
     }
 
     public function update(StoreMafOrderRequest $request, MafOrder $maf_order)
     {
         MafOrder::query()->where('id', $maf_order->id)->update($request->validated());
+
         return redirect()->route('maf_order.index');
     }
 

app/Http/Controllers/OrderController.php

@@ -95,8 +95,9 @@ class OrderController extends Controller
     /**
      * Show the form for creating a new resource.
      */
-    public function create()
+    public function create(Request $request)
     {
+        $this->data['previous_url'] = $request->get('previous_url');
         return view('orders.edit', $this->data);
     }
 
@@ -139,24 +140,26 @@ class OrderController extends Controller
         $order->refresh();
         $order->autoChangeStatus();
 
-        return redirect()->route('order.show', $order);
+        return redirect()->route('order.show', ['order' => $order, 'previous_url' => $request->get('previous_url')]);
     }
 
     /**
      * Display the specified resource.
      */
-    public function show(Order $order)
+    public function show(Request $request, Order $order)
     {
         $this->data['order'] = $order;
+        $this->data['previous_url'] = $request->get('previous_url');
         return view('orders.show', $this->data);
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit(Order $order)
+    public function edit(Request $request, Order $order)
     {
         $this->data['order'] = $order;
+        $this->data['previous_url'] = $request->get('previous_url');
         return view('orders.edit', $this->data);
     }
 

app/Http/Controllers/ProductController.php

@@ -78,6 +78,7 @@ class ProductController extends Controller
 
     public function show(Request $request, Product $product)
     {
+        $this->data['previous_url'] = $request->get('previous_url') ?? '';
         $this->data['product'] = $product;
         return view('catalog.edit', $this->data);
     }
@@ -91,13 +92,15 @@ class ProductController extends Controller
     public function store(StoreProductRequest $request)
     {
         Product::create($request->validated());
-        return redirect()->route('catalog.index');
+        $previous_url = $request->get('previous_url') ?? route('catalog.index');
+        return redirect()->to($previous_url);
     }
 
     public function update(StoreProductRequest $request, Product $product)
     {
         $product->update($request->validated());
-        return redirect()->route('catalog.index');
+        $previous_url = $request->get('previous_url') ?? route('catalog.index');
+        return redirect()->to($previous_url);
     }
 
     public function delete(Product $product)
@@ -162,7 +165,6 @@ class ProductController extends Controller
             });
             foreach ($result->get() as $p) {
                 $ret[$p->id] = $p->common_name;
-//                $ret[$p->id] = $p->name_tz . ' (арт.' . $p->article . ', №' . $p->nomenclature_number . ', ' . $p->year . 'г., ' . $p->product_price_txt . ')';
             }
         }
         return $ret;
@@ -176,15 +178,15 @@ class ProductController extends Controller
 
         $f = $fileService->saveUploadedFile('products/' . $product->id . '/certificate', $data['certificate']);
         $product->update(['certificate_id' => $f->id]);
-        return redirect()->route('catalog.show', $product);
+        return redirect()->route('catalog.show', ['product' => $product, 'previous_url' => $request->get('previous_url')]);
     }
 
-    public function deleteCertificate(Product $product, File $file)
+    public function deleteCertificate(Request $request, Product $product, File $file)
     {
         $product->update(['certificate_id' => null]);
         Storage::disk('public')->delete($file->path);
         $file->delete();
-        return redirect()->route('catalog.show', $product);
+        return redirect()->route('catalog.show', ['product' => $product, 'previous_url' => $request->get('previous_url')]);
     }
 
 

app/Http/Controllers/ProductSKUController.php

@@ -79,7 +79,7 @@ class ProductSKUController extends Controller
 
     public function update(ProductSKUStoreRequest $request, ProductSKU $product_sku)
     {
-        $url = $request->redirect_url ?? route('product_sku.index');
+        $url = $request->previous_url ?? route('product_sku.index');
 
         $product_sku->update($request->validated());
         return redirect($url);
@@ -88,6 +88,7 @@ class ProductSKUController extends Controller
     public function show(Request $request, ProductSKU $product_sku)
     {
         $this->data['product_sku'] = $product_sku;
+        $this->data['previous_url'] = $request->get('previous_url');
         return view('products_sku.edit', $this->data);
     }
 
@@ -99,7 +100,7 @@ class ProductSKUController extends Controller
 
         $f = $fileService->saveUploadedFile('maf/' . $product_sku->id . '/passport', $data['passport']);
         $product_sku->update(['passport_id' => $f->id]);
-        return redirect()->route('product_sku.show', $product_sku);
+        return redirect()->route('product_sku.show', ['product_sku' => $product_sku, 'previous_url' => $request->get('previous_url')]);
     }
 
     public function deletePassport(ProductSKU $product_sku, File $file)

docker-compose.yml

@@ -149,6 +149,7 @@ services:
     # Converter service
     pdf-converter:
         image: wteja/pdf-converter
+        platform: linux/amd64
         restart: unless-stopped
         networks:
             - str-network

resources/views/catalog/edit.blade.php

@@ -10,9 +10,10 @@
                 @if(isset($product))
                      <button class="btn btn-sm text-success" onclick="$('#upl-cert').trigger('click');"><i class="bi bi-plus-circle-fill"></i> Загрузить сертификат</button>
 
-                    <form action="{{ route('catalog.upload-certificate', $product) }}" class="visually-hidden" method="POST" enctype="multipart/form-data">
+                    <form action="{{ route('catalog.upload-certificate', ['product' => $product, 'previous_url' => $previous_url ?? '']) }}" class="visually-hidden" method="POST" enctype="multipart/form-data">
                         @csrf
                         <input type="file" name="certificate" onchange="$(this).parent().submit()" required id="upl-cert" />
+
                     </form>
                 @endif
             </div>
@@ -37,7 +38,7 @@
                         @include('partials.input', ['name' => 'total_price', 'type' => 'number', 'title' => 'Итоговая цена', 'required' => true, 'value' => $product->total_price ?? ''])
                         @include('partials.input', ['name' => 'passport_name', 'title' => 'Наименование по паспорту', 'value' => $product->passport_name ?? ''])
                         @include('partials.input', ['name' => 'statement_name', 'title' => 'Наименование в ведомости', 'value' => $product->statement_name ?? ''])
-
+                        <input type="hidden" name="previous_url" value="{{ $previous_url ?? '' }}">
                     </div>
                     <div class="col-xl-6">
                         @if($product->certificate)

resources/views/catalog/index.blade.php

@@ -24,6 +24,7 @@
         'header'    => $header,
         'strings'   => $products,
         'routeName' => 'catalog.show',
+        'routeParam' => 'product',
     ])
 
     <div class="row pt-3 px-3">

resources/views/contracts/index.blade.php

@@ -16,6 +16,7 @@
         'header'    => $header,
         'strings'   => $contracts,
         'routeName' => 'contract.show',
+        'routeParam' => 'contract',
     ])
 
     <div class="row pt-3 px-3">

resources/views/maf_orders/index.blade.php

@@ -20,6 +20,7 @@
         'header'    => $header,
         'strings'   => $maf_orders,
         'routeName' => 'maf_order.show',
+        'routeParam' => 'maf_order',
     ])
 
     <div class="row pt-3 px-3">

resources/views/orders/edit.blade.php

@@ -13,7 +13,7 @@
                 @if(isset($order))
                     <input type="hidden" name="id" value="{{ $order->id }}">
                 @endif
-
+                <input type="text" name="previous_url" value="{{ $previous_url ?? ''}}">
                 @include('partials.select', ['name' => 'order_status_id', 'title' => 'Статус', 'options' => $orderStatuses, 'value' => $order->order_status_id ?? old('order_status_id'), 'required' => true])
 
                 @include('partials.select', ['name' => 'district_id', 'title' => 'Округ', 'options' => $districts, 'value' => $order?->district_id ?? old('district_id'), 'first_empty' => true, 'required' => true])

resources/views/orders/index.blade.php

@@ -16,6 +16,7 @@
         'header'    => $header,
         'strings'   => $orders,
         'routeName' => 'order.show',
+        'routeParam' => 'order',
     ])
 
     <div class="row pt-3 px-3">

resources/views/orders/show.blade.php

@@ -12,11 +12,10 @@ use App\Models\Order;
                 <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) }}" class="btn btn-primary">Редактировать</a>
+                <a href="{{ route('order.edit', ['order' => $order, 'previous_url' => $previous_url]) }}" class="btn 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>
@@ -31,6 +30,7 @@ use App\Models\Order;
                 @if($order->canCreateHandover())
                     <a href="{{ route('order.generate-handover-pack', $order) }}" class="btn btn-primary">Документы для сдачи</a>
                 @endif
+                <a href="{{ $previous_url ?? route('order.index') }}" class="btn btn-outline-secondary">Назад</a>
 
             </div>
         </div>
@@ -191,11 +191,11 @@ use App\Models\Order;
                                         @endif
                                     </td>
                                     <td>
-                                        <a href="{{ route('product_sku.show', $p) }}">
+                                        <a href="{{ route('product_sku.show', ['product_sku' =>$p, 'previous_url' => url()->current()]) }}">
                                             {!! $p->product->article !!}
                                         </a>
                                         <br>
-                                        <a class="small" href="{{ route('catalog.show', $p->product) }}">каталог</a>
+                                        <a class="small" href="{{ route('catalog.show', ['product' => $p->product, 'previous_url' => request()->fullUrl()]) }}">каталог</a>
                                     </td>
                                     <td>{!! $p->product->nomenclature_number !!}</td>
                                     <td>{{ $p->status }}</td>

resources/views/partials/table.blade.php

@@ -49,7 +49,7 @@
             <tr>
                 @foreach($header as $headerName => $headerTitle)
                     <td class="column_{{$headerName}}"
-                        @if(isset($routeName) && !str_contains($headerName, 'image')) onclick="location.href='{{ route($routeName, $string->id) }}'" @endif>
+                        @if(isset($routeName) && !str_contains($headerName, 'image')) onclick="location.href='{{ route($routeName, [$routeParam => $string->id, 'previous_url' => request()->fullUrl()]) }}'" @endif>
                         @if(str_contains($headerName, '-'))
                             @php
                                 list($rel, $field) = explode('-', $headerName);

resources/views/products_sku/edit.blade.php

@@ -11,7 +11,7 @@
                 @if(isset($product_sku))
                     <button class="btn btn-sm text-success" onclick="$('#upl-pass').trigger('click');"><i class="bi bi-plus-circle-fill"></i> Загрузить паспорт</button>
 
-                    <form action="{{ route('product-sku.upload-passport', $product_sku) }}" class="visually-hidden" method="POST" enctype="multipart/form-data">
+                    <form action="{{ route('product-sku.upload-passport', ['product_sku' => $product_sku, 'previous_url' => $previous_url ?? '']) }}" class="visually-hidden" method="POST" enctype="multipart/form-data">
                         @csrf
                         <input type="file" name="passport" onchange="$(this).parent().submit()" required id="upl-pass" />
                     </form>
@@ -25,6 +25,7 @@
                 @csrf
 
                 <input type="hidden" id="product_id" name="product_id" value="{{ $product_sku->product_id }}">
+                <input type="text" name="previous_url" value="{{ $previous_url ?? '' }}">
 
                 @include('partials.input', ['name' => 'order_name', 'title' => 'Площадка', 'disabled' => true, 'value' => $product_sku->order->common_name])
                 @include('partials.input', ['name' => 'product_name', 'title' => 'МАФ', 'disabled' => true, 'value' => $product_sku->product->common_name])
@@ -51,8 +52,6 @@
                     </div>
                 </div>
 
-
-                <input type="hidden" name="redirect_url" value="{{ url()->previous() }}">
             </div>
             <div class="col-12">
                 @include('partials.submit', ['name' => 'Сохранить', 'offset' => 5])

resources/views/products_sku/index.blade.php

@@ -20,6 +20,7 @@
         'header'    => $header,
         'strings'   => $products_sku,
         'routeName' => 'product_sku.show',
+        'routeParam' => 'product_sku',
     ])
 
     <div class="row pt-3 px-3">

resources/views/reclamations/index.blade.php

@@ -18,6 +18,7 @@
         'header'    => $header,
         'strings'   => $reclamations,
         'routeName' => 'reclamations.show',
+        'routeParam' => 'reclamation',
     ])
 
     <div class="row pt-3 px-3">

resources/views/responsibles/index.blade.php

@@ -20,6 +20,7 @@
         'header'    => $header,
         'strings'   => $responsibles,
         'routeName' => 'responsible.show',
+        'routeParam' => 'responsible',
     ])
 
     <div class="row pt-3 px-3">

resources/views/users/index.blade.php

@@ -19,6 +19,7 @@
         'header'    => $header,
         'strings'   => $users,
         'routeName' => 'user.show',
+        'routeParam' => 'user',
     ])
 
     <div class="row pt-3 px-3">