ACP2E-3336: Stock alert email translation to the wrong language

Author: machado-thiago-adobe

app/code/Magento/ProductAlert/Model/Mailing/AlertProcessor.php

@@ -151,50 +151,59 @@ private function processAlerts(string $alertType, array $customerIds, int $websi
         $email->setWebsiteId($websiteId);
         $errors = [];
 
-        try {
-            $collection = $this->getAlertCollection($alertType, $customerIds, $websiteId);
-        } catch (\Exception $e) {
-            $errors[] = $e->getMessage();
-            return $errors;
-        }
-
-        /** @var CustomerInterface $customer */
-        $customer = null;
         /** @var Website $website */
         $website = $this->storeManager->getWebsite($websiteId);
-        $defaultStoreId = $website->getDefaultStore()->getId();
-        $products = [];
 
-        /** @var Price|Stock $alert */
-        foreach ($collection as $alert) {
-            try {
-                if ($alert->getStoreId()) {
-                    $email->setStoreId($alert->getStoreId());
-                }
+        foreach ($website->getStores() as $store) {
+            /** @var CustomerInterface $customer */
+            $customer = null;
+            $products = [];
+            $storeId = (int)$store->getId();
+            $email->setStoreId($storeId);
 
-                if ($customer === null || (int)$customer->getId() !== (int)$alert->getCustomerId()) {
-                    $customer = $this->customerRepository->getById($alert->getCustomerId());
-                }
+            try {
+                $collection = $this->getAlertCollection($alertType, $customerIds, $websiteId, $storeId);
+            } catch (\Exception $e) {
+                $errors[] = $e->getMessage();
+                return $errors;
+            }
 
-                if (!isset($products[$alert->getProductId()])) {
-                    $product = $this->productRepository->getById($alert->getProductId(), false, $defaultStoreId, true);
-                    $products[$alert->getProductId()] = $product;
-                } else {
-                    $product = $products[$alert->getProductId()];
+            /** @var Price|Stock $alert */
+            foreach ($collection as $alert) {
+                try {
+                    if ($customer === null) {
+                        $customer = $this->customerRepository->getById($alert->getCustomerId());
+                    } elseif ((int)$customer->getId() !== (int)$alert->getCustomerId()) {
+                        $this->sendEmail($customer, $email);
+                        $customer = $this->customerRepository->getById($alert->getCustomerId());
+                    }
+
+                    if (!isset($products[$alert->getProductId()])) {
+                        $product = $this->productRepository->getById($alert->getProductId(), false, $storeId, true);
+                        $products[$alert->getProductId()] = $product;
+                    } else {
+                        $product = $products[$alert->getProductId()];
+                    }
+
+                    switch ($alertType) {
+                        case self::ALERT_TYPE_STOCK:
+                            $this->saveStockAlert($alert, $product, $website, $email);
+                            break;
+                        case self::ALERT_TYPE_PRICE:
+                            $this->savePriceAlert($alert, $product, $customer, $email);
+                            break;
+                    }
+                } catch (\Exception $e) {
+                    $errors[] = $e->getMessage();
                 }
+            }
 
-                switch ($alertType) {
-                    case self::ALERT_TYPE_STOCK:
-                        $this->saveStockAlert($alert, $product, $website, $email);
-                        break;
-                    case self::ALERT_TYPE_PRICE:
-                        $this->savePriceAlert($alert, $product, $customer, $email);
-                        break;
+            if ($customer !== null) {
+                try {
+                    $this->sendEmail($customer, $email);
+                } catch (\Exception $e) {
+                    $errors[] = $e->getMessage();
                 }
-
-                $this->sendEmail($customer, $email);
-            } catch (\Exception $e) {
-                $errors[] = $e->getMessage();
             }
         }
 
@@ -220,24 +229,27 @@ private function validateAlertType(string $alertType): void
      * @param string $alertType
      * @param array $customerIds
      * @param int $websiteId
+     * @param int $storeId
      * @return AbstractCollection
      * @throws \InvalidArgumentException
      */
-    private function getAlertCollection(string $alertType, array $customerIds, int $websiteId): AbstractCollection
+    private function getAlertCollection(string $alertType, array $customerIds, int $websiteId, int $storeId): AbstractCollection
     {
         switch ($alertType) {
             case self::ALERT_TYPE_STOCK:
                 $collection = $this->stockCollectionFactory->create();
                 $collection->addFieldToFilter('customer_id', ['in' => $customerIds])
                     ->addWebsiteFilter($websiteId)
                     ->addStatusFilter(0)
+                    ->addFilter('store_id', $storeId)
                     ->setCustomerOrder()
                     ->addOrder('product_id');
                 break;
             case self::ALERT_TYPE_PRICE:
                 $collection = $this->priceCollectionFactory->create();
                 $collection->addFieldToFilter('customer_id', ['in' => $customerIds])
                     ->addWebsiteFilter($websiteId)
+                    ->addFilter('store_id', $storeId)
                     ->setCustomerOrder()
                     ->addOrder('product_id');
                 break;