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

Merge pull request #1508 from jitendra-webkul/refund 

Refuned total issue fixed
This commit is contained in:
Jitendra Singh 2019-09-23 16:50:07 +05:30 committed by GitHub
parent ecc144b7b5 1fc043b5b7
commit 35acdc5e0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/DataGrids/OrderRefundDataGrid.php
View File

@ -20,7 +20,7 @@ class OrderRefundDataGrid extends DataGrid
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('refunds')
->select('refunds.id', 'refunds.order_id', 'refunds.state', 'refunds.base_grand_total', 'refunds.created_at')
->select('refunds.id', 'orders.increment_id', 'refunds.state', 'refunds.base_grand_total', 'refunds.created_at')
->leftJoin('orders', 'refunds.order_id', '=', 'orders.id')
->leftJoin('order_address as order_address_billing', function($leftJoin) {
$leftJoin->on('order_address_billing.order_id', '=', 'orders.id')
@ -30,7 +30,7 @@ class OrderRefundDataGrid extends DataGrid
$this->addFilter('billed_to', DB::raw('CONCAT(order_address_billing.first_name, " ", order_address_billing.last_name)'));
$this->addFilter('id', 'refunds.id');
$this->addFilter('order_id', 'refunds.order_id');
$this->addFilter('increment_id', 'orders.increment_id');
$this->addFilter('state', 'refunds.state');
$this->addFilter('base_grand_total', 'refunds.base_grand_total');
$this->addFilter('created_at', 'refunds.created_at');
@ -50,7 +50,7 @@ class OrderRefundDataGrid extends DataGrid
]);
$this->addColumn([
'index' => 'order_id',
'index' => 'increment_id',
'label' => trans('admin::app.datagrid.order-id'),
'type' => 'number',
'searchable' => true,

1
packages/Webkul/Sales/src/Repositories/OrderRepository.php
View File

@ -292,6 +292,7 @@ class OrderRepository extends Repository
$order->sub_total_refunded = $order->base_sub_total_refunded = 0;
$order->shipping_refunded = $order->base_shipping_refunded = 0;
$order->tax_amount_refunded = $order->base_tax_amount_refunded = 0;
$order->discount_refunded = $order->base_discount_refunded = 0;
$order->grand_total_refunded = $order->base_grand_total_refunded = 0;
foreach ($order->refunds as $refund) {