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

Merge pull request #1589 from jitendra-webkul/jitendra 

Issue #1585 fixed
This commit is contained in:
Jitendra Singh 2019-10-10 19:39:00 +05:30 committed by GitHub
parent 82491b009d 121c7c7e36
commit f88d986d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -103,7 +103,9 @@
<thead>
<tr>
<th style="width: 50%">{{ __('admin::app.sales.invoices.bill-to') }}</th>
<th>{{ __('admin::app.sales.invoices.ship-to') }}</th>
@if ($invoice->order->shipping_address)
<th>{{ __('admin::app.sales.invoices.ship-to') }}</th>
@endif
</tr>
</thead>
@ -138,7 +140,10 @@
<thead>
<tr>
<th style="width: 50%">{{ __('admin::app.sales.orders.payment-method') }}</th>
<th>{{ __('admin::app.sales.orders.shipping-method') }}</th>
@if ($invoice->order->shipping_address)
<th>{{ __('admin::app.sales.orders.shipping-method') }}</th>
@endif
</tr>
</thead>
@ -148,9 +153,11 @@
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
</td>
<td>
{{ $invoice->order->shipping_title }}
</td>
@if ($invoice->order->shipping_address)
<td>
{{ $invoice->order->shipping_title }}
</td>
@endif
</tr>
</tbody>
</table>

36
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -105,7 +105,9 @@
<thead>
<tr>
<th style="width: 50%">{{ __('shop::app.customer.account.order.view.bill-to') }}</th>
<th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
@if ($invoice->order->shipping_address)
<th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
@endif
</tr>
</thead>
@ -123,14 +125,16 @@
{{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
</td>
<td>
<p>{{ $invoice->order->shipping_address->name }}</p>
<p>{{ $invoice->order->shipping_address->address1 }}</p>
<p>{{ $invoice->order->shipping_address->city }}</p>
<p>{{ $invoice->order->shipping_address->state }}</p>
<p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
{{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
</td>
@if ($invoice->order->shipping_address)
<td>
<p>{{ $invoice->order->shipping_address->name }}</p>
<p>{{ $invoice->order->shipping_address->address1 }}</p>
<p>{{ $invoice->order->shipping_address->city }}</p>
<p>{{ $invoice->order->shipping_address->state }}</p>
<p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
{{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
</td>
@endif
</tr>
</tbody>
</table>
@ -141,7 +145,10 @@
<thead>
<tr>
<th style="width: 50%">{{ __('shop::app.customer.account.order.view.payment-method') }}</th>
<th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
@if ($invoice->order->shipping_address)
<th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
@endif
</tr>
</thead>
@ -150,9 +157,12 @@
<td>
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
</td>
<td>
{{ $invoice->order->shipping_title }}
</td>
@if ($invoice->order->shipping_address)
<td>
{{ $invoice->order->shipping_title }}
</td>
@endif
</tr>
</tbody>
</table>