Improve logging

Author: Maks3w

plugin/aplazame.php

@@ -22,6 +22,15 @@ class WC_Aplazame {
 	const VERSION = '0.4.5';
 	const METHOD_ID = 'aplazame';
 	const METHOD_TITLE = 'Aplazame';
+
+	/**
+	 * @param string $msg
+	 */
+	public static function log( $msg ) {
+		$log = new WC_Logger();
+		$log->add( self::METHOD_ID, $msg );
+	}
+
 	/**
 	 * @var array
 	 */
@@ -139,16 +148,6 @@ public function plugin_action_links( $links ) {
 		return array_merge( $plugin_links, $links );
 	}
 
-	/**
-	 * @param string $msg
-	 */
-	public function log( $msg ) {
-		if ( $this->sandbox ) {
-			$log = new WC_Logger();
-			$log->add( self::METHOD_ID, $msg );
-		}
-	}
-
 	/**
 	 * @return Aplazame_Client
 	 */
@@ -241,7 +240,9 @@ public function confirm() {
 					$e->getMessage()
 				) );
 
-			throw $e;
+			status_header( 500 );
+
+			return null;
 		}
 
 		$order->update_status( 'processing', sprintf( __( 'Confirmed by %s.', 'aplazame' ), $this->apiBaseUri ) );

plugin/classes/sdk/Client.php

@@ -36,7 +36,7 @@ public function __construct( $apiBaseUri, $sandbox, $private_api_key ) {
 	 * @throws Aplazame_Sdk_Api_ApiServerException if request is invalid.
 	 */
 	protected function order_request( $order_id, $method, $path, $data = null ) {
-		return $this->apiClient->request( $method, '/orders/' . $order_id . $path, $data );
+		return $this->request( $method, '/orders/' . $order_id . $path, $data );
 	}
 
 	/**
@@ -97,8 +97,43 @@ public function cancel( $order_id ) {
 	 * @throws Aplazame_Sdk_Api_ApiServerException if request is invalid.
 	 */
 	public function fetch( $order_id ) {
-		$orders = $this->apiClient->request( 'GET', '/orders?mid=' . $order_id );
+		$orders = $this->request( 'GET', '/orders?mid=' . $order_id );
 
 		return $orders['results'][0];
 	}
+	/**
+	 * @param string     $method The HTTP method of the request.
+	 * @param string     $path The path of the request.
+	 * @param array|null $data The data of the request.
+	 *
+	 * @return array The data of the response.
+	 *
+	 * @throws Aplazame_Sdk_Api_ApiCommunicationException if an I/O error occurs.
+	 * @throws Aplazame_Sdk_Api_DeserializeException if response cannot be deserialized.
+	 * @throws Aplazame_Sdk_Api_ApiClientException if an I/O error occurs.
+	 * @throws Aplazame_Sdk_Api_ApiServerException if request is invalid.
+	 */
+	public function request( $method, $path, array $data = null ) {
+		try {
+			return $this->apiClient->request( $method, $path, $data );
+		} catch (Aplazame_Sdk_Api_ApiClientException $e) {
+			$details = json_encode( $e->getError() );
+
+			WC_Aplazame::log( "Error: {$path}; {$e->getStatusCode()}; {$details}" );
+
+			throw $e;
+		} catch (Aplazame_Sdk_Api_ApiServerException $e) {
+			$details = json_encode( $e->getError() );
+
+			WC_Aplazame::log( "Error: {$path}; {$e->getStatusCode()}; {$details}" );
+
+			throw $e;
+		} catch (Exception $e) {
+			$exceptionClass = get_class( $e );
+
+			WC_Aplazame::log( "Error: {$path} {$exceptionClass} {$e->getMessage()}" );
+
+			throw $e;
+		}
+	}
 }

plugin/l10n/es/aplazame-es_ES.mo

@@ -1,31 +1,36 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/aplazame/woocommerce\n"
-"POT-Creation-Date: 2017-01-29 12:19+0000\n"
+"POT-Creation-Date: 2017-02-22 12:26+0000\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: aplazame.php:119
+#: aplazame.php:128
 msgid "Aplazame Campaigns"
 msgstr "Campañas Aplazame"
 
-#: aplazame.php:137
+#: aplazame.php:146
 msgid "Settings"
 msgstr "Ajustes"
 
-#: aplazame.php:227
+#: aplazame.php:237
 #, php-format
 msgid "%s ERROR: Order #%s cannot be confirmed. Reason: %s"
 msgstr ""
 
-#: aplazame.php:293
+#: aplazame.php:248
+#, php-format
+msgid "Confirmed by %s."
+msgstr "Confirmado por %s."
+
+#: aplazame.php:316
 #, php-format
 msgid "%s ERROR: Order #%s cannot be cancelled. Reason: %s"
 msgstr ""
 
-#: aplazame.php:303
+#: aplazame.php:326
 #, php-format
 msgid "Order #%s has been successful cancelled by %s."
 msgstr "El pedido #%s ha sido cancelado correctamente por %s."
@@ -141,8 +146,5 @@ msgstr "La campaña aplica a todo el catálogo de productos."
 #~ msgid "%s ERROR: Order #%s cannot be confirmed."
 #~ msgstr "ERROR en %s: El pedido #%s no se ha podido confirmar."
 
-#~ msgid "Confirmed by %s."
-#~ msgstr "Confirmado por %s."
-
 #~ msgid "%s ERROR: Order #%s cannot be cancelled."
 #~ msgstr "ERROR en %s: El pedido #%s no se ha podido cancelar."

plugin/l10n/es/default.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Aplazame v0.4.5\n"
 "Report-Msgid-Bugs-To: https://github.com/aplazame/woocommerce\n"
-"POT-Creation-Date: 2017-01-29 12:19+0000\n"
+"POT-Creation-Date: 2017-02-22 12:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: https://github.com/aplazame/woocommerce\n"
@@ -17,25 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: aplazame.php:119
+#: aplazame.php:128
 msgid "Aplazame Campaigns"
 msgstr ""
 
-#: aplazame.php:137
+#: aplazame.php:146
 msgid "Settings"
 msgstr ""
 
-#: aplazame.php:227
+#: aplazame.php:237
 #, php-format
 msgid "%s ERROR: Order #%s cannot be confirmed. Reason: %s"
 msgstr ""
 
-#: aplazame.php:293
+#: aplazame.php:248
+#, php-format
+msgid "Confirmed by %s."
+msgstr ""
+
+#: aplazame.php:316
 #, php-format
 msgid "%s ERROR: Order #%s cannot be cancelled. Reason: %s"
 msgstr ""
 
-#: aplazame.php:303
+#: aplazame.php:326
 #, php-format
 msgid "Order #%s has been successful cancelled by %s."
 msgstr ""