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

Fixed issues #1444 & #1434

This commit is contained in:
Prashant Singh 2019-09-11 20:10:59 +05:30
parent e6104668e0
commit 6c82802371
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -280,7 +280,7 @@
<tr> <tr>
<td>{{ __('admin::app.sales.orders.discount') }}</td> <td>{{ __('admin::app.sales.orders.discount') }}</td>
<td>-</td> <td>-</td>
<td>-{{ core()->formatBasePrice($invoice->base_discount_amount) }}</td> <td>{{ core()->formatBasePrice($invoice->base_discount_amount) }}</td>
</tr> </tr>
@endif @endif

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -312,7 +312,7 @@
<tr> <tr>
<td>{{ __('admin::app.sales.orders.discount') }}</td> <td>{{ __('admin::app.sales.orders.discount') }}</td>
<td>-</td> <td>-</td>
<td>-{{ core()->formatBasePrice($order->base_discount_amount) }}</td> <td>{{ core()->formatBasePrice($order->base_discount_amount) }}</td>
</tr> </tr>
@endif @endif

4
packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
View File

@ -25,13 +25,13 @@
@endif @endif
<div class="item-detail" id="discount-detail" @if ($cart->discount_amount && $cart->discount_amount > 0) style="display: block;" @else style="display: none;" @endif> <div class="item-detail" id="discount-detail" @if ($cart->base_discount_amount && $cart->base_discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
<label> <label>
<b>{{ __('shop::app.checkout.total.disc-amount') }}</b> <b>{{ __('shop::app.checkout.total.disc-amount') }}</b>
</label> </label>
<label class="right"> <label class="right">
<b id="discount-detail-discount-amount"> <b id="discount-detail-discount-amount">
{{ core()->currency($cart->discount_amount) }} {{ core()->currency($cart->base_discount_amount) }}
</b> </b>
</label> </label>
</div> </div>