gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shipping Tax Card

Browse source
This commit is contained in:
Kevin Adametz 2020-07-01 16:13:38 +02:00
parent da08e9ff37
commit eb55b01b0d
13 changed files with 86 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/de/email.php
View file

@ -48,6 +48,7 @@
'checkout_mail_shipping' => 'Verpackungs- u. Versandkosten',
'checkout_mail_status_info' => 'Statusinfo:',
'checkout_mail_total' => 'Gesamtpreis',
'checkout_mail_tax_info' => 'Preis inkl. MwSt',
'checkout_mail_pay_info' => 'Zahlungsinfo:',
'checkout_mail_pay_success' => 'Zahlung ist bestätigt!',
'checkout_mail_pay_with' => 'Zahlung mit:',

12
resources/views/admin/shipping/edit.blade.php
View file

@ -83,7 +83,7 @@
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
data-id="{{ $price->id }}"
data-price="{{ $price->getFormattedPrice() }}"
data-tax="{{ $price->getFormattedTax() }}"
data-tax_rate="{{ $price->getFormattedTaxRate() }}"
data-factor="{{ $price->getFormattedFactor() }}"
data-total_from="{{ $price->getFormatTotalFrom() }}"
data-total_to="{{ $price->getFormattedTotalTo() }}"
@ -93,7 +93,7 @@
</button>
</td>
<td>{{ $price->getFormattedPrice() }}</td>
<td>{{ $price->getFormattedTax() }}</td>
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
<td><a class="text-danger" href="{{ route('admin_shipping_price_delete', [$price->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
@ -106,7 +106,7 @@
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
data-id="new"
data-price=""
data-tax=""
data-tax_rate=""
data-factor="1"
data-total_from=""
data-total_to=""
@ -139,8 +139,8 @@
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
</div>
<div class="form-group col-6">
<label for="tax" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax" placeholder="{{__('Tax in %')}}">
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
</div>
@ -250,7 +250,7 @@
var button = $(event.relatedTarget);
$(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='tax']").val(button.data('tax'));
$(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'));
$(this).find(".modal-body input[name='total_to']").val(button.data('total_to'));

8
resources/views/emails/checkout.blade.php
View file

@ -163,7 +163,7 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->product->name }}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->getFormattedPrice() }} EUR
</td>
</tr>
@ -180,7 +180,7 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $shopping_order->getFormattedShipping() }} EUR
</td>
</tr>
@ -196,8 +196,10 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
</td>
</tr>
</table>

8
resources/views/emails/checkout_status.blade.php
View file

@ -208,7 +208,7 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->product->name }}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->getFormattedPrice() }} EUR
</td>
</tr>
@ -225,7 +225,7 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $shopping_order->getFormattedShipping() }} EUR
</td>
</tr>
@ -241,8 +241,10 @@
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
</td>
</tr>
</table>

1
resources/views/web/templates/card.blade.php
View file

@ -148,7 +148,6 @@
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
<tr class="item yard">
<td>
@if($row->options->has('image'))