Merge pull request #292 from AcclaroInc/hotfix/tag-issue

fix: tag labels missing after adding entry on create order
AcclaroInc · Jan 14, 2022 · 818f27a · 818f27a
2 parents 385a9ff + 58a8df6
commit 818f27a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/src/controllers/OrderController.php b/src/controllers/OrderController.php
@@ -156,14 +156,6 @@ public function actionOrderDetail(array $variables = array())
 				$order->targetSites = json_encode($orderTargetSites);
 			}
 
-			if (! empty(json_decode($order->tags, true))) {
-				$variables['tags'] = [];
-
-				foreach (json_decode($order->tags, true) as $tagId) {
-					$variables['tags'][] = Craft::$app->getTags()->getTagById($tagId);
-				}
-			}
-
 			if ($orderTags= Craft::$app->getRequest()->getQueryParam('tags') ?? Craft::$app->getRequest()->getParam('tags')) {
 				if (! is_array($orderTags)) {
 					$orderTags = explode(',', $orderTags);

diff --git a/src/elements/Order.php b/src/elements/Order.php
@@ -534,6 +534,11 @@ public function getOwner()
         return $owner;
     }
 
+	public function getTags()
+	{
+        return Translations::$plugin->tagRepository->getOrderTags($this);
+	}
+
     public function getTargetSitesArray()
     {
         return $this->targetSites ? json_decode($this->targetSites, true) : array();

diff --git a/src/services/repository/TagRepository.php b/src/services/repository/TagRepository.php
@@ -12,6 +12,7 @@
 
 use Craft;
 use craft\elements\Tag;
+use acclaro\translations\elements\Order;
 
 class TagRepository
 {
@@ -31,4 +32,22 @@ public function saveTag(Tag $tag)
             Craft::error( '['. __METHOD__ .'] Couldn’t save the tag "'.$tag->title.'"', 'translations' );
         }
     }
-}
+
+	/**
+	 * Get Tags Object for an order
+	 *
+	 * @param Order $order
+	 * @return array
+	 */
+	public function getOrderTags(Order $order)
+	{
+		$orderTags = [];
+		if ($order->tags) {
+			foreach (json_decode($order->tags, true) as $tagId) {
+				$orderTags[$tagId] = Craft::$app->getTags()->getTagById($tagId);
+			}
+		}
+
+		return $orderTags;
+	}
+}
diff --git a/src/templates/_components/orders/settings-tab.twig b/src/templates/_components/orders/settings-tab.twig
@@ -248,8 +248,8 @@
 							<div class="input ltr">
 								<div id="fields-tags" class="elementselect tagselect">
 									<div id="elementTags" class="elements">
-										{% if tags is defined %}
-											{% for tag in tags %}
+										{% if not order.getTags is empty %}
+											{% for tag in order.getTags %}
 												<div class="element small removable" data-editable="1" data-id="{{ tag.id }}" data-label="{{ tag.title }}">
 													<input type="hidden" name="tags[]" value="{{ tag.id }}"/>
 													<a class="delete icon custom-tag" data-label="{{ tag.title }}" data-id="{{ tag.id }}" title="Remove"></a>