checkout v4 dev param renamed and tweaks

Author: alexhernandezord

plugin/aplazame.php

@@ -29,6 +29,11 @@ class WC_Aplazame {
 	const METHOD_ID    = 'aplazame';
 	const METHOD_TITLE = 'Aplazame';
 
+	/**
+	 * @var mixed
+	 */
+	private $private_api_key;
+
 	public static function _m_or_a( $obj, $method, $attribute ) {
 		if ( method_exists( $obj, $method ) ) {
 			return $obj->$method();
@@ -342,7 +347,7 @@ class WC_Aplazame_Install {
 		'cart_downpayment_info'           => 'yes',
 		'product_widget_max_desired'      => 'no',
 		'cart_widget_max_desired'         => 'no',
-		'v4'                              => 'no',
+		'checkout_v4'                     => 'no',
 	);
 
 	public static function upgrade() {

plugin/classes/sdk/Client.php

@@ -78,12 +78,12 @@ public function refund( $order_id, $amount ) {
 	 * @throws Aplazame_Sdk_Api_ApiClientException if an I/O error occurs.
 	 * @throws Aplazame_Sdk_Api_ApiServerException if request is invalid.
 	 */
-	public function create_checkout( $payload, $v4 ) {
+	public function create_checkout( $payload, $checkout_v4 ) {
 		return $this->request(
 			'POST',
 			'/checkout',
 			$payload,
-			$v4 === 'yes' ? 4 : 3
+			$checkout_v4 === 'yes' ? 4 : 3
 		);
 	}
 

plugin/classes/wc-aplazame-gateway.php

@@ -53,8 +53,8 @@ public function get_icon() {
 
 	public function is_available() {
 		if ( ( $this->enabled === 'no' ) ||
-			 ( ! $this->settings['public_api_key'] ) ||
-			 ( ! $this->settings['private_api_key'] )
+			( ! $this->settings['public_api_key'] ) ||
+			( ! $this->settings['private_api_key'] )
 		) {
 			return false;
 		}
@@ -101,7 +101,7 @@ public function checkout( $order_id ) {
 
 		$client = $aplazame->get_client();
 		try {
-			$aplazame_payload = $client->create_checkout( $payload, $aplazame->settings['v4'] );
+			$aplazame_payload = $client->create_checkout( $payload, $aplazame->settings['checkout_v4'] );
 		} catch ( Aplazame_Sdk_Api_AplazameExceptionInterface $e ) {
 			$message = $e->getMessage();
 			$aOrder  = $client->fetch( $payload->order->id );
@@ -193,8 +193,11 @@ public function checks() {
 		}
 	}
 
+	// Settings form
 	public function init_form_fields() {
 		$this->form_fields = array(
+
+			// Base settings
 			'enabled'                         => array(
 				'type'    => 'checkbox',
 				'title'   => __( 'Enable/Disable', 'aplazame' ),
@@ -252,6 +255,8 @@ public function init_form_fields() {
 					'required' => '',
 				),
 			),
+
+			// Product widget settings
 			'product_widget_section'          => array(
 				'title'       => __( 'Product widget', 'woocommerce' ),
 				'type'        => 'title',
@@ -358,6 +363,8 @@ public function init_form_fields() {
 					'required' => '',
 				),
 			),
+
+			// Cart widget settings
 			'cart_widget_section'             => array(
 				'title'       => __( 'Cart widget', 'woocommerce' ),
 				'type'        => 'title',
@@ -435,6 +442,8 @@ public function init_form_fields() {
 				),
 				'default'     => WC_Aplazame_Install::$defaultSettings['cart_widget_align'],
 			),
+
+			// Button settings
 			'button_section'                  => array(
 				'title'       => __( 'Button', 'aplazame' ),
 				'type'        => 'title',
@@ -455,12 +464,14 @@ public function init_form_fields() {
 				'description' => __( 'Aplazame Button Image that you want to show', 'aplazame' ),
 				'placeholder' => WC_Aplazame_Install::$defaultSettings['button_image'],
 			),
+
+			// Developer settings
 			'dev_section'                     => array(
 				'title'       => __( 'Developer Settings (WARNING: DO NOT TOUCH IF NOT NECESSARY)', 'aplazame' ),
 				'type'        => 'title',
 				'description' => '',
 			),
-			'v4'                              => array(
+			'checkout_v4'                     => array(
 				'type'        => 'checkbox',
 				'title'       => __( 'Checkout v4', 'aplazame' ),
 				'description' => __( 'Use v4 checkout API', 'aplazame' ),

plugin/lib/Aplazame/Aplazame/autoload.php

@@ -1,6 +1,6 @@
 <?php
 
-$baseDir = dirname( __FILE__ );
+$baseDir = __DIR__;
 
 require $baseDir . '/Api/BusinessModel/Article.php';
 require $baseDir . '/Api/BusinessModel/HistoricalOrder.php';

plugin/lib/Aplazame/Sdk/autoload.php

@@ -1,6 +1,6 @@
 <?php
 
-$baseDir = dirname( __FILE__ );
+$baseDir = __DIR__;
 
 require $baseDir . '/Http/ClientInterface.php';
 require $baseDir . '/Http/RequestInterface.php';