Browse Source

generate install pack button show on ready to mount and in mount statuses, autogenerate this document when status auth changed to in mount

Alexander Musikhin 10 months ago
parent
commit
4bdbd9a462

+ 2 - 0
app/Models/Order.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 namespace App\Models;
 
 
 use App\Helpers\Price;
 use App\Helpers\Price;
+use App\Jobs\GenerateInstallationPack;
 use App\Models\Dictionary\Area;
 use App\Models\Dictionary\Area;
 use App\Models\Dictionary\District;
 use App\Models\Dictionary\District;
 use App\Models\Scopes\YearScope;
 use App\Models\Scopes\YearScope;
@@ -216,6 +217,7 @@ class Order extends Model
 
 
             if($allMafConnected) {
             if($allMafConnected) {
                 $this->update(['order_status_id' => self::STATUS_IN_MOUNT]);
                 $this->update(['order_status_id' => self::STATUS_IN_MOUNT]);
+                GenerateInstallationPack::dispatch($this, auth()->user()->id);
             }
             }
         }
         }
 
 

+ 4 - 0
resources/js/custom.js

@@ -24,6 +24,10 @@ $(document).ready(function () {
                 }
                 }
                 if(received.data.payload.link) {
                 if(received.data.payload.link) {
                     document.location.href = received.data.payload.link;
                     document.location.href = received.data.payload.link;
+                    setTimeout(function () {
+                        document.location.reload();
+                    }, 2000);
+
                 }
                 }
 
 
                 setTimeout(function () {
                 setTimeout(function () {

+ 9 - 3
resources/views/orders/show.blade.php

@@ -1,3 +1,7 @@
+@php
+use App\Models\Order;
+@endphp
+
 @extends('layouts.app')
 @extends('layouts.app')
 
 
 @section('content')
 @section('content')
@@ -9,7 +13,7 @@
             </div>
             </div>
             <div class="col-6 text-end">
             <div class="col-6 text-end">
                 <a href="{{ route('order.edit', $order) }}" class="btn btn-primary">Редактировать</a>
                 <a href="{{ route('order.edit', $order) }}" class="btn btn-primary">Редактировать</a>
-                @if(hasRole('admin') && ($order->order_status_id == App\Models\Order::STATUS_NEW))
+                @if(hasRole('admin') && ($order->order_status_id == Order::STATUS_NEW))
                     <a href="#" onclick="if(confirm('Удалить площадку?')) $('form#destroy').submit();"
                     <a href="#" onclick="if(confirm('Удалить площадку?')) $('form#destroy').submit();"
                        class="btn btn-danger">Удалить</a>
                        class="btn btn-danger">Удалить</a>
                     <form action="{{ route('order.destroy', $order) }}" method="post" class="d-none" id="destroy">
                     <form action="{{ route('order.destroy', $order) }}" method="post" class="d-none" id="destroy">
@@ -17,7 +21,9 @@
                         @method('DELETE')
                         @method('DELETE')
                     </form>
                     </form>
                 @endif
                 @endif
-                <a href="{{ route('order.generate-installation-pack', $order) }}" class="btn btn-primary">Документы для монтажа</a>
+                @if(in_array($order->order_status_id, [Order::STATUS_READY_TO_MOUNT, Order::STATUS_IN_MOUNT]))
+                    <a href="{{ route('order.generate-installation-pack', $order) }}" class="btn btn-primary">Документы для монтажа</a>
+                @endif
 
 
             </div>
             </div>
         </div>
         </div>
@@ -31,7 +37,7 @@
                 </div>
                 </div>
 
 
                 <div>Тип объекта: {{ $order->objectType->name }}</div>
                 <div>Тип объекта: {{ $order->objectType->name }}</div>
-                <div class="text-{{ \App\Models\Order::STATUS_COLOR[$order->order_status_id] }}" >Статус объекта: {{ $order->orderStatus->name }}</div>
+                <div class="text-{{ Order::STATUS_COLOR[$order->order_status_id] }}" >Статус объекта: {{ $order->orderStatus->name }}</div>
                 <div>Комментарий: {{ $order->comment }}</div>
                 <div>Комментарий: {{ $order->comment }}</div>
                 <div>Дата выхода на монтаж: {{ $order->installation_date }}</div>
                 <div>Дата выхода на монтаж: {{ $order->installation_date }}</div>
                 <div>Дата готовности площадки: {{ $order->ready_date }}</div>
                 <div>Дата готовности площадки: {{ $order->ready_date }}</div>

+ 1 - 0
resources/views/users/profile.blade.php

@@ -8,6 +8,7 @@
             @include('partials.input', ['name' => 'email', 'title' => 'E-mail', 'disabled' => true, 'value' => $user->email])
             @include('partials.input', ['name' => 'email', 'title' => 'E-mail', 'disabled' => true, 'value' => $user->email])
             @include('partials.input', ['name' => 'name', 'title' => 'Имя', 'required' => true, 'value' => $user->name])
             @include('partials.input', ['name' => 'name', 'title' => 'Имя', 'required' => true, 'value' => $user->name])
             @include('partials.input', ['name' => 'role', 'title' => 'Роль', 'disabled' => true, 'value' => getRoles($user->role)])
             @include('partials.input', ['name' => 'role', 'title' => 'Роль', 'disabled' => true, 'value' => getRoles($user->role)])
+            @include('partials.input', ['name' => 'phone', 'title' => 'Телефон', 'value' => $user->phone ?? ''])
 
 
             <div class="row pwd-change-link mb-3">
             <div class="row pwd-change-link mb-3">
                 <div class="offset-md-4">
                 <div class="offset-md-4">