Fixed #751

craftcms · Feb 25, 2019 · 327769f · 327769f
1 parent 8be5072
commit 327769f
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG-v2.md b/CHANGELOG-v2.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce 2.x
 
+## Unreleased
+
+### Fixed
+- Fixed some template loading errors on Commerce settings pages. ([#751](https://github.com/craftcms/commerce/issues/751))
+
 ## 2.1.0 - 2019-02-26
 
 ### Added

diff --git a/src/templates/settings/emails/_edit.html b/src/templates/settings/emails/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/settings/gateways/_edit.html b/src/templates/settings/gateways/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/settings/orderstatuses/_edit.html b/src/templates/settings/orderstatuses/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: 'Commerce ' ~ 'Settings'|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/settings/producttypes/_edit.html b/src/templates/settings/producttypes/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 {% set title = productType.id ? productType.name : 'Create a new product type'|t('commerce') %}
 
 {% set crumbs = [

diff --git a/src/templates/settings/subscriptions/_editPlan.html b/src/templates/settings/subscriptions/_editPlan.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 {% set title = brandNewPlan ? 'Create a new subscription plan'|t('commerce') : plan.name %}
 
 {% set crumbs = [

diff --git a/src/templates/shipping/shippingcategories/_edit.html b/src/templates/shipping/shippingcategories/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce " ~ "Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/shipping/shippingmethods/_edit.html b/src/templates/shipping/shippingmethods/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/shipping/shippingrules/_edit.html b/src/templates/shipping/shippingrules/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/shipping/shippingzones/_edit.html b/src/templates/shipping/shippingzones/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/tax/taxcategories/_edit.html b/src/templates/tax/taxcategories/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/tax/taxrates/_edit.html b/src/templates/tax/taxrates/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },

diff --git a/src/templates/tax/taxzones/_edit.html b/src/templates/tax/taxzones/_edit.html
@@ -1,4 +1,4 @@
-{% extends "commerce/_layouts/settingscp" %}
+{% extends "commerce/_layouts/cp" %}
 
 {% set crumbs = [
     { label: "Commerce Settings"|t('commerce'), url: url('commerce/settings') },