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

Conflics resolve

This commit is contained in:
jitendra 2020-09-08 12:27:45 +05:30
parent bdc159b8e3 449b6b45ff
commit b6001fbc31
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,6 +207,15 @@
<tr>
<td>
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
@php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($invoice->order->payment->method); @endphp
@if (! empty($additionalDetails))
<div>
<label class="label">{{ $additionalDetails['title'] }}:</label>
<p class="value">{{ $additionalDetails['value'] }}</p>
</div>
@endif
</td>
@if ($invoice->order->shipping_address)

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

@ -211,6 +211,15 @@
<tr>
<td>
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
@php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($invoice->order->payment->method); @endphp
@if (! empty($additionalDetails))
<div>
<label class="label">{{ $additionalDetails['title'] }}:</label>
<p class="value">{{ $additionalDetails['value'] }}</p>
</div>
@endif
</td>
@if ($invoice->order->shipping_address)

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

@ -108,10 +108,8 @@
@if (! empty($additionalDetails))
<div style="font-size: 16px; color: #242424;">
{{ $additionalDetails['title'] }}
</div>
<div style="font-size: 16px; color: #242424;">
<p>{{ $additionalDetails['value'] }}</p>
<div>{{ $additionalDetails['title'] }}</div>
<div>{{ $additionalDetails['value'] }}</div>
</div>
@endif
</div>

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

@ -98,7 +98,7 @@
{{ __('shop::app.mail.order.payment') }}
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
<div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>
@ -106,10 +106,8 @@
@if (! empty($additionalDetails))
<div style="font-size: 16px; color: #242424;">
{{ $additionalDetails['title'] }}
</div>
<div style="font-size: 16px; color: #242424;">
<p>{{ $additionalDetails['value'] }}</p>
<div>{{ $additionalDetails['title'] }}</div>
<div>{{ $additionalDetails['value'] }}</div>
</div>
@endif
</div>
@ -176,12 +174,12 @@
@endif
@foreach (Webkul\Tax\Helpers\Tax::getTaxRatesWithAmount($order, false) as $taxRate => $taxAmount )
<div>
<span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
<span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
{{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
</span>
</div>
<div>
<span id="taxrate-{{ core()->taxRateAsIdentifier($taxRate) }}">{{ __('shop::app.mail.order.tax') }} {{ $taxRate }} %</span>
<span id="taxamount-{{ core()->taxRateAsIdentifier($taxRate) }}" style="float: right;">
{{ core()->formatPrice($taxAmount, $order->order_currency_code) }}
</span>
</div>
@endforeach
@if ($order->discount_amount > 0)