Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Declare module namespace before template path in Magento_Sales and Magento_Paypal #16698

Merged
merged 1 commit into from
Jul 12, 2018
Merged

Declare module namespace before template path in Magento_Sales and Magento_Paypal #16698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ class Form extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'billing/agreement/view/form.phtml';
protected $_template = 'Magento_Paypal::billing/agreement/view/form.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
/**
* @var string
*/
protected $_template = 'billing/agreement/view/tab/info.phtml';
protected $_template = 'Magento_Paypal::billing/agreement/view/tab/info.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
*
* @var string
*/
protected $_template = 'system/config/payflowlink/advanced.phtml';
protected $_template = 'Magento_Paypal::system/config/payflowlink/advanced.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
*
* @var string
*/
protected $_template = 'system/config/payflowlink/info.phtml';
protected $_template = 'Magento_Paypal::system/config/payflowlink/info.phtml';

/**
* Render fieldset html
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ class Form extends \Magento\Payment\Block\Form
/**
* @var string
*/
protected $_template = 'hss/info.phtml';
protected $_template = 'Magento_Paypal::hss/info.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Iframe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Iframe extends \Magento\Payment\Block\Form
/**
* @var string
*/
protected $_template = 'hss/js.phtml';
protected $_template = 'Magento_Paypal::hss/js.phtml';

/**
* @var \Magento\Sales\Model\OrderFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Form extends \Magento\Paypal\Block\Payflow\Link\Form
/**
* @var string
*/
protected $_template = 'payflowadvanced/info.phtml';
protected $_template = 'Magento_Paypal::payflowadvanced/info.phtml';

/**
* Get frame action URL
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/Block/Payflow/Link/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Form extends \Magento\Payment\Block\Form
/**
* @var string
*/
protected $_template = 'payflowlink/info.phtml';
protected $_template = 'Magento_Paypal::payflowlink/info.phtml';

/**
* Get frame action URL
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
*
* @var string
*/
protected $_template = 'order/address/form.phtml';
protected $_template = 'Magento_Sales::order/address/form.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
*
* @var string
*/
protected $_template = 'order/create/totals/grandtotal.phtml';
protected $_template = 'Magento_Sales::order/create/totals/grandtotal.phtml';

/**
* Tax config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
*
* @var string
*/
protected $_template = 'order/create/totals/shipping.phtml';
protected $_template = 'Magento_Sales::order/create/totals/shipping.phtml';

/**
* Tax config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
*
* @var string
*/
protected $_template = 'order/create/totals/subtotal.phtml';
protected $_template = 'Magento_Sales::order/create/totals/subtotal.phtml';

/**
* Tax config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTota
*
* @var string
*/
protected $_template = 'order/create/totals/tax.phtml';
protected $_template = 'Magento_Sales::order/create/totals/tax.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class Details extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/details.phtml';
protected $_template = 'Magento_Sales::order/details.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ class Form extends \Magento\Backend\Block\Template
*
* @var string
*/
protected $_template = 'order/view/form.phtml';
protected $_template = 'Magento_Sales::order/view/form.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
*
* @var string
*/
protected $_template = 'order/view/tab/history.phtml';
protected $_template = 'Magento_Sales::order/view/tab/history.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Link extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'rss/order/grid/link.phtml';
protected $_template = 'Magento_Sales::rss/order/grid/link.phtml';

/**
* @var \Magento\Framework\App\Rss\UrlBuilderInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/Info/Buttons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Buttons extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/info/buttons.phtml';
protected $_template = 'Magento_Sales::order/info/buttons.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Rss extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/info/buttons/rss.phtml';
protected $_template = 'Magento_Sales::order/info/buttons/rss.phtml';

/**
* @var \Magento\Sales\Model\OrderFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/Invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
/**
* @var string
*/
protected $_template = 'order/invoice.phtml';
protected $_template = 'Magento_Sales::order/invoice.phtml';

/**
* @var \Magento\Framework\App\Http\Context
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class View extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/view.phtml';
protected $_template = 'Magento_Sales::order/view.phtml';

/**
* Core registry
Expand Down