Merge pull request #168 from WebDevStudios/release210

Release 2.1.0

Author: tw2113

.wordpress-org/screenshot-5.png

@@ -1,9 +1,9 @@
 === Constant Contact + WooCommerce ===
-Contributors: constantcontact, webdevstudios, znowebdev, jmichaelward, ggwicz, ravedev
+Contributors: constantcontact, webdevstudios, znowebdev, jmichaelward, ggwicz, ravedev, newyorkerlaura
 Tags: Constant Contact, WooCommerce, eCommerce, email marketing, marketing automation, email, form, forms, marketing, mobile, opt-in, plugin, signup, subscribe, subscription, widget
 Requires at least: 5.2.2
-Tested up to: 6.0.2
-Stable tag: 2.0.3
+Tested up to: 6.2.0
+Stable tag: 2.1.0
 Requires PHP: 7.2
 License: GPLv3
 
@@ -53,6 +53,8 @@ https://www.youtube.com/watch?v=ZH9G4yhAngk
 2. Edit the details of your product.
 3. Pre-filtered segmented lists.
 4. Syncing status for contacts.
+5. Settings Page in WordPress
+6. Before and after connecting account.
 
 #### Overall WooCommerce and Constant Contact Guide
 Our WooCommerce integration is designed to help make your email marketing even easier. You can automatically sync your WooCommerce contacts right into your Constant Contact account, promote your products and services in emails, and recover lost revenue with automated abandoned cart emails!
@@ -80,26 +82,32 @@ You've connected your WooCommerce store to Constant Contact, promoted your WooCo
 [Learn more with our step-by-step revenue reporting guide.](https://knowledgebase.constantcontact.com/articles/KnowledgeBase/36892-View-Recovered-Revenue-from-the-WooCommerce-Abandoned-Cart-Reminder-Email?q=woocommerce*&lang=en_US)
 
 == Changelog ==
+
+= 2.1.0 =
+* Added - Logging to help troubleshoot potential issues.
+* Updates - Store a bit more customer information for abandoned cart reachout purposes.
+* Updates - URLs used during the connection process and account associations.
+
 = 2.0.3 =
 
-* Fix - Minor design fixes, bug fixes and stability improvements. 
+* Fix - Minor design fixes, bug fixes and stability improvements.
 
 = 2.0.2 =
 
-* Fix - Minor bug fixes and stability improvements. 
+* Fix - Minor bug fixes and stability improvements.
 
 = 2.0.1 =
 
-* Fix - Fixed an issue with notice not working when ssl is found. 
-* Fix - Minor typo fixes. 
+* Fix - Fixed an issue with notice not working when ssl is found.
+* Fix - Minor typo fixes.
 
 = 2.0.0 =
 
 * Updated - All new ui for the constant contact woocommerce plugin.
 * Updated - Store data are now optional. You can connect to constantcontact without store details.
 * Updated - Now you can save your settings and connect to constant contact in a single click.
 * Updated - Added a disconnect settings to the constant contact woocommerce settings.
-* Fix - Minor bug fixes. 
+* Fix - Minor bug fixes.
 
 
 == Installation ==

.wordpress-org/screenshot-6.png

@@ -1,19 +1,17 @@
 <?php
 /**
  * Constant Contact + WooCommerce
- *
  * @since 2019-02-15
  * @author Constant Contact <https://www.constantcontact.com/>
  * @package cc-woo
- *
  * @wordpress-plugin
  * Plugin Name: Constant Contact + WooCommerce
  * Description: Add products to your emails and sync your contacts.
  * Plugin URI: https://github.com/WebDevStudios/constant-contact-woocommerce
- * Version: 2.0.3
+ * Version: 2.1.0
  * Author: Constant Contact
  * Author URI: https://www.constantcontact.com/
- * Text Domain: cc-woo
+ * Text Domain: constant-contact-woocommerce
  * WC requires at least: 3.6.0
  * WC tested up to: 6.8.2
  * Requires PHP: 7.2
@@ -26,7 +24,7 @@
 
 if ( ! is_readable( $cc_woo_autoloader ) ) {
 	/* Translators: Placeholder is the current directory. */
-	throw new \Exception( sprintf( __( 'Please run `composer install` in the plugin folder "%s" and try activating this plugin again.', 'cc-woo' ), dirname( __FILE__ ) ) );
+	throw new \Exception( sprintf( __( 'Please run `composer install` in the plugin folder "%s" and try activating this plugin again.', 'constant-contact-woocommerce' ), dirname( __FILE__ ) ) );
 }
 
 require_once $cc_woo_autoloader;

README.txt

