🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17242: [Backport] Add VAT number to email source variables (by @mageprince)
 - #17241: [Backport] Modify Report processor to return 500 (by @mageprince)


Fixed GitHub Issues:
 - #11512: Incorrect use of 503 status code (reported by @andrewhowdencom) has been fixed in #17241 by @mageprince in 2.1-develop branch
   Related commits:
     1. 5685d19

Author: Stanislav Idolov

app/code/Magento/Email/Model/Source/Variables.php

@@ -49,6 +49,7 @@ public function __construct()
             ['value' => 'general/store_information/city', 'label' => __('City')],
             ['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
             ['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+            ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
         ];
     }
 

app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php

@@ -53,6 +53,7 @@ protected function setup()
             ['value' => 'general/store_information/city', 'label' => __('City')],
             ['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
             ['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+            ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
         ];
     }
 

app/code/Magento/Email/i18n/en_US.csv

@@ -54,6 +54,7 @@ Region/State,Region/State
 City,City
 "Street Address 1","Street Address 1"
 "Street Address 2","Street Address 2"
+"VAT Number","VAT Number"
 "Store Contact Information","Store Contact Information"
 %1,%1
 "Template Variables","Template Variables"

pub/errors/processor.php

@@ -203,7 +203,7 @@ public function process503()
     public function processReport()
     {
         $this->pageTitle = 'There has been an error processing your request';
-        $this->_response->setHttpResponseCode(503);
+        $this->_response->setHttpResponseCode(500);
 
         $this->showErrorMsg = false;
         $this->showSentMsg  = false;