From 78af4af6fdc7bf15c408838060b4f26cced93a96 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 20 Nov 2024 18:06:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?Add=20=E2=80=98None=E2=80=99=20support=20fo?=
 =?UTF-8?q?r=20Category=20Form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/class-convertkit-output.php |  8 +++++++-
 includes/class-convertkit-term.php   | 13 +++++++++++++
 views/backend/term/fields-add.php    |  4 ++++
 views/backend/term/fields-edit.php   |  4 ++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/includes/class-convertkit-output.php b/includes/class-convertkit-output.php
index 69cb16bb..e6d4df15 100644
--- a/includes/class-convertkit-output.php
+++ b/includes/class-convertkit-output.php
@@ -652,9 +652,15 @@ private function get_post_form_id( $post_id ) {
 			if ( $term_settings->has_form() ) {
 				return $term_settings->get_form();
 			}
+
+			// If the Term specifies that no Form should be used, return false.
+			if ( $term_settings->uses_no_form() ) {
+				return false;
+			}
 		}
 
-		// If here, use the Plugin's Default Form.
+		// If here, all Terms were set to display the Default Form.
+		// Therefore use the Plugin's Default Form.
 		return $this->settings->get_default_form( get_post_type( $post_id ) );
 
 	}
diff --git a/includes/class-convertkit-term.php b/includes/class-convertkit-term.php
index 7c99bbaa..57278919 100644
--- a/includes/class-convertkit-term.php
+++ b/includes/class-convertkit-term.php
@@ -113,6 +113,19 @@ public function uses_default_form() {
 
 	}
 
+	/**
+	 * Whether the Post's Form setting is set to 'None'
+	 *
+	 * @since   2.6.6
+	 *
+	 * @return  bool
+	 */
+	public function uses_no_form() {
+
+		return ( $this->settings['form'] === 0 );
+
+	}
+
 	/**
 	 * Returns the form position setting for the Term
 	 * on the Term archive.
diff --git a/views/backend/term/fields-add.php b/views/backend/term/fields-add.php
index 21d58bb8..fb46ace4 100644
--- a/views/backend/term/fields-add.php
+++ b/views/backend/term/fields-add.php
@@ -21,6 +21,7 @@
 			'-1',
 			array(
 				'-1' => esc_html__( 'Default', 'convertkit' ),
+				'0' => esc_html__( 'None', 'convertkit' ),
 			)
 		);
 		?>
@@ -32,6 +33,9 @@
 			<code><?php esc_html_e( 'Default', 'convertkit' ); ?></code>
 			<?php esc_html_e( ': Display a form based on the Post\'s settings.', 'convertkit' ); ?>
 			<br />
+				<code><?php esc_html_e( 'None', 'convertkit' ); ?></code>
+				<?php esc_html_e( ': do not display a form.', 'convertkit' ); ?>
+				<br />
 			<?php
 			printf(
 				/* translators: Taxonomy Name */
diff --git a/views/backend/term/fields-edit.php b/views/backend/term/fields-edit.php
index dde19fd0..99d69644 100644
--- a/views/backend/term/fields-edit.php
+++ b/views/backend/term/fields-edit.php
@@ -23,6 +23,7 @@
 				esc_attr( $convertkit_term->get_form() ),
 				array(
 					'-1' => esc_html__( 'Default', 'convertkit' ),
+					'0' => esc_html__( 'None', 'convertkit' ),
 				)
 			);
 			?>
@@ -34,6 +35,9 @@
 				<code><?php esc_html_e( 'Default', 'convertkit' ); ?></code>
 				<?php esc_html_e( ': Display a form based on the Post\'s settings.', 'convertkit' ); ?>
 				<br />