@@ -76,13 +76,13 @@ public function maybe_capture_guest_checkout() {
 		] );
 
 		if ( empty( $data['nonce'] ) || ! wp_verify_nonce( $data['nonce'], 'woocommerce-process_checkout' ) ) {
-			wp_send_json_error( esc_html__( 'Invalid nonce.', 'cc-woo' ) );
+			wp_send_json_error( esc_html__( 'Invalid nonce.', 'constant-contact-woocommerce' ) );
 		}
 
 		$email = filter_var( $data['email'], FILTER_VALIDATE_EMAIL );
 
 		if ( ! $email ) {
-			wp_send_json_error( esc_html__( 'Invalid email.', 'cc-woo' ) );
+			wp_send_json_error( esc_html__( 'Invalid email.', 'constant-contact-woocommerce' ) );
 		}
 
 		WC()->session->set( 'billing_email', $email );
@@ -213,6 +213,24 @@ protected function save_checkout_data( string $billing_email = '', bool $is_chec
 		$is_checkout           = $is_checkout ?: is_checkout();
 		$checkout_uuid         = WC()->session->get( 'checkout_uuid' );
 
+		$addresses = [];
+
+		foreach( $this->get_the_address_fields() as $field ) {
+			$value = '';
+
+			$value_session  = WC()->session->get( $field );
+			if ( ! empty( $value_session ) ) {
+				$value = $value_session;
+			} else {
+				$value_checkout = WC()->checkout->get_value( $field );
+				if ( ! empty( $value_checkout ) ) {
+					$value = $value_checkout;
+				}
+			}
+
+			$addresses[ $field ] = $value;
+		}
+
 		if ( empty( $billing_email ) ) {
 			return;
 		}
@@ -271,6 +289,7 @@ protected function save_checkout_data( string $billing_email = '', bool $is_chec
 				maybe_serialize( [
 					'products' => array_values( WC()->cart->get_cart() ),
 					'coupons'  => WC()->cart->get_applied_coupons(),
+					'addresses' => $addresses,
 				] ),
 				$current_time,
 				strtotime( $current_time ),
@@ -345,4 +364,35 @@ public function delete_expired_checkouts() {
 			)
 		);
 	}
+
+	/**
+	 * Return array of address fields we want.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since  2.1.0
+	 */
+	protected function get_the_address_fields() {
+		return [
+			'address_1',
+			'address_2',
+			'city',
+			'country',
+			'postcode',
+			'state',
+			'shipping_address_1',
+			'shipping_address_2',
+			'shipping_city',
+			'shipping_country',
+			'shipping_postcode',
+			'shipping_state',
+			'billing_address_1',
+			'billing_address_2',
+			'billing_city',
+			'billing_country',
+			'billing_postcode',
+			'billing_state',
+			'billing_phone',
+			'billing_email',
+		];
+	}
 }

plugin.php

@@ -142,7 +142,7 @@ protected function recover_products( $products ) {
 						'%d item from your previous order is currently unavailable and could not be added to your cart.',
 						'%d items from your previous order are currently unavailable and could not be added to your cart.',
 						( count( $products ) - count( $products_added ) ),
-						'cc-woo'
+						'constant-contact-woocommerce'
 					),
 					( count( $products ) - count( $products_added ) )
 				),

src/AbandonedCheckouts/CheckoutHandler.php

@@ -9,6 +9,7 @@
 namespace WebDevStudios\CCForWoo\Api;
 
 use WebDevStudios\OopsWP\Structure\Service;
+use WebDevStudios\CCForWoo\Utility\DebugLogging;
 
 /**
  * KeyManager class
@@ -56,6 +57,13 @@ public function maybe_revoke_api_key( string $query ) : string {
 		 */
 		do_action( 'cc_woo_key_revoked' );
 
+		$ctct_logger = new DebugLogging(
+			wc_get_logger(),
+			'WooCommerce API Key with Constant Contact revoked',
+			'info'
+		);
+		$ctct_logger->log();
+
 		return $query;
 	}
 
