Changeset 2215920

Timestamp:

12/20/2019 07:56:56 PM (6 years ago)

Author:

travisnorthcutt

Message:

Version 1.3.0

Location:

convertkit-for-woocommerce

Files:

• tags/1.3.0 (added)
• tags/1.3.0/components (added)
• tags/1.3.0/components/integration (added)
• tags/1.3.0/components/integration/functions (added)
• tags/1.3.0/components/integration/functions/integration.php (added)
• tags/1.3.0/components/integration/integration.php (added)
• tags/1.3.0/components/integration/resources (added)
• tags/1.3.0/components/integration/resources/integration.js (added)
• tags/1.3.0/components/integration/views (added)
• tags/1.3.0/components/integration/views/meta-box.php (added)
• tags/1.3.0/functions (added)
• tags/1.3.0/functions/convertkit.php (added)
• tags/1.3.0/functions/utility.php (added)
• tags/1.3.0/readme.txt (added)
• tags/1.3.0/woocommerce-convertkit.php (added)
• trunk/components/integration/integration.php (modified) (4 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/woocommerce-convertkit.php (modified) (2 diffs)

convertkit-for-woocommerce/trunk/components/integration/integration.php

@@ -122 +122 @@
             if ( 'yes' === $this->send_purchases ){
                 add_action( 'woocommerce_payment_complete',        array( $this, 'send_payment' ), 99999, 1 );
+                add_action( 'woocommerce_order_status_changed',    array( $this, 'handle_cod_or_check_order_completion' ), 99999, 4 );
             }
         }
