Optimize redirect page management

Author: Maks3w

plugin/aplazame.php

@@ -36,6 +36,11 @@ class WC_Aplazame {
 	 */
 	public $apiBaseUri;
 
+	/**
+	 * @var Aplazame_Redirect
+	 */
+	public $redirect;
+
 	/**
 	 * @param string $apiBaseUri
 	 */
@@ -75,8 +80,10 @@ public function __construct($apiBaseUri) {
 		add_action( 'wp_head', array( $this, 'aplazameJs' ), 999999 );
 
 		// Redirect
-		register_activation_hook( __FILE__, 'Aplazame_Redirect::get_the_ID' );
-		add_action( 'wp_footer', 'Aplazame_Redirect::payload' );
+		$this->redirect = new Aplazame_Redirect();
+		register_activation_hook( __FILE__, array( $this->redirect, 'addRedirectPage' ) );
+		register_deactivation_hook( __FILE__, array( $this->redirect, 'removeRedirectPage' ) );
+		add_action( 'wp_footer', array( $this->redirect, 'checkout' ) );
 
 		// TODO: Redirect nav
 		// add_filter('wp_nav_menu_objects', '?');
@@ -180,13 +187,15 @@ public function add_gateway( $methods ) {
 	 * @return null|string
 	 */
 	public function router( $template ) {
-		if ( Aplazame_Redirect::is_redirect() && isset( $_GET['action'] ) ) {
-			switch ( $_GET['action'] ) {
-				case 'confirm':
-					return $this->confirm();
-				case 'history':
-					return $this->history();
-			}
+		if (! isset( $_GET['action'] ) || ! $this->redirect->isRedirect(get_the_ID())) {
+			return $template;
+		}
+
+		switch ( $_GET['action'] ) {
+			case 'confirm':
+				return $this->confirm();
+			case 'history':
+				return $this->history();
 		}
 
 		return $template;

plugin/classes/lib/Redirect.php

@@ -1,47 +1,78 @@
 <?php
 
 class Aplazame_Redirect {
+	/**
+	 * @var string
+	 */
+	public $id;
+
+	public function __construct() {
+		$this->id = $this->getRedirectPageId();
+	}
+
 	/**
 	 * @return bool
 	 */
-	public static function is_redirect() {
+	public function isRedirect( $id ) {
 
-		return get_the_ID() === static::get_the_ID();
+		return ( $this->id === $id );
+	}
+
+	public function checkout() {
+
+		if ( ! isset( $_GET['order_id'] )
+		     || ( (string) WC()->session->redirect_order_id !== $_GET['order_id'] )
+		     || ! $this->isRedirect( get_the_ID() )
+		) {
+			return;
+		}
+
+		Aplazame_Helpers::render_to_template( 'gateway/redirect.php' );
 	}
 
 	/**
-	 * @return int
+	 * @return int|WP_Error
 	 */
-	public static function get_the_ID() {
+	public function addRedirectPage() {
+		if ( $this->id ) {
+			return $this->id;
+		}
 
-		$posts = get_posts( array(
+		$post = array(
+			'post_name'  => 'aplazame-redirect',
+			'post_title'  => __( 'Aplazame Redirect' ),
 			'post_type'   => 'page',
-			'meta_key'    => 'aplazame-redirect',
-			'meta_value'  => 'true',
-			'numberposts' => - 1,
-		) );
+			'post_status' => 'publish',
+			'meta_input'  => array(
+				'aplazame-redirect' => 'true',
+			),
+		);
 
-		if ( empty( $posts ) ) {
-			$defaults = array(
-				'post_title'  => __( 'Aplazame Redirect' ),
-				'post_type'   => 'page',
-				'post_status' => 'publish',
-			);
-
-			$post_id = array( wp_insert_post( $defaults ) );
-			$post_id = $post_id[0];
-			add_post_meta( $post_id, 'aplazame-redirect', 'true' );
-		} else {
-			$post_id = $posts[0]->ID;
-		}
+		$id = wp_insert_post( $post );
+
+		return $id;
+	}
 
-		return $post_id;
+	public function removeRedirectPage() {
+		while ( $id = $this->getRedirectPageId() ) {
+			wp_delete_post( $id, true );
+		}
 	}
 
-	public static function payload() {
+	/**
+	 * @return int|false
+	 */
+	private function getRedirectPageId() {
+		$posts = get_posts( array(
+			'post_type' => 'page',
+			'meta_key'  => 'aplazame-redirect',
+		) );
 
-		if ( static::is_redirect() && ( (string) WC()->session->redirect_order_id === $_GET['order_id'] ) ) {
-			Aplazame_Helpers::render_to_template( 'gateway/redirect.php' );
+		switch ( count( $posts ) ) {
+			case 0:
+				return false;
+			default:
+				return $posts[0]->ID;
 		}
 	}
 }

plugin/classes/wc-aplazame-gateway.php

@@ -51,7 +51,10 @@ public function payment_fields() {
 	}
 
 	public function process_payment( $order_id ) {
-		$url                             = get_permalink( Aplazame_Redirect::get_the_ID() );
+		/** @var WC_Aplazame $aplazame */
+		global $aplazame;
+
+		$url = get_permalink( $aplazame->redirect->id );
 		WC()->session->redirect_order_id = $order_id;
 
 		return array(

plugin/l10n/es/aplazame-es_ES.mo

@@ -1,51 +1,51 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/aplazame/woocommerce\n"
-"POT-Creation-Date: 2016-06-21 14:17+0000\n"
+"POT-Creation-Date: 2016-07-27 12:32+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:116
+#: aplazame.php:123
 msgid "Settings"
 msgstr "Ajustes"
 
-#: aplazame.php:205
+#: aplazame.php:214
 #, php-format
 msgid "%s ERROR: Order #%s cannot be confirmed."
 msgstr "ERROR en %s: El pedido #%s no se ha podido confirmar."
 
-#: aplazame.php:214
+#: aplazame.php:223
 #, php-format
 msgid "Confirmed by %s."
 msgstr "Confirmado por %s."
 
-#: aplazame.php:279
+#: aplazame.php:288
 #, php-format
 msgid "%s ERROR: Order #%s cannot be cancelled."
 msgstr "ERROR en %s: El pedido #%s no se ha podido cancelar."
 
-#: aplazame.php:286
+#: aplazame.php:295
 #, php-format
 msgid "Order #%s has been successful cancelled by %s."
 msgstr "El pedido #%s ha sido cancelado correctamente por %s."
 
-#: classes/lib/Redirect.php:26
+#: classes/lib/Redirect.php:43
 msgid "Aplazame Redirect"
 msgstr ""
 
-#: classes/wc-aplazame-gateway.php:77
+#: classes/wc-aplazame-gateway.php:80
 #, php-format
 msgid "%s Error: \"%s\""
 msgstr "Error en %s: \"%s\""
 
-#: classes/wc-aplazame-gateway.php:82
+#: classes/wc-aplazame-gateway.php:85
 #, php-format
 msgid "%s has successfully returned %d %s of the order #%s."
 msgstr "%s ha devuelto correctamente la cantidad de %d %s en el pedido #%s."
 
-#: classes/wc-aplazame-gateway.php:98
+#: classes/wc-aplazame-gateway.php:101
 #, php-format
 msgid ""
 "Aplazame gateway requires the API keys, please <a href=\"%s\">sign up</a> "
@@ -54,75 +54,75 @@ msgstr ""
 "Se necesitan las claves de API para la pasarela de pago de Aplazame, por "
 "favor, <a href=\"%s\">regístrate</a> y obtén tus claves."
 
-#: classes/wc-aplazame-gateway.php:108
+#: classes/wc-aplazame-gateway.php:111
 msgid "Enable/Disable"
 msgstr "Activar/Desactivar"
 
-#: classes/wc-aplazame-gateway.php:109
+#: classes/wc-aplazame-gateway.php:112
 msgid "Enable Aplazame module"
 msgstr "Activar módulo de Aplazame"
 
-#: classes/wc-aplazame-gateway.php:115
+#: classes/wc-aplazame-gateway.php:118
 msgid "Determines if the module is on Sandbox mode"
 msgstr "Determina si el módulo se encuentra en modo Sandbox"
 
-#: classes/wc-aplazame-gateway.php:116
+#: classes/wc-aplazame-gateway.php:119
 msgid "Turn on Sandbox"
 msgstr "Activar modo Sandbox"
 
-#: classes/wc-aplazame-gateway.php:119
+#: classes/wc-aplazame-gateway.php:122
 msgid "API Credentials"
 msgstr ""
 
-#: classes/wc-aplazame-gateway.php:125
+#: classes/wc-aplazame-gateway.php:128
 msgid "Private API Key"
 msgstr "Clave API privada"
 
-#: classes/wc-aplazame-gateway.php:126
+#: classes/wc-aplazame-gateway.php:129
 msgid "Aplazame API Private Key"
 msgstr "Clave API privada de Aplazame"
 
-#: classes/wc-aplazame-gateway.php:134
+#: classes/wc-aplazame-gateway.php:137
 msgid "Public API Key"
 msgstr "Clave API pública"
 
-#: classes/wc-aplazame-gateway.php:135
+#: classes/wc-aplazame-gateway.php:138
 msgid "Aplazame API Public Key"
 msgstr "Clave API pública de Aplazame"
 
-#: classes/wc-aplazame-gateway.php:141
+#: classes/wc-aplazame-gateway.php:144
 msgid "Advanced options"
 msgstr ""
 
-#: classes/wc-aplazame-gateway.php:147
+#: classes/wc-aplazame-gateway.php:150
 msgid "Button"
 msgstr "Botón"
 
-#: classes/wc-aplazame-gateway.php:148
+#: classes/wc-aplazame-gateway.php:151
 msgid "Aplazame Button CSS Selector"
 msgstr "Selector CSS del botón de Aplazame"
 
-#: classes/wc-aplazame-gateway.php:156
+#: classes/wc-aplazame-gateway.php:159
 msgid "Product quantity CSS selector"
 msgstr "Selector CSS del número de unidades del producto"
 
-#: classes/wc-aplazame-gateway.php:157
+#: classes/wc-aplazame-gateway.php:160
 msgid "CSS selector pointing to product quantity"
 msgstr "Selector CSS para obtener la cantidad de producto"
 
-#: classes/wc-aplazame-gateway.php:162
+#: classes/wc-aplazame-gateway.php:165
 msgid "Product price CSS selector"
 msgstr "Selector CSS del precio del producto"
 
-#: classes/wc-aplazame-gateway.php:163
+#: classes/wc-aplazame-gateway.php:166
 msgid "CSS selector pointing to product price"
 msgstr "Selector CSS para obtener el precio del producto"
 
-#: classes/wc-aplazame-gateway.php:168
+#: classes/wc-aplazame-gateway.php:171
 msgid "Variable product price CSS selector"
 msgstr "Selector CSS del precio variable del producto"
 
-#: classes/wc-aplazame-gateway.php:169
+#: classes/wc-aplazame-gateway.php:172
 msgid "CSS selector pointing to variable product price"
 msgstr "Selector CSS para obtener el precio variable del producto"