+				<code><?php esc_html_e( 'None', 'convertkit' ); ?></code>
+				<?php esc_html_e( ': do not display a form.', 'convertkit' ); ?>
+				<br />
 				<?php
 				printf(
 					/* translators: Taxonomy Name */

From ac2e2c009619b98341bef4813dd4414eff4f6f1d Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 20 Nov 2024 18:22:37 +0800
Subject: [PATCH 2/5] Added Tests

---
 .../forms/general/CategoryFormCest.php        | 131 ++++++++++++++++++
 views/backend/term/fields-add.php             |   2 +-
 views/backend/term/fields-edit.php            |   2 +-
 3 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/forms/general/CategoryFormCest.php b/tests/acceptance/forms/general/CategoryFormCest.php
index 134e4711..a07802f0 100644
--- a/tests/acceptance/forms/general/CategoryFormCest.php
+++ b/tests/acceptance/forms/general/CategoryFormCest.php
@@ -82,6 +82,67 @@ public function testAddCategoryWithValidFormSetting(AcceptanceTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
+	/**
+	 * Test that no Form is displayed when the user:
+	 * - Creates a Category in WordPress, selecting 'None' as the ConvertKit Form to display,
+	 * - Creates a WordPress Post assigned to the created Category.
+	 *
+	 * @since   2.6.6
+	 *
+	 * @param   AcceptanceTester $I  Tester.
+	 */
+	public function testAddCategoryWithNoFormSetting(AcceptanceTester $I)
+	{
+		// Navigate to Posts > Categories.
+		$I->amOnAdminPage('edit-tags.php?taxonomy=category');
+
+		// Confirm that settings have label[for] attributes.
+		$I->seeInSource('<label for="wp-convertkit-form">');
+
+		// Create Category.
+		$I->fillField('tag-name', 'Kit: Create Category: None');
+		$I->fillSelect2Field($I, '#select2-wp-convertkit-form-container', 'None');
+
+		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			'#wp-convertkit-form',
+			[
+				'Default',
+				'None',
+			]
+		);
+
+		// Save.
+		$I->click('Add New Category');
+
+		// Confirm Category saved.
+		$I->waitForElementVisible('.notice-success');
+
+		// Get the Category ID from the table.
+		$termID = (int) str_replace( 'tag-', '', $I->grabAttributeFrom('#the-list tr:first-child', 'id') );
+
+		// Create Post, assigned to ConvertKit Category.
+		$postID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'post',
+				'post_title' => 'Kit: Inherit None Form from Add Category',
+				'tax_input'  => [
+					[ 'category' => (int) $termID ],
+				],
+			]
+		);
+
+		// Load the Post on the frontend site.
+		$I->amOnPage('/?p=' . $postID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that no ConvertKit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
 	/**
 	 * Test that the expected Form is displayed when the user:
 	 * - Edits an existing Category in WordPress, selecting the ConvertKit Form to display,
@@ -152,6 +213,76 @@ public function testEditCategoryWithValidFormSetting(AcceptanceTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
+	/**
+	 * Test that no Form is displayed when the user:
+	 * - Edits an existing Category in WordPress, selecting the 'None' ConvertKit Form option,
+	 * - Creates a WordPress Post assigned to the edited Category.
+	 *
+	 * @since   2.6.6
+	 *
+	 * @param   AcceptanceTester $I  Tester.
+	 */
+	public function testEditCategoryWithNoFormSetting(AcceptanceTester $I)
+	{
+		// Create Category.
+		$termID = $I->haveTermInDatabase( 'Kit: Edit Category: None', 'category' );
+		$termID = $termID[0];
+
+		// Create Post, assigned to ConvertKit Category.
+		$postID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'post',
+				'post_title' => 'Kit: Inherit No Form from Edit Category',
+				'tax_input'  => [
+					[ 'category' => (int) $termID ],
+				],
+			]
+		);
+
+		// Edit the Term, defining a Form.
+		$I->amOnAdminPage('term.php?taxonomy=category&tag_ID=' . $termID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that settings have label[for] attributes.
+		$I->seeInSource('<label for="wp-convertkit-form">');
+
+		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			'#wp-convertkit-form',
+			[
+				'Default',
+				'None',
+			]
+		);
+
+		// Change Form to None.
+		$I->fillSelect2Field($I, '#select2-wp-convertkit-form-container', 'None');
+
+		// Click Update.
+		$I->click('Update');
+
+		// Wait for the page to load.
+		$I->waitForElementVisible('#wpfooter');
+
+		// Check that the update succeeded.
+		$I->seeElementInDOM('div.notice-success');
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Load the Post on the frontend site.
+		$I->amOnPage('/?p=' . $postID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that no ConvertKit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
 	/**
 	 * Test that the expected Form is displayed on the Category archive above the Posts
 	 * when the user:
diff --git a/views/backend/term/fields-add.php b/views/backend/term/fields-add.php
index fb46ace4..9930fcba 100644
--- a/views/backend/term/fields-add.php
+++ b/views/backend/term/fields-add.php
@@ -21,7 +21,7 @@
 			'-1',
 			array(
 				'-1' => esc_html__( 'Default', 'convertkit' ),
-				'0' => esc_html__( 'None', 'convertkit' ),
+				'0'  => esc_html__( 'None', 'convertkit' ),
 			)
 		);
 		?>
diff --git a/views/backend/term/fields-edit.php b/views/backend/term/fields-edit.php
index 99d69644..b2c4f655 100644
--- a/views/backend/term/fields-edit.php
+++ b/views/backend/term/fields-edit.php
@@ -23,7 +23,7 @@
 				esc_attr( $convertkit_term->get_form() ),
 				array(
 					'-1' => esc_html__( 'Default', 'convertkit' ),
-					'0' => esc_html__( 'None', 'convertkit' ),
+					'0'  => esc_html__( 'None', 'convertkit' ),
 				)
 			);
 			?>

From 980ab3f551304258b316e7b18a120d50758dd866 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 21 Nov 2024 09:30:56 +0800
Subject: [PATCH 3/5] Tests: Improve test method names

---
 tests/acceptance/forms/general/CategoryFormCest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/forms/general/CategoryFormCest.php b/tests/acceptance/forms/general/CategoryFormCest.php
index a07802f0..78187cc4 100644
--- a/tests/acceptance/forms/general/CategoryFormCest.php
+++ b/tests/acceptance/forms/general/CategoryFormCest.php
@@ -91,7 +91,7 @@ public function testAddCategoryWithValidFormSetting(AcceptanceTester $I)
 	 *
 	 * @param   AcceptanceTester $I  Tester.
 	 */
-	public function testAddCategoryWithNoFormSetting(AcceptanceTester $I)
+	public function testAddCategoryWithNoneFormSetting(AcceptanceTester $I)
 	{
 		// Navigate to Posts > Categories.
 		$I->amOnAdminPage('edit-tags.php?taxonomy=category');
@@ -222,7 +222,7 @@ public function testEditCategoryWithValidFormSetting(AcceptanceTester $I)
 	 *
 	 * @param   AcceptanceTester $I  Tester.
 	 */
-	public function testEditCategoryWithNoFormSetting(AcceptanceTester $I)
+	public function testEditCategoryWithNoneFormSetting(AcceptanceTester $I)
 	{
 		// Create Category.
 		$termID = $I->haveTermInDatabase( 'Kit: Edit Category: None', 'category' );

From 841dcb82a813b2b408f14371867fd8050a39b3bc Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 21 Nov 2024 12:09:00 +0800
Subject: [PATCH 4/5] Fix failing tests

---
 tests/acceptance/forms/general/CategoryFormCest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/acceptance/forms/general/CategoryFormCest.php b/tests/acceptance/forms/general/CategoryFormCest.php
index 78187cc4..2e387648 100644
--- a/tests/acceptance/forms/general/CategoryFormCest.php
+++ b/tests/acceptance/forms/general/CategoryFormCest.php
@@ -48,6 +48,7 @@ public function testAddCategoryWithValidFormSetting(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);
 
@@ -184,6 +185,7 @@ public function testEditCategoryWithValidFormSetting(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);
 
@@ -441,6 +443,7 @@ public function testEditCategoryWithFormPositionBefore(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);
 
@@ -521,6 +524,7 @@ public function testEditCategoryWithFormPositionAfter(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);
 

From d66d9b4ecde1154c1f1365479b4b33ea5ee8c52a Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 21 Nov 2024 13:40:30 +0800
Subject: [PATCH 5/5] Fix failing tests

---
 tests/acceptance/general/RefreshResourcesButtonCest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/acceptance/general/RefreshResourcesButtonCest.php b/tests/acceptance/general/RefreshResourcesButtonCest.php
index bdd41444..43b78b14 100644
--- a/tests/acceptance/general/RefreshResourcesButtonCest.php
+++ b/tests/acceptance/general/RefreshResourcesButtonCest.php
@@ -300,6 +300,7 @@ public function testRefreshResourcesOnAddCategory(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);
 
@@ -339,6 +340,7 @@ public function testRefreshResourcesOnEditCategory(AcceptanceTester $I)
 			'#wp-convertkit-form',
 			[
 				'Default',
+				'None',
 			]
 		);