Update Framework, Invoices
This commit is contained in:
parent
cc5c147c27
commit
9b0b5feb7e
174 changed files with 28356 additions and 8093 deletions
|
|
@ -287,10 +287,10 @@
|
|||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@if($shopping_order->tax > 0)
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -348,22 +348,17 @@
|
|||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_firstname }}
|
||||
{{ $shopping_order->shopping_user->billing_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_address }} <br>
|
||||
@if($shopping_order->shopping_user->billing_address_2)
|
||||
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_zipcode }}
|
||||
{{ $shopping_order->shopping_user->billing_city }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->billing_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
|
||||
<br> {{ $shopping_order->shopping_user->billing_phone }}<br>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -400,23 +395,17 @@
|
|||
@if($shopping_order->shopping_user->shipping_company)
|
||||
{{ $shopping_order->shopping_user->shipping_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_firstname }}
|
||||
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_address }} <br>
|
||||
@if($shopping_order->shopping_user->shipping_address_2)
|
||||
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_zipcode }}
|
||||
{{ $shopping_order->shopping_user->shipping_city }} <br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
|
||||
<br>{{ $shopping_order->shopping_user->shipping_phone }}<br>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue