Skip to content

Commit 4de236b

Browse files
committed
Merge branch 'MAGETWO-52337' into MPI-PR
2 parents c7e6e6e + 003bd86 commit 4de236b

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@ protected function _construct()
100100
$this->setUseAjax(true);
101101
}
102102

103+
/**
104+
* Get grid url
105+
*
106+
* @return string
107+
*/
108+
public function getGridUrl()
109+
{
110+
return $this->getUrl('paypal/billing_agreement/ordersGrid', ['_current' => true]);
111+
}
112+
103113
/**
104114
* Apply various selection filters to prepare the sales order grid collection.
105115
*

app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<referenceBlock name="sales.order.grid.export" remove="true"/>
1919
<referenceBlock name="sales.order.grid.massaction" remove="true"/>
2020
<container name="root">
21-
<block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
21+
<block class="Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Tab\Orders" name="sales_order.grid.container"/>
2222
</container>
2323
</layout>

0 commit comments

Comments
 (0)