Erweiterungen / Korrekturen Beraterbestellungen

This commit is contained in:
Kevin Adametz 2020-09-08 19:22:07 +02:00
parent ecc71c616f
commit c4ed6b39db
36 changed files with 1104 additions and 617 deletions

View file

@ -70,6 +70,7 @@
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Kunden Preis')}}</th>
<th>{{__('Kompensation Preis')}}</th>
<th>{{__('Anzahl KP')}}</th>
<th>{{__('Tax')}}</th>
<th>{{__('Preis von - bis')}}</th>
<th>{{__('Gewicht von - bis')}}</th>
@ -85,6 +86,7 @@
data-id="{{ $price->id }}"
data-price="{{ $price->getFormattedPrice() }}"
data-price_comp="{{ $price->getFormattedPriceComp() }}"
data-num_comp="{{ $price->num_comp }}"
data-tax_rate="{{ $price->getFormattedTaxRate() }}"
data-factor="{{ $price->getFormattedFactor() }}"
data-total_from="{{ $price->getFormatTotalFrom() }}"
@ -96,6 +98,7 @@
</td>
<td>{{ $price->getFormattedPrice() }}</td>
<td>{{ $price->getFormattedPriceComp() }}</td>
<td>{{ $price->num_comp }}</td>
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
@ -110,6 +113,7 @@
data-id="new"
data-price=""
data-price_comp=""
data-num_comp=""
data-tax_rate=""
data-factor="1"
data-total_from=""
@ -153,6 +157,10 @@
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
<div class="form-group col-6">
<label for="num_comp" class="form-label">{{__('Anzahl Kompensationsprodukte')}}*</label>
<input type="text" class="form-control" name="num_comp" placeholder="{{__('Anzahl Kompensationsprodukte')}}" required>
</div>
</div>
<div class="form-row">
@ -204,7 +212,13 @@
<td>
{{ $country->country->de }}
</td>
<td><a class="text-danger" href="{{ route('admin_shipping_country_delete', [$country->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td>
@if(!$country->shopping_orders->count())
<a class="text-danger" href="{{ route('admin_shipping_country_delete', [$country->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a>
@else
-
@endif
</td>
</tr>
@endforeach
@ -261,6 +275,7 @@
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='price']").val(button.data('price'));
$(this).find(".modal-body input[name='price_comp']").val(button.data('price_comp'));
$(this).find(".modal-body input[name='num_comp']").val(button.data('num_comp'));
$(this).find(".modal-body input[name='tax_rate']").val(button.data('tax_rate'));
$(this).find(".modal-body input[name='factor']").val(button.data('factor'));
$(this).find(".modal-body input[name='total_from']").val(button.data('total_from'));