Changeset 1271588

Timestamp:

10/23/2015 07:42:17 AM (10 years ago)

Author:

niravmehta

Message:

Changes for 1.7

Location:

klawoo-connector/trunk

Files:

• classes/class.wc-klawoo.php (modified) (10 diffs)
• klawoo-connector.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

klawoo-connector/trunk/classes/class.wc-klawoo.php

@@ -56 +56 @@
                 add_action( 'wp_ajax_klawoo_validate_and_get_brands', array (&$this, 'validate_and_get_brands') );
                 add_action( 'wp_ajax_klawoo_sign_up', array (&$this, 'validate_and_get_brands') );
-                add_filter( 'wp_klawoo_bulk_subscribe_get_data', array( &$this, 'bulk_subscribe_get_data' ), 10, 2 );
-            }
+            }
+            
+            add_filter( 'wp_klawoo_bulk_subscribe_get_data', array( &$this, 'bulk_subscribe_get_data' ), 10, 2 );
 
             $settings = get_option('wc_klawoo_credentials', null);
@@ -768 +769 @@
 //            =======================================            
             
-            $list_id_stored = array();
-            
-            $query_list_ids = "SELECT id, list_id FROM {$wpdb->prefix}wc_klawoo WHERE brand_id =". $this->brand_id;
-            $result_list_ids = $wpdb->get_results( $query_list_ids, 'ARRAY_A' );
-
-            foreach ($result_list_ids as $result_list_id) {
-                $list_id_stored [ $result_list_id ['id'] ] = $result_list_id ['list_id'];
-            }
+            // $list_id_stored = array();
+            
+            // $query_list_ids = "SELECT id, list_id FROM {$wpdb->prefix}wc_klawoo WHERE brand_id =". $this->brand_id;
+            // $result_list_ids = $wpdb->get_results( $query_list_ids, 'ARRAY_A' );
+
+            // foreach ($result_list_ids as $result_list_id) {
+            //     $list_id_stored [ $result_list_id ['id'] ] = $result_list_id ['list_id'];
+            // }
             
 //            =======================================
             
-            
+            $list_ids = array_unique($list_ids);
             foreach( $list_ids as $prod_id => $list_id ){
                 $list_name = mysql_real_escape_string($list_data[$prod_id]['list_name']);
@@ -788 +789 @@
                 }
 
-                if ( isset( $list_id_stored [$prod_id] ) ) {
-                    $values_updated[] = "WHEN " . $prod_id  . " THEN '" . $list_id . "'";
-                } else {
+                // if ( isset( $list_id_stored [$prod_id] ) ) {
+                //     $values_updated[] = "WHEN " . $prod_id  . " THEN '" . $list_id . "'";
+                // } else {
                     $values_inserted[] = "(" . $prod_id . ", '" . $list_name . "' , '" . $list_id . "' , '" . $this->brand_id . "' , '" . $custom_attributes . "')"; 
-                }
+                // }
                 
                 
@@ -801 +802 @@
             // Insert only if it does not exist
             if ( sizeof( $values_inserted ) > 0 ) {
-                $insert_query = " INSERT IGNORE into {$wpdb->prefix}wc_klawoo (id, list_name, list_id, brand_id, custom_attributes) VALUES";
+                $insert_query = " REPLACE INTO {$wpdb->prefix}wc_klawoo (id, list_name, list_id, brand_id, custom_attributes) VALUES";
                 $insert_query .= implode( ',', $values_inserted );
                 $result_inserted = $wpdb->query( $insert_query );
@@ -807 +808 @@
                         
             // Code for updating the list ids
-            if ( !empty($values_updated) && sizeof( $values_updated ) > 0 ) {
-                $update_query = " UPDATE {$wpdb->prefix}wc_klawoo
-                                    SET list_id = CASE id ". implode("\n", $values_updated) ."
-                                            END                                    
-                                    WHERE brand_id = ".$this->brand_id;   
-
-                $result_updated = $wpdb->query( $update_query );
-                $num_updated = $wpdb->num_rows;
-            }
+            // if ( !empty($values_updated) && sizeof( $values_updated ) > 0 ) {
+            //     $update_query = " UPDATE {$wpdb->prefix}wc_klawoo
+            //                         SET list_id = CASE id ". implode("\n", $values_updated) ."
+            //                                 END                                    
+            //                         WHERE brand_id = ".$this->brand_id;   
+            //     $result_updated = $wpdb->query( $update_query );
+            //     $num_updated = $wpdb->num_rows;
+            // }
 
             if ( $result_inserted === false) {
@@ -1224 +1224 @@
         $list_ids = array(); // array containing all the list ids
 
-        $query_list_ids = "SELECT id, list_id FROM {$wpdb->prefix}wc_klawoo ";
+        $query_list_ids = "SELECT id, list_id FROM {$wpdb->prefix}wc_klawoo WHERE brand_id = ".$this->brand_id;
         $result_list_ids = $wpdb->get_results( $query_list_ids, 'ARRAY_A' );
         $result_list_ids_count = $wpdb->num_rows;
@@ -1398 +1398 @@
             $email_ids_temp = array();
 
+            //Code for getting the my-account page link
+            $myaccount_page_url = '';
+            $myaccount_page_id = get_option( 'woocommerce_myaccount_page_id' );
+            if ( $myaccount_page_id ) {
+              $myaccount_page_url = get_permalink( $myaccount_page_id );
+            }
+
             foreach ($sync_data as $order_id => $sync_data_temp ) {
                 $email_ids [$order_id] = $sync_data_temp['subscriber_email'];
@@ -1403 +1410 @@
             }
 
-            $generated_links = apply_filters('sa_bulk_express_login_link', array(), '', array_unique($email_ids), '', '' );
+            $generated_links = apply_filters('sa_bulk_express_login_link', array(), $myaccount_page_url , array_unique($email_ids), '', '' );
 
             if (!empty($generated_links)) {
@@ -1949 +1956 @@
     public function user_subscribe_or_unsubscribe( $order_id, $old_status, $new_status ){
 
-        if( $old_status != $new_status ){
+        // if( $old_status != $new_status ){
 
             if( $new_status == 'processing' || $new_status == 'completed' ){
@@ -1981 +1988 @@
                 }
             }
-        }   
+        // }   
     }
     

klawoo-connector/trunk/klawoo-connector.php

@@ -4 +4 @@
  * Plugin URI: http://storeapps.org
  * Description: Connect Wordpress with Klawoo - The next generation customer engagement and marketing platform.
- * Version: 1.6
+ * Version: 1.7
  * Author: storeapps
  * Author URI: http://storeapps.org/

klawoo-connector/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.3
 Tested up to: 4.0
-Stable tag: 1.6
+Stable tag: 1.7
 License: GPL 3.0
 
@@ -78 +78 @@
 == Changelog ==
 
+= 1.7 =
+* New: Syncing the MyAccount link for the subscribers
+* Fix: New orders not getting synced
+* Fixed: Minor Fixes
+
 = 1.6 =
 * Update: Compatibility with new versions of WordPress & WooCommerce (v2.2 or greater)
@@ -87 +92 @@
 == Upgrade Notice ==
 
+= 1.7 =
+Fixed issue of new orders not getting synced along with some important updates and fixes, recommended upgrade. 
+
 = 1.6 =
 Compatibility with new versions of WordPress & WooCommerce (v2.2 or greater) along with some important updates and fixes, recommended upgrade.