Merge pull request #33 from saucal/feature/alpha-release

Disable specific features for an alpha release

Author: lauramelos

includes/class-wc-gateway-amazon-payments-advanced-abstract.php

@@ -275,17 +275,6 @@ public function get_form_fields() {
 					'no'  => __( 'No', 'woocommerce-gateway-amazon-payments-advanced' ),
 				),
 			),
-			'subscriptions_enabled'         => array(
-				'title'       => __( 'Subscriptions support', 'woocommerce-gateway-amazon-payments-advanced' ),
-				'label'       => __( 'Enable Subscriptions for carts that contain Subscription items (requires WooCommerce Subscriptions to be installed)', 'woocommerce-gateway-amazon-payments-advanced' ),
-				'type'        => 'select',
-				'description' => __( 'This will enable support for Subscriptions and make transactions more securely', 'woocommerce-gateway-amazon-payments-advanced' ),
-				'default'     => 'yes',
-				'options'     => array(
-					'yes' => __( 'Yes', 'woocommerce-gateway-amazon-payments-advanced' ),
-					'no'  => __( 'No', 'woocommerce-gateway-amazon-payments-advanced' ),
-				),
-			),
 			'advanced_configuration'        => array(
 				'title'       => __( 'Advanced configurations', 'woocommerce-gateway-amazon-payments-advanced' ),
 				'type'        => 'title',

includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php

@@ -34,6 +34,8 @@ public function __construct() {
 
 		// WC Subscription Hook
 		add_filter( 'woocommerce_subscriptions_process_payment_for_change_method_via_pay_shortcode', array( $this, 'filter_payment_method_changed_result' ), 10, 2 );
+
+		add_filter( 'woocommerce_amazon_pa_form_fields_before_legacy', array( $this, 'add_enable_subscriptions_field' ) );
 	}
 
 	/**
@@ -749,4 +751,51 @@ public function add_subscription_support( $supports ) {
 
 		return $supports;
 	}
+
+	public static function array_insert( $array, $element, $key, $operation = 1 ) {
+		$keys = array_keys( $array );
+		$pos  = array_search( $key, $keys, true );
+
+		switch ( $operation ) {
+			case 1:
+				$read_until = $pos + $operation;
+				$read_from  = $pos + $operation;
+				break;
+			case 0:
+				$read_until = $pos;
+				$read_from  = $pos + 1;
+				break;
+			case -1:
+				$read_until = $pos;
+				$read_from  = $pos;
+				break;
+		}
+
+		$first = array_slice( $array, 0, $read_until, true );
+		$last  = array_slice( $array, $read_from, null, true );
+		return $first + $element + $last;
+	}
+
+	public function add_enable_subscriptions_field( $fields ) {
+		$fields = self::array_insert(
+			$fields,
+			array(
+				'subscriptions_enabled'         => array(
+					'title'       => __( 'Subscriptions support', 'woocommerce-gateway-amazon-payments-advanced' ),
+					'label'       => __( 'Enable Subscriptions for carts that contain Subscription items (requires WooCommerce Subscriptions to be installed)', 'woocommerce-gateway-amazon-payments-advanced' ),
+					'type'        => 'select',
+					'description' => __( 'This will enable support for Subscriptions and make transactions more securely', 'woocommerce-gateway-amazon-payments-advanced' ),
+					'default'     => 'yes',
+					'options'     => array(
+						'yes' => __( 'Yes', 'woocommerce-gateway-amazon-payments-advanced' ),
+						'no'  => __( 'No', 'woocommerce-gateway-amazon-payments-advanced' ),
+					),
+				),
+			),
+			'advanced_configuration',
+			-1
+		);
+
+		return $fields;
+	}
 }

includes/class-wc-gateway-amazon-payments-advanced.php

@@ -38,6 +38,10 @@ public function __construct() {
 	public function is_available() {
 		$is_available = parent::is_available() && ! empty( $this->settings['merchant_id'] );
 
+		if ( function_exists( 'is_checkout_pay_page' ) && is_checkout_pay_page() ) { // TODO: Implement order pay view.
+			$is_available = false;
+		}
+
 		return apply_filters( 'woocommerce_amazon_pa_is_gateway_available', $is_available );
 	}
 

woocommerce-gateway-amazon-payments-advanced.php

@@ -9,7 +9,7 @@
  * Plugin Name: WooCommerce Amazon Pay
  * Plugin URI: https://woocommerce.com/products/pay-with-amazon/
  * Description: Amazon Pay is embedded directly into your existing web site, and all the buyer interactions with Amazon Pay and Login with Amazon take place in embedded widgets so that the buyer never leaves your site. Buyers can log in using their Amazon account, select a shipping address and payment method, and then confirm their order. Requires an Amazon Pay seller account and supports USA, UK, Germany, France, Italy, Spain, Luxembourg, the Netherlands, Sweden, Portugal, Hungary, Denmark, and Japan.
- * Version: 2.0.0
+ * Version: 2.0.0-alpha1
  * Author: WooCommerce
  * Author URI: https://woocommerce.com
  *