Merge pull request #227 from saucal/feature/woo-feeback

Feature/woo feeback

Author: lauramelos

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

@@ -180,13 +180,13 @@ protected function get_admin_notices() {
 			);
 		}
 
-		if ( ! WC_Amazon_Payments_Advanced_API::get_amazon_keys_set() && 'yes' === $this->settings['enabled'] ) {
+		if ( ! WC_Amazon_Payments_Advanced_API::get_amazon_keys_set() && 'yes' === $this->settings['enabled'] && $current_section !== 'amazon_payments_advanced' ) {
 			$notices[] = array(
 				'dismiss_action' => 'amazon_pay_dismiss_enable_notice',
 				'class'          => 'amazon-pay-enable-notice',
 				'text'           => sprintf(
 					// translators: 1) The URL to the Amazon Pay settings screen.
-					__( 'Amazon Pay is now enabled for WooCommerce and ready to accept live payments. Please check the <a href="%1$s">configuration</a>. to make sure everything is set correctly.', 'woocommerce-gateway-amazon-payments-advanced' ),
+					__( 'Amazon Pay is now enabled for WooCommerce. Please check the <a href="%1$s">configuration</a>. to make sure everything is set correctly to accept live payments.', 'woocommerce-gateway-amazon-payments-advanced' ),
 					esc_url( $this->get_settings_url() )
 				),
 				'is_dismissable' => true,
@@ -332,15 +332,20 @@ public function admin_notices() {
 	public function review_prompt() {
 		global $current_section;
 
-		$anniversary_date  = get_option( 'amazon_payments_advanced_anniversary_date' );
+		// Bail early and always if we don't have the keys set.
+		if ( ! WC_Amazon_Payments_Advanced_API::get_amazon_keys_set() ) {
+			return;
+		}
+
+		$anniversary_date  = get_option( 'amazon_payments_advanced_enabled_anniversary_date' );
 		$hidden_until_date = get_option( 'amazon_payments_advanced_hidden_until_date' );
 
 		// Set up the dates.
 		// We do this here, so its on admin side but not dependant on user visiting the plugin's settings.
 		if ( ! $anniversary_date || ! $hidden_until_date ) {
 			$anniversary_date  = time();
 			$hidden_until_date = strtotime( '+1 month' );
-			update_option( 'amazon_payments_advanced_anniversary_date', $anniversary_date );
+			update_option( 'amazon_payments_advanced_enabled_anniversary_date', $anniversary_date );
 			update_option( 'amazon_payments_advanced_hidden_until_date', $hidden_until_date );
 		}
 
@@ -407,7 +412,7 @@ public function review_prompt() {
 	public function ajax_dismiss_review_prompt() {
 		check_ajax_referer( 'amazon_pay_dismiss_review_prompt', 'nonce' );
 
-		$anniversary_date = get_option( 'amazon_payments_advanced_anniversary_date' );
+		$anniversary_date = get_option( 'amazon_payments_advanced_enabled_anniversary_date' );
 
 		// Start from the stored anniversary date.
 		// Add a year in each loop until the result is in the future.

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

@@ -177,7 +177,7 @@ abstract class WC_Gateway_Amazon_Payments_Advanced_Abstract extends WC_Payment_G
 	 */
 	public function __construct() {
 		$this->method_title         = __( 'Amazon Pay', 'woocommerce-gateway-amazon-payments-advanced' );
-		$this->method_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.', 'woocommerce-gateway-amazon-payments-advanced' );
+		$this->method_description   = __( 'Amazon Pay allows 300M+ active buyers to checkout using their Amazon account and is embedded directly into your existing website.', 'woocommerce-gateway-amazon-payments-advanced' );
 		$this->id                   = 'amazon_payments_advanced';
 		$this->icon                 = apply_filters( 'woocommerce_amazon_pa_logo', wc_apa()->plugin_url . '/build/images/amazon-payments.png' );
 		$this->view_transaction_url = $this->get_transaction_url_format();
@@ -389,7 +389,7 @@ public function get_form_fields() {
 			),
 			'manual_notice'               => array(
 				'type' => 'custom',
-				'html' => '<p>Problems with automatic setup? <a href="#" class="wcapa-toggle-section" data-toggle="#manual-settings-container, #automatic-settings-container">Click here</a> to manually enter your keys.</p>',
+				'html' => '<p>Problems with automatic setup? Toggle here <a href="#" class="wcapa-toggle-section" data-toggle="#manual-settings-container, #automatic-settings-container"><span class="woocommerce-input-toggle woocommerce-input-toggle--disabled" aria-label="' . esc_attr( __( 'Manually enter your keys', 'woocommerce-gateway-amazon-payments-advanced' ) ) . '">' . esc_attr__( 'Yes', 'woocommerce' ) . '</span></a> to manually enter your keys.</p>',
 			),
 			'manual_container_start'      => array(
 				'type' => 'custom',

src/js/non-block/amazon-wc-admin.js

@@ -351,6 +351,7 @@
 		toggle_visibility: function( e ) {
 			e.preventDefault();
 			var target = $( $( this ).data( 'toggle' ) );
+			$(this).find( 'span' ).toggleClass( 'woocommerce-input-toggle--disabled', 'woocommerce-input-toggle--enabled' );
 			target.toggleClass( 'hidden' );
 			if ( ! $( this ).hasClass( 'wcapa-toggle-scroll' ) ) {
 				return;

src/sass/style-admin.scss

@@ -5,3 +5,8 @@
 .json_key_valid {
 	border: 1px solid #18ff59;
 }
+
+.wcapa-toggle-section:focus {
+	outline: 0;
+	box-shadow: none
+}