README.md

@@ -1,6 +1,6 @@
 [![Codeable](https://img.shields.io/badge/Codeable-Experts-blue.svg?style=flat-square)]()
 # Codeable Expert Stats Plugin Readme
-*Contributors:* Spyros Vlachopoulos, Panagiotis Synetos, John Leskas, Justin Frydman, Jonathan Bossenger, Rob Scott, Philipp Stracker
+*Contributors:* Spyros Vlachopoulos, Panagiotis Synetos, John Leskas, Justin Frydman, Jonathan Bossenger, Rob Scott, Philipp Stracker, Milan Dinić
 
 *Tested up to:* WordPress 5.2.2
 
@@ -60,6 +60,18 @@ If you don't have it installed, you can:
 
 This will give you the normal WP update notification when a new version ships, and its a 1 click update.
 
+### Migrating from Old Version
+
+You may want to truncate these tables, replace wp_ with your database prefix
+
+```
+TRUNCATE TABLE wp_codeable_amounts;
+TRUNCATE TABLE wp_codeable_clients;
+TRUNCATE TABLE wp_codeable_tasks;
+TRUNCATE TABLE wp_codeable_transactions;
+TRUNCATE TABLE wp_codeable_transcactions;
+```
+
 ### Frequently Asked Questions
 
 *There was a problem fetching remote data from Codeable*

classes/api_calls.php

@@ -25,6 +25,13 @@ class wpcable_api_calls {
 	 */
 	public $auth_token = '';
 
+	/**
+	 * Get the option to know when to stop pulling tasks
+	 *
+	 * @var int
+	 */
+	private $tasks_stop_at_page = 0;
+
 	/**
 	 * Returns the singleton instance to the API object.
 	 *
@@ -45,6 +52,7 @@ public static function inst() {
 	 */
 	private function __construct() {
 		$this->get_auth_token();
+		$this->tasks_stop_at_page = (int) get_option( 'wpcable_tasks_stop_at_page', 0 );
 	}
 
 	/**
@@ -62,7 +70,7 @@ public function login( $email, $password ) {
 
 		$this->auth_token = '';
 		$url              = 'users/login';
-		$login_call       = $this->get_curl( $url, $args );
+		$login_call       = $this->request( $url, $args );
 
 		// Credential error checking.
 		if (
@@ -133,7 +141,7 @@ private function get_auth_token() {
 	 */
 	public function self() {
 		$url        = 'users/me';
-		$login_call = $this->get_curl( $url, [], 'get' );
+		$login_call = $this->request( $url, [], 'get' );
 
 		unset( $login_call['auth_token'] );
 
@@ -150,7 +158,7 @@ public function transactions_page( $page = 1 ) {
 		$url  = 'users/me/transactions';
 		$args = [ 'page' => $page ];
 
-		$transactions = $this->get_curl( $url, $args, 'get' );
+		$transactions = $this->request( $url, $args, 'get' );
 
 		return $transactions;
 	}
@@ -176,7 +184,13 @@ public function tasks_page( $filter = 'preferred', $page = 1 ) {
 			'per_page' => $num,
 		];
 
-		$tasks = $this->get_curl( $url, $args, 'get' );
+		// Stop at the next page before it does the call
+		if ( $this->tasks_stop_at_page
+		     && ( $this->tasks_stop_at_page + 1 ) === $page ) {
+			return [];
+		}
+
+		$tasks = $this->request( $url, $args, 'get' );
 
 		return $tasks;
 	}
@@ -187,84 +201,65 @@ public function tasks_page( $filter = 'preferred', $page = 1 ) {
 	 * @param  string $url     API endpoint.
 	 * @param  array  $args    Additional URL params or post data.
 	 * @param  string $method  Request method [GET|POST].
-	 * @param  string $headers Optional Curl headers.
+	 * @param  array  $headers Optional HTTP headers.
 	 * @return array
 	 */
-	private function get_curl( $url, $args = [], $method = 'post', $headers = '' ) {
-		$res = false;
+	private function request( $url, $args = [], $method = 'POST', $headers = [] ) {
+		$response_body = false;
 
-		try {
-			set_time_limit( 300 );
+		set_time_limit( 300 );
 
-			$ch     = curl_init();
-			$method = strtolower( $method );
+		$method       = strtoupper( $method );
+		$request_args = [ 'method' => $method ];
+		$url          = 'https://api.codeable.io/' . ltrim( $url, '/' );
 
-			if ( false === $ch ) {
-				throw new Exception( 'Failed to initialize cURL' );
-			}
-
-			$url = 'https://api.codeable.io/' . ltrim( $url, '/' );
-
-			if ( 'get' === $method ) {
-				if ( ! empty( $args ) ) {
-					$url = $url . '?' . http_build_query( $args );
-				}
+		if ( ! empty( $args ) ) {
+			if ( 'GET' === $method ) {
+				$url = add_query_arg( $args, $url );
 			} else {
-				curl_setopt( $ch, CURLOPT_POSTFIELDS, $args );
-			}
-
-			// Setup request to send json via POST.
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-
-			if ( ! $headers || ! is_array( $headers ) ) {
-				$headers = [];
+				$request_args['body'] = $args;
 			}
-			if ( $this->auth_token_known() ) {
-				$headers[] = 'Authorization: Bearer ' . $this->auth_token;
-			}
-
-			curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
-
-			// Send request.
-			$content = curl_exec( $ch );
+		}
 
-			if ( false === $content ) {
-				echo '<pre>' . print_r( $url, true ) . '</pre>';
+		$request_args['headers'] = $headers;
 
-				echo '<pre>';
-				print_r( curl_error( $ch ) );
-				echo '</pre>';
+		if ( $this->auth_token_known() ) {
+			$request_args['headers']['Authorization'] = 'Bearer ' . $this->auth_token;
+		}
 
-				echo '<pre>';
-				print_r( curl_errno( $ch ) );
-				echo '</pre>';
+		$response = wp_remote_request( $url, $request_args );
 
-				die;
-			}
-			curl_close( $ch );
-
-			$res = json_decode( $content, true );
-		} catch ( Exception $e ) {
+		if ( is_wp_error( $response ) ) {
 			trigger_error(
 				sprintf(
-					'cURL failed with error #%d: %s',
-					$e->getCode(), $e->getMessage()
+					'Request failed with error %1$s: %2$s',
+					$response->get_error_code(), $response->get_error_message()
 				),
 				E_USER_ERROR
 			);
+			return false;
 		}
 
-		if ( is_array( $res ) && ! empty( $res['errors'] ) ) {
-			if ( false !== array_search( 'Invalid login credentials', $res['errors'], true ) ) {
+		$response_body = json_decode( $response['body'], true );
+
+		if( isset( $response['headers'] ) ) {
+
+			$full_header = $response['headers']->getAll();
+			if ( isset( $full_header['auth-token'] ) && !empty( $full_header['auth-token'] ) ) {
+
+				$response_body['auth_token'] = $full_header['auth-token'];
+			}
+		}
+
+		if ( is_array( $response_body ) && ! empty( $response_body['errors'] ) ) {
+			if ( false !== array_search( 'Invalid login credentials', $response_body['errors'], true ) ) {
 				// The auth_token expired or login failed: Clear the token!
 				// Next time the user visits the settings page, they need to login again.
 				codeable_api_logout();
 				return false;
 			}
 		}
 
-		return $res;
+		return $response_body;
 	}
-
 }

classes/api_data.php

@@ -294,6 +294,15 @@ private function store_transactions( $page ) {
 					$tr['credit_amounts'],
 					$tr['debit_amounts']
 				);
+
+				// If we find a transaction that already exists, bail out and don't continue updating all the transactions
+				if ( $exists ) {
+					update_option( 'wpcable_average', $single_page['average_task_size'] );
+					update_option( 'wpcable_balance', $single_page['balance'] );
+					update_option( 'wpcable_revenue', $single_page['revenue'] );
+					return false;
+				}
+
 			}
 
 			return $page + 1;
@@ -400,16 +409,30 @@ private function store_tasks( $filter, $page ) {
 				} elseif ( ! empty( $task['last_event']['object']['published_at'] ) ) {
 					$new_task['last_activity'] = (int) $task['last_event']['object']['published_at'];
 					$new_task['last_activity_by'] = '';
+				}elseif ( ! empty( $task['last_event']['object']['created_at'] ) ) {
+					$new_task['last_activity'] = (int) strtotime($task['last_event']['object']['created_at']);
+					$new_task['last_activity_by'] = '';
+				}
+				elseif ( ! empty( $task['last_event']['object']['updated_at'] ) ) {
+					$new_task['last_activity'] = (int) strtotime($task['last_event']['object']['updated_at']);
+					$new_task['last_activity_by'] = '';
 				}
 
+
 				if ( ! empty( $task['last_event']['user']['full_name'] ) ) {
 					$new_task['last_activity_by'] = $task['last_event']['user']['full_name'];
 				}
 
+				if ( ! empty( $task['last_event']['type']) && 'create_vault' === $task['last_event']['type']) {
+					$new_task['last_activity'] = (int) strtotime($task['last_event']['user']['last_sign_in_at']);
+					$new_task['last_activity_by'] = $task['last_event']['user']['full_name'];
+				}
+
 				// Some simple rules to automatically detect the correct flag for tasks.
 				if ( 'canceled' === $task['state'] ) {
 					// Tasks that were canceled by the client obviously are lost.
-					$new_task['flag'] = 'lost';
+					$new_task['flag']          = 'lost';
+					$new_task['last_activity'] = (int) strtotime( $task['published_at'] );
 				} elseif ( $new_task['hidden'] ) {
 					// Tasks that I hide from my Codeable list are "lost for us".
 					$new_task['flag'] = 'lost';
@@ -426,8 +449,10 @@ private function store_tasks( $filter, $page ) {
 					}
 				} elseif ( empty( $new_task['last_activity'] ) ) {
 					// This workroom is private for another expert = possibly lost.
-					if ( in_array( $task['state'], [ 'hired', 'completed', 'refunded' ], true ) ) {
-						$new_task['flag'] = 'lost';
+					if ( in_array( $task['state'], [ 'hired', 'completed', 'refunded', 'paid' ], true ) ) {
+						$new_task['flag']          = 'lost';
+						// Disabled last activity for these ones, as it was causing more problems than solving
+						// $new_task['last_activity'] = (int) strtotime( $task['published_at'] );
 					}
 				}
 

classes/tasks.php

@@ -91,7 +91,7 @@ public function sanitize_task( $task ) {
 			false
 		);
 
-		return $task;
+		return apply_filters( 'wpcable_sanitize_task',$task );
 	}
 
 	/**