diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml index 065472c686129..b414f02a3d6fb 100644 --- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml +++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml @@ -11,8 +11,6 @@ getSaleableItem()->getId(); - /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */ /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */ $priceModel = $block->getPriceType('regular_price'); diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml index 72d9124173898..6e281bdef7afb 100644 --- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml +++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml @@ -11,8 +11,6 @@ getSaleableItem()->getId(); - /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */ /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */ $priceModel = $block->getPriceType('regular_price'); diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml index 56c1a99e66ade..5384a00dc894d 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml @@ -24,6 +24,8 @@ $orderStoreDate = $block->formatDate( true, $block->getTimezoneForStore($order->getStore()) ); + +$customerUrl = $block->getCustomerViewUrl(); ?>
@@ -114,8 +116,8 @@ $orderStoreDate = $block->formatDate(
escapeHtml(__('Account Information')) ?>
- getCustomerViewUrl()) : ?> - + + escapeHtml(__('Edit Customer')) ?> @@ -126,7 +128,7 @@ $orderStoreDate = $block->formatDate( escapeHtml(__('Customer Name')) ?> - getCustomerViewUrl()): ?> + escapeHtml($order->getCustomerName()) ?>