Merge pull request #431 from AcclaroInc/release/3.2.5

Release/3.2.5

.craftplugin

@@ -1,7 +1,7 @@
 {
     "pluginName": "Translations for Craft",
     "pluginDescription": "Drive global growth with simplified translation workflows.",
-    "pluginVersion": "3.2.4",
+    "pluginVersion": "3.2.5",
     "pluginAuthorName": "Acclaro",
     "pluginVendorName": "Acclaro",
     "pluginAuthorUrl": "http://www.acclaro.com/",

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.2.5 - 2023-04-15
+
+### Fixed
+- An issue where merging changes to draft throwing error when commerce product/variant are referenced inside another commerce product/variant.
+
 ## 3.2.4 - 2023-04-05
 
 ### Fixed

src/services/ElementTranslator.php

@@ -20,6 +20,7 @@
 use acclaro\translations\Constants;
 use acclaro\translations\Translations;
 use craft\commerce\elements\Product;
+use craft\fields\Color;
 
 class ElementTranslator
 {
@@ -164,7 +165,18 @@ public function toPostArrayFromTranslationTarget(Element $element, $sourceSite,
             $translator = Translations::$plugin->fieldTranslatorFactory->makeTranslator($fieldType);
 
             if (!$translator) {
-                if ($includeNonTranslatable) {
+                // @TODO: Might need to move these check to seprate class to fetch nested content of variants
+                if ($field instanceof Color) {
+                    $post[$fieldHandle] = $element->getFieldValue($fieldHandle)?->getHex() ?? '';
+                } elseif (in_array(get_class($field), ['craft\commerce\fields\Variants', 'craft\commerce\fields\Products'])) {
+                    if (! isset($post[$fieldHandle])) {
+                        $post[$fieldHandle] = [];
+                    }
+
+                    foreach ($element->getFieldValue($fieldHandle)->all() as $variant) {
+                        array_push($post[$fieldHandle], $variant->id);
+                    }
+                } elseif ($includeNonTranslatable) {
                     $post[$fieldHandle] = $element->$fieldHandle;
                 }
 

src/services/repository/CommerceRepository.php

@@ -219,7 +219,7 @@ public function publishDraft(Product $draft)
         $product->setFieldValues($post);
         $product->setVariants($draft->getVariants(true));
 
-        $success = Craft::$app->elements->saveElement($product);
+        $success = Craft::$app->elements->saveElement($product, false);
 
         if (!$success) {
             Translations::$plugin->logHelper->log('[' . __METHOD__ . '] Couldn’t publish draft "' . $draft->title . '"', Constants::LOG_LEVEL_ERROR);