Merge remote-tracking branch 'origin/ACP2E-4361' into PR_2025_12_11_muntianu

Author: katmoon

app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
 
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+use Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date;
+
 /**
  * Adminhtml invoiced report grid block
  *
@@ -52,14 +55,13 @@ protected function _prepareColumns()
                 'index' => 'period',
                 'sortable' => false,
                 'period_type' => $this->getPeriodType(),
-                'renderer' => \Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date::class,
+                'renderer' => Date::class,
                 'totals_label' => __('Total'),
                 'html_decorators' => ['nobr'],
                 'header_css_class' => 'col-period',
                 'column_css_class' => 'col-period'
             ]
         );
-
         $this->addColumn(
             'orders_count',
             [
@@ -72,7 +74,6 @@ protected function _prepareColumns()
                 'column_css_class' => 'col-qty'
             ]
         );
-
         $this->addColumn(
             'orders_invoiced',
             [
@@ -85,7 +86,6 @@ protected function _prepareColumns()
                 'column_css_class' => 'col-invoiced'
             ]
         );
-
         $this->setStoreIds($this->_getStoreIds());
         $currencyCode = $this->getCurrentCurrencyCode();
         $rate = $this->getRate($currencyCode);
@@ -101,10 +101,10 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-total-invoiced',
-                'column_css_class' => 'col-total-invoiced'
+                'column_css_class' => 'col-total-invoiced',
+                'renderer' => Currency::class
             ]
         );
-
         $this->addColumn(
             'invoiced_captured',
             [
@@ -116,10 +116,10 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-total-invoiced-paid',
-                'column_css_class' => 'col-total-invoiced-paid'
+                'column_css_class' => 'col-total-invoiced-paid',
+                'renderer' => Currency::class
             ]
         );
-
         $this->addColumn(
             'invoiced_not_captured',
             [
@@ -131,7 +131,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-total-invoiced-not-paid',
-                'column_css_class' => 'col-total-invoiced-not-paid'
+                'column_css_class' => 'col-total-invoiced-not-paid',
+                'renderer' => Currency::class
             ]
         );
 

app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
 
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+
 /**
  * Adminhtml refunded report grid block
  *
@@ -88,7 +90,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-ref-total',
-                'column_css_class' => 'col-ref-total'
+                'column_css_class' => 'col-ref-total',
+                'renderer' => Currency::class
             ]
         );
 
@@ -103,7 +106,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-ref-online',
-                'column_css_class' => 'col-ref-online'
+                'column_css_class' => 'col-ref-online',
+                'renderer' => Currency::class
             ]
         );
 
@@ -118,7 +122,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-ref-offline',
-                'column_css_class' => 'col-ref-offline'
+                'column_css_class' => 'col-ref-offline',
+                'renderer' => Currency::class
             ]
         );
 

app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
 
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+
 /**
  * Adminhtml shipping report grid block
  *
@@ -101,7 +103,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-total-sales-shipping',
-                'column_css_class' => 'col-total-sales-shipping'
+                'column_css_class' => 'col-total-sales-shipping',
+                'renderer' => Currency::class
             ]
         );
 
@@ -116,7 +119,8 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'rate' => $rate,
                 'header_css_class' => 'col-total-shipping',
-                'column_css_class' => 'col-total-shipping'
+                'column_css_class' => 'col-total-shipping',
+                'renderer' => Currency::class
             ]
         );