merge in latest master branch, fix typo

Author: ggwicz

README.txt

@@ -1,9 +1,9 @@
 === Constant Contact + WooCommerce ===
 Contributors: constantcontact, znowebdev, jmichaelward, webdevstudios
 Tags: capture, contacts, constant contact, constant contact form, constant contact newsletter, constant contact official, contact forms, email, form, forms, marketing, mobile, newsletter, opt-in, plugin, signup, subscribe, subscription, widget
-Requires at least: 5.1.1
-Tested up to: 5.1.1
-Stable tag: 1.0.0
+Requires at least: 5.2.2
+Tested up to: 5.2.3
+Stable tag: 1.1.0
 Requires PHP: 7.2
 WC tested up to: 3.5.6
 License: GPLv3
@@ -20,7 +20,6 @@ and send targeted emails that engage your customers on every device.
 
 Unleash the power of your business—and drive more revenue—by integrating Constant Contact with WooCommerce today.
 
-
 With Constant Contact you can:
 - Drag and drop products from your store into any email and customize the details.
 - Automatically import WooCommere contacts into your Constant Contact account.
@@ -33,3 +32,11 @@ With Constant Contact you can:
 --- Prospects: Have not made a purchase yet
 - Send automated welcome emails and behavior based trigger emails
 - Find new customers with Facebook and Instagram ads
+
+== Changelog ==
+
+= 1.1.0 =
+
+* Added: Campaign ID data inclusion for purchased orders originating from your mailing campaigns.
+* Fixed: compatibility issue with phone numbers and PHP 7.3
+* Updated: Wording in our WooCommerce tab.

plugin.php

@@ -10,7 +10,7 @@
  * 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: 1.0.0
+ * Version: 1.1.0
  * Author: Constant Contact
  * Author URI: https://www.constantcontact.com/
  * Text Domain: cc-woo

src/AbandonedCarts/CartHandler.php

