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

Merge pull request #1424 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-09-09 13:18:18 +05:30 committed by GitHub
parent da8b21cab1 94727a4f1d
commit 9d5032d619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@
color: #000;
font-weight: 600;
}
</style>
</head>
@ -115,7 +115,7 @@
<p>{{ $invoice->order->billing_address->city }}</p>
<p>{{ $invoice->order->billing_address->state }}</p>
<p>{{ core()->country_name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}</p>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->billing_address->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->billing_address->phone }}
</td>
<td>
<p>{{ $invoice->order->shipping_address->name }}</p>
@ -123,7 +123,7 @@
<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.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }}
</td>
</tr>
</tbody>
@ -151,7 +151,7 @@
</tbody>
</table>
</div>
<div class="table items">
<table>
<thead>
@ -210,6 +210,12 @@
<td>{{ core()->formatBasePrice($invoice->base_tax_amount) }}</td>
</tr>
<tr>
<td>{{ __('admin::app.sales.orders.discount') }}</td>
<td>-</td>
<td>{{ core()->formatBasePrice($invoice->base_discount_amount) }}</td>
</tr>
<tr class="bold">
<td>{{ __('admin::app.sales.orders.grand-total') }}</td>
<td>-</td>
@ -222,4 +228,3 @@
</div>
</body>
</html>

10
packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
View File

@ -64,7 +64,7 @@ class InvoiceRepository extends Repository
parent::__construct($app);
}
/**
* Specify Model class name
*
@ -83,7 +83,7 @@ class InvoiceRepository extends Repository
public function create(array $data)
{
DB::beginTransaction();
try {
Event::fire('sales.invoice.save.before', $data);
@ -99,6 +99,8 @@ class InvoiceRepository extends Repository
'channel_currency_code' => $order->channel_currency_code,
'order_currency_code' => $order->order_currency_code,
'order_address_id' => $order->billing_address->id,
"discount_amount" => $order->discount_amount,
"base_discount_amount" => $order->base_discount_amount,
]);
foreach ($data['invoice']['items'] as $itemId => $qty) {
@ -127,7 +129,7 @@ class InvoiceRepository extends Repository
'product_type' => $orderItem->product_type,
'additional' => $orderItem->additional,
]);
if ($orderItem->type == 'configurable' && $orderItem->child) {
$childOrderItem = $orderItem->child;
@ -167,7 +169,7 @@ class InvoiceRepository extends Repository
throw $e;
}
DB::commit();
return $invoice;

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

@ -206,6 +206,14 @@
<td>{{ core()->formatPrice($invoice->shipping_amount, $invoice->order->order_currency_code) }}</td>
</tr>
@if ($invoice->base_discount_amount > 0)
<tr>
<td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
<td>-</td>
<td>{{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}</td>
</tr>
@endif
<tr>
<td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
<td>-</td>

8
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -224,6 +224,14 @@
<td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
</tr>
@if ($order->base_discount_amount > 0)
<tr>
<td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
<td>-</td>
<td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
</tr>
@endif
<tr>
<td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
<td>-</td>