merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated templates

This commit is contained in:
ghermans 2021-04-19 15:04:01 +02:00
parent 335ca4846e
commit f2f1e547b7
10 changed files with 147 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -19,8 +19,17 @@
<b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
{{ $billingAddress->address1 }},<br/>
</li>
<li class="mb-10">
{{ $billingAddress->postcode . " " . $billingAddress->city }}
</li>
<li class="mb-10">
{{ $billingAddress->state }}
</li>
<li class="mb-10">
{{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
</li>
@ -50,10 +59,19 @@
<b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
{{ $shippingAddress->address1 }},<br/>
</li>
<li class="mb-10">
{{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
{{ $shippingAddress->postcode . " " . $shippingAddress->city }}
</li>
<li class="mb-10">
{{ $shippingAddress->state }}
</li>
<li class="mb-10">
{{ core()->country_name($shippingAddress->country) }}
</li>
<span class="horizontal-rule mb-15 mt-15"></span>

4
packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
View File

@ -52,7 +52,7 @@
</div>
<div>
{{ $order->shipping_address->postcode ." " . $order->shipping_address->city }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
@ -97,7 +97,7 @@
</div>
<div>
{{ $order->billing_address->postcode ." " . $order->billing_address->city }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>

28
packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
View File

@ -48,11 +48,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -94,11 +102,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

28
packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

@ -47,11 +47,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -84,11 +92,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

2
packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
View File

@ -48,7 +48,7 @@
</div>
<div>
{{ $order->shipping_address->postcode ." " . $order->shipping_address->city }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
View File

@ -46,11 +46,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -83,11 +91,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
View File

@ -45,11 +45,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -91,11 +99,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php
View File

@ -47,11 +47,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -83,11 +91,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

22
packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
View File

@ -43,11 +43,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -75,15 +83,19 @@
</div>
<div>
{{ $order->billing_address->name }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
View File

@ -28,7 +28,7 @@
</li><br />
<li>
{{ $billingAddress->postcode ." " . $billingAddress->city }}
{{ $billingAddress->postcode . " " . $billingAddress->city }}
</li><br />
<li>
@ -66,7 +66,7 @@
</li><br/>
<li>
{{ $shippingAddress->postcode ." " . $shippingAddress->city }}
{{ $shippingAddress->postcode . " " . $shippingAddress->city }}
</li><br />
<li>