|
|
@@ -230,21 +230,17 @@
|
|
|
@endif
|
|
|
</td>
|
|
|
<td>
|
|
|
- @if(hasRole('admin'))
|
|
|
- <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', ['product' => $p->product, 'previous_url' => request()->fullUrl()]) }}">каталог</a>
|
|
|
- @endif
|
|
|
+ <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', ['product' => $p->product, 'previous_url' => request()->fullUrl()]) }}">каталог</a>
|
|
|
+
|
|
|
</td>
|
|
|
<td>{!! $p->product->nomenclature_number !!}</td>
|
|
|
<td>{{ $p->status }}</td>
|
|
|
<td>
|
|
|
- @if($p->maf_order_id && hasRole('admin'))
|
|
|
- <a href="{{ route('maf_order.show', $p->maf_order) }}">{{ $p->maf_order->order_number }}</a>
|
|
|
- @endif
|
|
|
+ <a href="{{ route('maf_order.show', $p->maf_order) }}">{{ $p->maf_order->order_number }}</a>
|
|
|
</td>
|
|
|
<td>{{ $p->rfid }}</td>
|
|
|
<td>{{ $p->factory_number }}</td>
|
|
|
@@ -273,7 +269,7 @@
|
|
|
</table>
|
|
|
</div>
|
|
|
<div>
|
|
|
- @if(hasRole('admin'))
|
|
|
+ @if(hasRole('admin,manager'))
|
|
|
<a href="{{ route('order.get-maf', $order) }}"
|
|
|
class="btn btn-primary btn-sm mb-1 @disabled($order->ready_to_mount == 'Нет' )">Привязать
|
|
|
все МАФы</a>
|
|
|
@@ -441,7 +437,7 @@
|
|
|
if (ids.length) {
|
|
|
$('#create-reclamation-form').submit();
|
|
|
} else {
|
|
|
- alert('Нужно выбрать МАФ для рекламации!');
|
|
|
+ customAlert('Нужно выбрать МАФ для рекламации!');
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -464,7 +460,7 @@
|
|
|
let myModalTtn = new bootstrap.Modal(document.getElementById("createTtnModal"), {});
|
|
|
myModalTtn.show();
|
|
|
} else {
|
|
|
- alert('Нужно выбрать МАФ для ТН!');
|
|
|
+ customAlert('Нужно выбрать МАФ для ТН!');
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -480,7 +476,7 @@
|
|
|
if (ids.length) {
|
|
|
$('#ttnForm').submit();
|
|
|
} else {
|
|
|
- alert('Нужно выбрать МАФ для ТН!');
|
|
|
+ customAlert('Нужно выбрать МАФ для ТН!');
|
|
|
}
|
|
|
});
|
|
|
|