2.1.0.2 - Fixed more template loading errors (#751)

CHANGELOG-v2.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce 2.x
 
+## 2.1.0.2 - 2019-02-25
+
+### Fixed
+- Fixed more template loading errors on Commerce settings pages. ([#751](https://github.com/craftcms/commerce/issues/751))
+
 ## 2.1.0.1 - 2019-02-25
 
 ### Fixed

composer.json

@@ -2,7 +2,7 @@
   "name": "craftcms/commerce",
   "description": "Craft Commerce",
   "type": "craft-plugin",
-  "version": "2.1.0.1",
+  "version": "2.1.0.2",
   "keywords": [
     "cms",
     "craftcms",

src/elements/Donation.php

@@ -105,7 +105,7 @@ public function getIsEditable(): bool
      */
     public function getCpEditUrl(): string
     {
-        return UrlHelper::cpUrl('commerce/settings/donation');
+        return UrlHelper::cpUrl('commerce/store-settings/donation');
     }
 
     /**

src/models/State.php

@@ -63,7 +63,7 @@ public function rules()
      */
     public function getCpEditUrl(): string
     {
-        return UrlHelper::cpUrl('commerce/settings/states/' . $this->id);
+        return UrlHelper::cpUrl('commerce/store-settings/states/' . $this->id);
     }
 
     /**

src/models/TaxAddressZone.php

@@ -77,7 +77,7 @@ class TaxAddressZone extends Model implements AddressZoneInterface
      */
     public function getCpEditUrl(): string
     {
-        return UrlHelper::cpUrl('commerce/settings/taxzones/' . $this->id);
+        return UrlHelper::cpUrl('commerce/tax/taxzones/' . $this->id);
     }
 
     /**

src/models/TaxCategory.php

@@ -90,7 +90,7 @@ public function getTaxRates(): array
      */
     public function getCpEditUrl(): string
     {
-        return UrlHelper::cpUrl('commerce/settings/taxcategories/' . $this->id);
+        return UrlHelper::cpUrl('commerce/tax/taxcategories/' . $this->id);
     }
 
     /**

src/models/TaxRate.php

@@ -102,7 +102,7 @@ public function rules()
      */
     public function getCpEditUrl(): string
     {
-        return UrlHelper::cpUrl('commerce/settings/taxrates/' . $this->id);
+        return UrlHelper::cpUrl('commerce/tax/taxrates/' . $this->id);
     }
 
     /**

src/templates/_layouts/shipping.html

@@ -28,7 +28,7 @@
                     <li class="heading"><span>{{ item.heading }}</span></li>
                 {% else %}
                     <li>
-                        <a href="{{ url('commerce/settings/'~handle) }}"{% if handle == selectedItem %} class="sel"{% endif %}>{{ item.title }}</a>
+                        <a href="{{ url('commerce/shipping/'~handle) }}"{% if handle == selectedItem %} class="sel"{% endif %}>{{ item.title }}</a>
                     </li>
                 {% endif %}
             {% endfor %}

src/templates/_layouts/tax.html

@@ -28,7 +28,7 @@
                     <li class="heading"><span>{{ item.heading }}</span></li>
                 {% else %}
                     <li>
-                        <a href="{{ url('commerce/settings/'~handle) }}"{% if handle == selectedItem %} class="sel"{% endif %}>{{ item.title }}</a>
+                        <a href="{{ url('commerce/tax/'~handle) }}"{% if handle == selectedItem %} class="sel"{% endif %}>{{ item.title }}</a>
                     </li>
                 {% endif %}
             {% endfor %}

src/templates/index.html

@@ -15,7 +15,7 @@
 {% endif %}
 
 {% if currentUser.can('commerce-manageTaxes') %}
-{% redirect 'commerce/settings/taxrates' %}
+{% redirect 'commerce/tax/taxrates' %}
 {% endif %}
 
 {% extends "403" %}

src/templates/store-settings/countries/_edit.html

@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },
-    { label: "Countries"|t('commerce'), url: url('commerce/settings/countries') },
+    { label: "Countries"|t('commerce'), url: url('commerce/store-settings/countries') },
 ] %}
 
 {% set fullPageForm = true %}

src/templates/store-settings/countries/index.html

@@ -40,7 +40,7 @@ <h2>{{ "Countries"|t('commerce') }}</h2>
     {% endif %}
 
     <div class="buttons">
-        <a href="{{ url('commerce/settings/countries/new') }}"
+        <a href="{{ url('commerce/store-settings/countries/new') }}"
            class="btn submit add icon">{{ 'New country'|t('commerce') }}</a>
     </div>
 {% endblock %}

src/templates/store-settings/paymentcurrencies/_edit.html

@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },
-    { label: "Currencies"|t('commerce'), url: url('commerce/settings/paymentcurrencies') },
+    { label: "Currencies"|t('commerce'), url: url('commerce/store-settings/paymentcurrencies') },
 ] %}
 
 {% set fullPageForm = true %}

src/templates/store-settings/states/_edit.html

@@ -2,7 +2,7 @@
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },
-    { label: "States"|t('commerce'), url: url('commerce/settings/states') },
+    { label: "States"|t('commerce'), url: url('commerce/store-settings/states') },
 ] %}
 
 {% set fullPageForm = true %}

src/templates/store-settings/states/index.html

@@ -37,7 +37,7 @@ <h2>{{ "States"|t('commerce') }}</h2>
     {% endif %}
 
     <div class="buttons">
-        <a href="{{ url('commerce/settings/states/new') }}"
+        <a href="{{ url('commerce/store-settings/states/new') }}"
            class="btn submit add icon">{{ 'New state'|t('commerce') }}</a>
     </div>
 {% endblock %}