@@ -83,8 +83,6 @@ public function update_cart_data() {
 		$customer_data['billing']  = array_merge( $customer_data['billing'], WC()->customer->get_billing() );
 		$customer_data['shipping'] = array_merge( $customer_data['shipping'], WC()->customer->get_shipping() );
 
-		write_log( $_POST, 'posted' );
-
 		// Check if submission attempted.
 		if ( isset( $_POST['woocommerce_checkout_place_order'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification -- Okay use of $_POST data.
 			// Update customer data from posted data.

src/View/Admin/Field/ImportHistoricalData.php

@@ -33,7 +33,7 @@ class ImportHistoricalData {
 	 */
 	public function get_form_field() : array {
 		return [
-			'title'             => esc_html__( 'Import historical customer data', 'cc-woo' ),
+			'title'             => esc_html__( 'Import your contacts', 'cc-woo' ),
 			'desc'              => $this->get_description(),
 			'type'              => 'select',
 			'id'                => self::OPTION_FIELD_NAME,

src/View/Admin/WooTab.php

@@ -206,7 +206,7 @@ public function enqueue_scripts() {
 	public function get_sections() {
 		$sections = [
 			''                                      => esc_html__( 'Store Information', 'cc-woo' ),
-			$this->import_existing_customer_section => esc_html__( 'Importing Existing Customers', 'cc-woo' ),
+			$this->import_existing_customer_section => esc_html__( 'Import your contacts', 'cc-woo' ),
 			$this->abandoned_carts_section          => esc_html__( 'Abandoned Carts', 'cc-woo' ),
 		];
 
@@ -514,14 +514,14 @@ private function get_store_information_settings() {
 	private function get_customer_data_settings() {
 		$settings = [
 			[
-				'title' => esc_html__( 'Importing Existing Customers', 'cc-woo' ),
+				'title' => esc_html__( 'Import your contacts', 'cc-woo' ),
 				'id'    => 'cc_woo_customer_data_settings',
 				'type'  => 'title',
 			],
 			[
 				'title' => '',
 				'type'  => 'title',
-				'desc'  => esc_html__( 'All contacts must agree to receive marketing messages in order to be added to your mailing list.  Therefore, when you import contacts, you are agreeing that you have permission to send them marketing messages.', 'cc-woo' ),
+				'desc'  => esc_html__( "Start marketing to your customers right away by importing all your contacts now.\n\nDo you want to import your current contacts? By selecting yes below, you agree you have permission to market to your current contacts.", 'cc-woo' ),
 			],
 		];
 
@@ -568,9 +568,9 @@ private function get_abandoned_carts_settings() {
 			],
 		];
 
-		$rest_endpoints_field  = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\RestEndpoints();
-		$secret_key_field      = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\ApiSecretKey();
-		$server_info_field     = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\ServerInfo();
+		$rest_endpoints_field = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\RestEndpoints();
+		$secret_key_field     = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\ApiSecretKey();
+		$server_info_field    = new \WebDevStudios\CCForWoo\View\Admin\Field\AbandonedCarts\ServerInfo();
 
 		$settings[] = array_merge( $settings,
 			$rest_endpoints_field->get_form_field()
@@ -627,6 +627,16 @@ public function add_cc_connection_button() {
 		<button class="button button-primary" type="submit" name="cc_woo_action" value="<?php echo esc_attr( $value ); ?>">
 			<?php echo esc_html( $message ); ?>
 		</button>
+			<span style="line-height:28px; margin-left:25px;">
+				<?php
+				printf(
+					/* translators: the placeholders hold opening and closing `<a>` tags. */
+					esc_html__( 'If you have any issues connecting please call %1$sConstant Contact Support%2$s', 'cc-woo' ),
+					'<a href="https://community.constantcontact.com/contact-support">',
+					'</a>'
+				);
+				?>
+			</span>
 		</div>
 		<?php
 	}
@@ -779,7 +789,7 @@ private function validate_value( $field ) {
 	 * @return string
 	 */
 	public function sanitize_phone_number( $value ) {
-		return is_scalar( $value ) ? preg_replace( '/[^\d-()+]+/', '', $value ) : '';
+		return is_scalar( $value ) ? preg_replace( '/[^\d\-()+]+/', '', $value ) : '';
 	}
 
 	/**

src/View/Checkout/CampaignId.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Class to handle filtering fields in the checkout billing form.
+ *
+ * @see     https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
+ * @author  Michael Beckwith <[email protected]>
+ * @package WebDevStudios\CCForWoo\View\Checkout
+ * @since   2019-08-22
+ */
+
+namespace WebDevStudios\CCForWoo\View\Checkout;
+
+use WebDevStudios\OopsWP\Utility\Hookable;
+
+/**
+ * Class CampaignId
+ *
+ * @author  Michael Beckwith <[email protected]>
+ * @package WebDevStudios\CCForWoo\View\Checkout
+ * @since   2019-08-22
+ */
+class CampaignId implements Hookable {
+	/**
+	 * The name of the meta field for the customer's preference.
+	 * This constant will be used both in usermeta (for users) and postmeta (for orders).
+	 *
+	 * @var string
+	 * @since 2019-08-22
+	 */
+	const CUSTOMER_CAMPAIGN_ID_KEY = 'campaign_activity_id';
+
+	/**
+	 * Register actions and filters with WordPress.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since  2019-08-22
+	 */
+	public function register_hooks() {
+		add_action( 'init', [ $this, 'save_campaign_id' ], 11 );
+		add_action( 'woocommerce_checkout_update_order_meta', [ $this, 'save_user_campaign_id_to_order' ] );
+	}
+
+	/**
+	 * Save the user preference to the order meta.
+	 *
+	 * @param int $order_id The order ID.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since  2019-08-22
+	 * @return void
+	 */
+	public function save_user_campaign_id_to_order( $order_id ) {
+		$preference = $this->get_stored_campaign_id();
+
+		if ( empty( $preference ) ) {
+			return;
+		}
+
+		add_post_meta( $order_id, self::CUSTOMER_CAMPAIGN_ID_KEY, $preference, true );
+	}
+
+	/**
+	 * Save the campaign ID for the session.
+	 *
+	 * @throws \Exception DateTime exception.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since  2019-08-22
+	 * @return void
+	 */
+	public function save_campaign_id() {
+		$campaign_id = filter_input( INPUT_GET, 'source', FILTER_SANITIZE_STRING );
+
+		if ( ! empty( $campaign_id ) ) {
+			setcookie( 'ctct_woo_campaign_id', $campaign_id, 0, '/' );
+		}
+	}
+
+	/**
+	 * Get the submitted customer newsletter preference.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since  2019-08-22
+	 * @return string
+	 */
+	private function get_stored_campaign_id() {
+		return isset( $_COOKIE['ctct_woo_campaign_id'] )
+			? sanitize_text_field( $_COOKIE['ctct_woo_campaign_id'] )
+			: '';
+	}
+}

src/View/ViewRegistrar.php

@@ -10,6 +10,7 @@
 namespace WebDevStudios\CCForWoo\View;
 
 use WebDevStudios\CCForWoo\View\Admin\WooTab;
+use WebDevStudios\CCForWoo\View\Checkout\CampaignId;
 use WebDevStudios\CCForWoo\View\Checkout\NewsletterPreferenceCheckbox;
 use WebDevStudios\OopsWP\Structure\Service;
 
@@ -35,6 +36,7 @@ class ViewRegistrar extends Service {
 	 */
 	protected $forms = [
 		NewsletterPreferenceCheckbox::class,
+		CampaignId::class,
 	];