@@ -144,7 +152,7 @@ private function is_woo_commerce_api_key_query( $query ) {
 	public function disconnect_cc_woo() {
 
 		/* This action is documented in Plugin.php */
-		do_action( 'cc_woo_disconnect', esc_html__( 'REST API Key Revoked.', 'cc-woo' ) );
+		do_action( 'cc_woo_disconnect', esc_html__( 'REST API Key Revoked.', 'constant-contact-woocommerce' ) );
 
 		/* This action is documented in Plugin.php */
 		do_action( 'wc_ctct_disconnect' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Intentional improperly-prefixed hookname, used in webhooks.

src/AbandonedCheckouts/CheckoutRecovery.php

@@ -9,6 +9,8 @@
 
 namespace WebDevStudios\CCForWoo\Meta;
 
+use WebDevStudios\CCForWoo\Utility\DebugLogging;
+
 /**
  * Class PluginOption
  *
@@ -105,5 +107,13 @@ public function set_connection( int $connected, int $user_id ) {
 		if ( $this->connected ) {
 			update_option( self::CC_FIRST_CONNECTION, true );
 		}
+
+		$ctct_logger = new DebugLogging(
+			wc_get_logger(),
+			'Constant Contact connection set',
+			'info',
+			[ 'status' => $connected ]
+		);
+		$ctct_logger->log();
 	}
 }

src/Api/KeyManager.php

@@ -108,7 +108,7 @@ public function add_ssl_notice() {
 		$connected = get_option( 'cc_woo_import_connection_established' );
 
 		if ( ! $connected && ( isset( $_SERVER['HTTPS'] ) && 'on' !== $_SERVER['HTTPS'] ) ) {
-			$message = __( 'Your site does not appear to be using a secure connection (SSL). You might face issues when connecting to your account. Please add HTTPS to your site to make sure you have no issues connecting.', 'cc-woo' );
+			$message = __( 'Your site does not appear to be using a secure connection (SSL). You might face issues when connecting to your account. Please add HTTPS to your site to make sure you have no issues connecting.', 'constant-contact-woocommerce' );
 			new Notice(
 				new NoticeMessage( $message, 'error', true )
 			);
@@ -138,7 +138,7 @@ private function deactivate( $reason ) {
 		 *
 		 * @param  string $message Deactivation message.
 		 */
-		do_action( 'cc_woo_disconnect', esc_html__( 'Plugin deactivated.', 'cc-woo' ) );
+		do_action( 'cc_woo_disconnect', esc_html__( 'Plugin deactivated.', 'constant-contact-woocommerce' ) );
 
 		$this->do_deactivation_process();
 
@@ -167,13 +167,13 @@ public function check_for_required_dependencies() {
 			// Ensure requirements.
 			if ( ! $compatibility_checker->is_available() ) {
 				// translators: placeholder is the minimum supported WooCommerce version.
-				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater must be installed and activated to use %2$s.', 'cc-woo' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
+				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater must be installed and activated to use %2$s.', 'constant-contact-woocommerce' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
 				throw new Exception( $message );
 			}
 
 			if ( ! $compatibility_checker->is_compatible( \WooCommerce::instance() ) ) {
 				// translators: placeholder is the minimum supported WooCommerce version.
-				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater is required to use %2$s.', 'cc-woo' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
+				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater is required to use %2$s.', 'constant-contact-woocommerce' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
 				throw new Exception( $message );
 			}
 		} catch ( Exception $e ) {
@@ -210,6 +210,7 @@ public function register_hooks() {
 		add_action( 'plugins_loaded', [ $this, 'check_for_required_dependencies' ] );
 		add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'admin_enqueue_scripts' ], 99 );
+		add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
 
 		register_activation_hook( $this->plugin_file, [ $this, 'do_activation_process' ] );
 		register_deactivation_hook( $this->plugin_file, [ $this, 'do_deactivation_process' ] );
@@ -327,7 +328,7 @@ public function do_deactivation_process() {
 		delete_option( ConnectionStatus::CC_CONNECTION_USER_ID );
 		delete_option( ConnectionStatus::CC_FIRST_CONNECTION );
 		delete_option( ConnectionStatus::CC_CONNECTION_ESTABLISHED_KEY );
-		
+
 
 		// WooCommerce Options
 		delete_option( 'cc_woo_store_information_first_name' );
@@ -366,5 +367,15 @@ public function admin_enqueue_scripts() {
 		wp_enqueue_style( 'cc-woo-admin', trailingslashit( plugin_dir_url( $this->get_plugin_file() ) ) . 'app/admin.css' );
     	wp_enqueue_style( 'cc-woo-google-fonts', 'https://fonts.googleapis.com/css2?family=Maven+Pro:wght@400;700&display=swap', false );
 	}
+
+	/**
+	 * Load textdomain.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since 2.1.0
+	 */
+	public function load_plugin_textdomain() {
+		load_plugin_textdomain( 'constant-contact-woocommerce' );
+	}
 }
 

src/Meta/ConnectionStatus.php

@@ -8,6 +8,7 @@
 
 namespace WebDevStudios\CCForWoo\Rest\AbandonedCheckouts;
 
+use WebDevStudios\CCForWoo\Utility\DebugLogging;
 use WP_REST_Server;
 use WP_REST_Request;
 use WP_REST_Controller;
@@ -79,7 +80,16 @@ public function register_routes() {
 	 */
 	public function get_items_permissions_check( $request ) {
 		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
-			return new WP_Error( 'cc-woo-rest-not-allowed', esc_html__( 'Sorry, you cannot list resources.', 'cc-woo' ), [ 'status' => rest_authorization_required_code() ] );
+
+			$ctct_logger = new DebugLogging(
+				wc_get_logger(),
+				'CTCT Woo: no permission to check abandoned checkout',
+				'warning',
+				[ 'cc-woo-rest-not-allowed' => $request ]
+			);
+			$ctct_logger->log();
+
+			return new WP_Error( 'cc-woo-rest-not-allowed', esc_html__( 'Sorry, you cannot list resources.', 'constant-contact-woocommerce' ), [ 'status' => rest_authorization_required_code() ] );
 		}
 
 		return true;