Merge pull request #781 from boboldehampsink/fix-product-type-sources

Fix Product Type sources
craftcms · Mar 13, 2019 · 7dd97a3 · 7dd97a3
2 parents 7c66694 + cee7edf
commit 7dd97a3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/elements/Product.php b/src/elements/Product.php
@@ -938,7 +938,7 @@ protected static function defineSources(string $context = null): array
         $sources[] = ['heading' => Craft::t('commerce', 'Product Types')];
 
         foreach ($productTypes as $productType) {
-            $key = 'productType:' . $productType->id;
+            $key = 'productType:' . $productType->uid;
             $canEditProducts = Craft::$app->getUser()->checkPermission('commerce-manageProductType:' . $productType->uid);
 
             $sources[$key] = [
@@ -972,6 +972,12 @@ protected static function defineActions(string $source = null): array
                     if (preg_match('/^productType:(\d+)$/', $source, $matches)) {
                         $productType = Plugin::getInstance()->getProductTypes()->getProductTypeById($matches[1]);
 
+                        if ($productType) {
+                            $productTypes = [$productType];
+                        }
+                    } else if (preg_match('/^productType:(.+)$/', $source, $matches)) {
+                        $productType = Plugin::getInstance()->getProductTypes()->getProductTypeByUid($matches[1]);
+
                         if ($productType) {
                             $productTypes = [$productType];
                         }

diff --git a/src/services/ProductTypes.php b/src/services/ProductTypes.php
@@ -23,6 +23,7 @@
 use craft\events\FieldEvent;
 use craft\events\SiteEvent;
 use craft\helpers\App;
+use craft\helpers\ArrayHelper;
 use craft\helpers\Db;
 use craft\helpers\ProjectConfig as ProjectConfigHelper;
 use craft\helpers\StringHelper;
@@ -782,6 +783,17 @@ public function getProductTypeById(int $productTypeId)
         return $this->_productTypesById[$productTypeId];
     }
 
+    /**
+     * Returns a product type by its UID.
+     *
+     * @param string $uid the product type's UID
+     * @return ProductType|null either the product type or `null`
+     */
+    public function getProductTypeByUid(string $uid)
+    {
+        return ArrayHelper::firstWhere($this->getAllProductTypes(), 'uid', $uid, true);
+    }
+
     /**
      * Returns whether a product type’s products have URLs, and if the template path is valid.
      *

diff --git a/src/templates/products/_index.html b/src/templates/products/_index.html
@@ -15,7 +15,7 @@
 
     Craft.Commerce.editableProductTypes = [
         {% for productType in craft.commerce.productTypes.editableProductTypes %}
-            {id: {{ productType.id }}, name: "{{ productType.name|t('commerce')|e('js') }}", handle: "{{ productType.handle|e('js') }}"}{% if not loop.last %},{% endif %}
+            {id: "{{ productType.uid }}", name: "{{ productType.name|t('commerce')|e('js') }}", handle: "{{ productType.handle|e('js') }}"}{% if not loop.last %},{% endif %}
         {% endfor %}
     ];