Fix #16

CHANGELOG.md

@@ -12,6 +12,7 @@ Changelog
 - Fixed a bug where product element slugs would not work. ([#9](https://github.com/craftcms/commerce-digital-products/issues/9))
 - Fixed a bug where querying for licenses would not work in some cases. ([#11](https://github.com/craftcms/commerce-digital-products/issues/11))
 - Fixed a bug where it was impossible to delete a product. ([#12](https://github.com/craftcms/commerce-digital-products/issues/12))
+- Fixed a bug where template path and product type URI format generator would not work correctly. ([#16](https://github.com/craftcms/commerce-digital-products/issues/16))
 
 ### Added
 - Added `craft\digitalproducts\models\ProductTypeSite::getSite()`

src/controllers/ProductTypesController.php

@@ -50,16 +50,22 @@ public function actionEdit(int $productTypeId = null, ProductType $productType =
  'productType' => $productType,
  ];
 
+ $variables['brandNewProductType'] = false;
+
  if (empty($variables['productType'])) {
- $productType = $productTypeId ? DigitalProducts::getInstance()->getProductTypes()->getProductTypeById($productTypeId) : new ProductType();
+ if (!empty($variables['productTypeId'])) {
+ $productTypeId = $variables['productTypeId'];
+ $variables['productType'] = DigitalProducts::getInstance()->getProductTypes()->getProductTypeById($productTypeId);
 
- if (!$productType) {
- throw new Exception('Product type not found.');
+ if (!$variables['productType']) {
+ throw new HttpException(404);
+ }
+ } else {
+ $variables['productType'] = new ProductType();
+ $variables['brandNewProductType'] = true;
  }
-
- $variables['productType'] = $productType;
  }
- 
+
  $variables['title'] = $variables['productType']->id ? $variables['productType']->name : Craft::t('digital-products', 'Create a new digital product type');
 
  return $this->renderTemplate('digital-products/producttypes/_edit', $variables);

src/templates/producttypes/_edit.html

@@ -143,12 +143,13 @@
 
 {% endblock %}
 
-{% includejs %}
- {% if not productType.handle %}new Craft.HandleGenerator('#name', '#handle');{% endif %}
-
- {% for site in craft.app.sites.getAllSites() %}
- new Craft.UriFormatGenerator('#name', '#sites tr[data-id="{{ site.handle }}"] textarea[name$="[uriFormat]"]', { suffix: '/{slug}' });
- new Craft.UriFormatGenerator('#name', '#sites tr[data-id="{{ site.handle }}"] textarea[name$="[template]"]', { suffix: '/_product' });
- {% endfor %}
-
-{% endincludejs %}
+{% if brandNewProductType %}
+ {% js %}
+ new Craft.HandleGenerator('#name', '#handle');
+
+ {% for site in craft.app.sites.getAllSites() %}
+ new Craft.UriFormatGenerator('#name', '#sites tr[data-id="{{ site.handle }}"] textarea[name$="[uriFormat]"]', { suffix: '/{slug}' });
+ new Craft.UriFormatGenerator('#name', '#sites tr[data-id="{{ site.handle }}"] textarea[name$="[template]"]', { suffix: '/_product' });
+ {% endfor %}
+ {% endjs %}
+{% endif %}