@@ -513 +514 @@
 
     /**
-     * For each subscription (sequence, tag, form) attached to a product,
-     * perform the relevant actions (subscribe & add order note)
-     *
-     * @param array $subscriptions
-     * @param string $email
-     * @param string $name
-     * @param string $order_id
-     */
-    public function process_convertkit_subscriptions( $subscriptions, $email, $name, $order_id ) {
-
-        foreach ( $subscriptions as $subscription_raw ) {
-            list( $subscription['type'], $subscription['id'] ) = explode( ':', $subscription_raw );
-
-            $subscription['function'] = "ckwc_convertkit_api_add_subscriber_to_{$subscription['type']}";
-
-            $this->process_item_subscription( $subscription, $email, $name, $order_id );
-        }
-    }
-
-    /**
-     * For each subscription (sequence, tag, form) attached to a product,
-     * perform the relevant actions (subscribe & add order note)
-     *
-     * @param array $subscription
-     * @param string $email
-     * @param string $name
-     * @param string $order_id
-     */
-    public function process_item_subscription( $subscription, $email, $name, $order_id ) {
-        if ( function_exists( $subscription['function'] ) ) {
-            $response = call_user_func( $subscription['function'], $subscription['id'], $email, $name );
-
-            if ( ! is_wp_error( $response ) ) {
-                $options = ckwc_get_subscription_options();
-                $items   = array();
-                foreach ( $options as $option ) {
-                    if ( $subscription['type'] !== $option['key'] ) {
-                        continue;
-                    }
-
-                    /**
-                     * This ends up holding an array of the subscription items (tags, courses, or forms) our WP install knows about,
-                     * which match the current subscription type, in `id => name` pairs
-                     */
-                    $items = $option['options'];
-                }
-                if ( $items ) {
-                    // we then check if the item ID we sent is in this array, and if so add an order note
-                    if ( isset( $items[ $subscription['id'] ] ) ) {
-                        switch ( $subscription['type'] ) {
-                            case 'tag':
-                            case 'form':
-                                wc_create_order_note( $order_id,
-                                                      sprintf( __( '[ConvertKit] Customer subscribed to the %s: %s',
-                                                                   'woocommerce-convertkit' ), $subscription['type'],
-                                                               $items[ $subscription['id'] ] ) );
-                                break;
-
-                            // Sequences are called "courses" for legacy reasons, so they get a special case
-                            case 'course':
-                                wc_create_order_note( $order_id,
-                                                      sprintf( __( '[ConvertKit] Customer subscribed to the %s: %s',
-                                                                   'woocommerce-convertkit' ), 'sequence',
-                                                               $items[ $subscription['id'] ] ) );
-                                break;
-                        }
-                    }
-                }
-            }
-
-            if ( 'yes' === $this->get_option( 'debug' ) ) {
-                $this->debug_log( 'API call: ' . $subscription['type'] . "\nResponse: \n" . print_r( $response,
-                                                                                                     true ) );
-            }
-        }
-    }
-
-    /**
-     * @param bool|WC_Order|WC_Order_Refund $order
-     *
-     * @return string
-     */
-    public function email( $order ) {
-        $email = version_compare( WC()->version, '3.0.0', '>=' ) ? $order->get_billing_email() : $order->billing_email;
-
-        return apply_filters( 'convertkit_for_woocommerce_email', $email, $order );
-    }
-
-    /**
-     * @param bool|WC_Order|WC_Order_Refund $order
-     *
-     * @return string
-     */
-    public function first_name( $order ) {
-        $first_name = version_compare( WC()->version, '3.0.0',
-                                       '>=' ) ? $order->get_billing_first_name() : $order->billing_first_name;
-
-        return apply_filters( 'convertkit_for_woocommerce_first_name', $first_name, $order );
-    }
-
-    /**
-     * @param bool|WC_Order|WC_Order_Refund $order
-     *
-     * @return string
-     */
-    public function last_name( $order ) {
-        $last_name = version_compare( WC()->version, '3.0.0',
-                                      '>=' ) ? $order->get_billing_last_name() : $order->billing_last_name;
-
-        return apply_filters( 'convertkit_for_woocommerce_last_name', $last_name, $order );
-    }
-
-    /**
-     * @param string $first_name
-     * @param string $last_name
-     *
-     * @return string
-     */
-    public function name_format( $first_name, $last_name ) {
-        switch ( $this->name_format ) {
-            case 'first':
-                return $first_name;
-                break;
-            case 'last':
-                return $last_name;
-                break;
-            default:
-                return sprintf( "%s %s", $first_name, $last_name );
-                break;
-
-        }
-    }
-
-    /**
-     * Send order data to ConvertKit
-     *
      * @param int $order_id
-     */
-    public function send_payment( $order_id ){
+     * @param string $status_old
+     * @param string $status_new
+     * @param WC_Order $order
+     */
+    public function handle_cod_or_check_order_completion( $order_id, $status_old, $status_new, $order ) {
         $api_key_correct = ! empty( $this->api_key );
-        $order = wc_get_order( $order_id );
-        if ( $api_key_correct && ! is_wp_error( $order ) && $order ) {
+        $correct_status = $status_new === 'completed';
+        $payment_methods = array( 'cod', 'cheque', 'check' );
+
+        if ( $api_key_correct && $correct_status && in_array( $order->get_payment_method( null ), $payment_methods ) ) {
 
             $products = array();
@@ -660 +530 @@
             foreach( $order->get_items( ) as $item_key => $item ) {
                 $products[] = array(
-                        'pid'        => $item->get_product()->get_id(),
-                        'lid'        => $item_key,
-                        'name'       => $item->get_name(),
-                        'sku'        => $item->get_product()->get_sku(),
-                        'unit_price' => $item->get_product()->get_price(),
-                        'quantity'   => $item->get_quantity(),
-                    );
+                    'pid'        => $item->get_product()->get_id(),
+                    'lid'        => $item_key,
+                    'name'       => $item->get_name(),
+                    'sku'        => $item->get_product()->get_sku(),
+                    'unit_price' => $item->get_product()->get_price(),
+                    'quantity'   => $item->get_quantity(),
+                );
             }
 
@@ -702 +572 @@
                 $this->debug_log( 'Send payment response WP Error: ' . $response->get_error_code() . ' ' . $response->get_error_message() );
             } else {
+                $order->add_order_note( 'Payment data sent to ConvertKit', 0, false );
+                $this->debug_log( 'send payment response: ' . print_r( $response, true ) );
+            }
+
+        }
+    }
+
+    /**
+     * For each subscription (sequence, tag, form) attached to a product,
+     * perform the relevant actions (subscribe & add order note)
+     *
+     * @param array $subscriptions
+     * @param string $email
+     * @param string $name
+     * @param string $order_id
+     */
+    public function process_convertkit_subscriptions( $subscriptions, $email, $name, $order_id ) {
+
+        foreach ( $subscriptions as $subscription_raw ) {
+            list( $subscription['type'], $subscription['id'] ) = explode( ':', $subscription_raw );
+
+            $subscription['function'] = "ckwc_convertkit_api_add_subscriber_to_{$subscription['type']}";
+
+            $this->process_item_subscription( $subscription, $email, $name, $order_id );
+        }
+    }
+
+    /**
+     * For each subscription (sequence, tag, form) attached to a product,
+     * perform the relevant actions (subscribe & add order note)
+     *
+     * @param array $subscription
+     * @param string $email
+     * @param string $name
+     * @param string $order_id
+     */
+    public function process_item_subscription( $subscription, $email, $name, $order_id ) {
+        if ( function_exists( $subscription['function'] ) ) {
+            $response = call_user_func( $subscription['function'], $subscription['id'], $email, $name );
+
+            if ( ! is_wp_error( $response ) ) {
+                $options = ckwc_get_subscription_options();
+                $items   = array();
+                foreach ( $options as $option ) {
+                    if ( $subscription['type'] !== $option['key'] ) {
+                        continue;
+                    }
+
+                    /**
+                     * This ends up holding an array of the subscription items (tags, courses, or forms) our WP install knows about,
+                     * which match the current subscription type, in `id => name` pairs
+                     */
+                    $items = $option['options'];
+                }
+                if ( $items ) {
+                    // we then check if the item ID we sent is in this array, and if so add an order note
+                    if ( isset( $items[ $subscription['id'] ] ) ) {
+                        switch ( $subscription['type'] ) {
+                            case 'tag':
+                            case 'form':
+                                wc_create_order_note( $order_id,
+                                                      sprintf( __( '[ConvertKit] Customer subscribed to the %s: %s',
+                                                                   'woocommerce-convertkit' ), $subscription['type'],
+                                                               $items[ $subscription['id'] ] ) );
+                                break;
+
+                            // Sequences are called "courses" for legacy reasons, so they get a special case
+                            case 'course':
+                                wc_create_order_note( $order_id,
+                                                      sprintf( __( '[ConvertKit] Customer subscribed to the %s: %s',
+                                                                   'woocommerce-convertkit' ), 'sequence',
+                                                               $items[ $subscription['id'] ] ) );
+                                break;
+                        }
+                    }
+                }
+            }
+
+            if ( 'yes' === $this->get_option( 'debug' ) ) {
+                $this->debug_log( 'API call: ' . $subscription['type'] . "\nResponse: \n" . print_r( $response,
+                                                                                                     true ) );
+            }
+        }
+    }
+
+    /**
+     * @param bool|WC_Order|WC_Order_Refund $order
+     *
+     * @return string
+     */
+    public function email( $order ) {
+        $email = version_compare( WC()->version, '3.0.0', '>=' ) ? $order->get_billing_email() : $order->billing_email;
+
+        return apply_filters( 'convertkit_for_woocommerce_email', $email, $order );
+    }
+
+    /**
+     * @param bool|WC_Order|WC_Order_Refund $order
+     *
+     * @return string
+     */
+    public function first_name( $order ) {
+        $first_name = version_compare( WC()->version, '3.0.0',
+                                       '>=' ) ? $order->get_billing_first_name() : $order->billing_first_name;
+
+        return apply_filters( 'convertkit_for_woocommerce_first_name', $first_name, $order );
+    }
+
+    /**
+     * @param bool|WC_Order|WC_Order_Refund $order
+     *
+     * @return string
+     */
+    public function last_name( $order ) {
+        $last_name = version_compare( WC()->version, '3.0.0',
+                                      '>=' ) ? $order->get_billing_last_name() : $order->billing_last_name;
+
+        return apply_filters( 'convertkit_for_woocommerce_last_name', $last_name, $order );
+    }
+
+    /**
+     * @param string $first_name
+     * @param string $last_name
+     *
+     * @return string
+     */
+    public function name_format( $first_name, $last_name ) {
+        switch ( $this->name_format ) {
+            case 'first':
+                return $first_name;
+                break;
+            case 'last':
+                return $last_name;
+                break;
+            default:
+                return sprintf( "%s %s", $first_name, $last_name );
+                break;
+
+        }
+    }
+
+    /**
+     * Send order data to ConvertKit
+     *
+     * @param int $order_id
+     */
+    public function send_payment( $order_id ){
+        $api_key_correct = ! empty( $this->api_key );
+        $order = wc_get_order( $order_id );
+        if ( $api_key_correct && ! is_wp_error( $order ) && $order ) {
+
+            $products = array();
+
+            foreach( $order->get_items( ) as $item_key => $item ) {
+                $products[] = array(
+                        'pid'        => $item->get_product()->get_id(),
+                        'lid'        => $item_key,
+                        'name'       => $item->get_name(),
+                        'sku'        => $item->get_product()->get_sku(),
+                        'unit_price' => $item->get_product()->get_price(),
+                        'quantity'   => $item->get_quantity(),
+                    );
+            }
+
+            $purchase_options = array(
+                'api_secret' => $this->api_secret,
+                'purchase' => array(
+                    'transaction_id'   => $order->get_order_number(),
+                    'email_address'    => $order->get_billing_email(),
+                    'first_name'       => $order->get_billing_first_name(),
+                    'currency'         => $order->get_currency(),
+                    'transaction_time' => $order->get_date_created()->date( 'Y-m-d H:i:s' ),
+                    'subtotal'         => (double) $order->get_subtotal(),
+                    'tax'              => (double) $order->get_total_tax( 'edit' ),
+                    'shipping'         => (double) $order->get_shipping_total( 'edit' ),
+                    'discount'         => (double) $order->get_discount_total( 'edit' ),
+                    'total'            => (double) $order->get_total( 'edit' ),
+                    'status'           => 'paid',
+                    'products'         => $products,
+                    'integration'      => 'WooCommerce'
+                )
+            );
+
+            $query_args = is_null( $this->api_key ) ? array() : array(
+                'api_key' => $this->api_key,
+            );
+            $body = $purchase_options;
+            $args = array( 'method' => 'POST' );
+
+            $this->debug_log( 'send payment request: ' . print_r( $purchase_options, true ) );
+
+            $response = ckwc_convertkit_api_request( 'purchases', $query_args, $body, $args );
+
+            if ( is_wp_error( $response ) ){
+                $order->add_order_note( 'Send payment to ConvertKit error: ' . $response->get_error_code() . ' ' . $response->get_error_message(), 0, 'ConvertKit plugin' );
+                $this->debug_log( 'Send payment response WP Error: ' . $response->get_error_code() . ' ' . $response->get_error_message() );
+            } else {
                 $order->add_order_note( 'Payment data sent to ConvertKit', 0, false );
                 $this->debug_log( 'send payment response: ' . print_r( $response, true ) );

convertkit-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Tags: email, marketing, embed form, convertkit, capture, woocommerce
 Requires at least: 3.6
-Tested up to: 5.2.2
-Stable tag: 1.2.0
+Tested up to: 5.3.2
+Stable tag: 1.3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 
 == Changelog ==
+### 1.3.0  2019-12-20
+* Add support for sending cash on delivery and check payment purchase info to ConvertKit
 
 ### 1.2.0  2019-07-15

convertkit-for-woocommerce/trunk/woocommerce-convertkit.php

@@ -4 +4 @@
  * Plugin URI:  https://www.convertkit.com
  * Description: Integrates WooCommerce with ConvertKit allowing customers to be automatically sent to your ConvertKit account.
- * Version: 1.2.0
+ * Version: 1.3.0
  * Author: ConvertKit
  * Author URI: https://www.convertkit.com
@@ -29 +29 @@
 
 if ( ! defined( 'CKWC_VERSION' ) ) {
-    define( 'CKWC_VERSION', '1.2.0' );
+    define( 'CKWC_VERSION', '1.3.0' );
 }