Merge pull request #42 from saucal/hotfix/alpha3

Alpha 3

Author: lauramelos

assets/js/amazon-wc-checkout.js

@@ -21,7 +21,7 @@
 				var button_settings = {
 					// set checkout environment
 					merchantId: amazon_payments_advanced.merchant_id,
-					ledgerCurrency: 'EUR', // TODO: Implement multicurrency
+					ledgerCurrency: amazon_payments_advanced.ledger_currency,
 					sandbox: amazon_payments_advanced.sandbox === '1' ? true : false,
 					// customize the buyer experience
 					productType: amazon_payments_advanced.action,
@@ -49,10 +49,12 @@
 		}
 
 		function activateChange( button_id, action ) {
-			if ( 0 === $( button_id ).length ) {
+			var $btn = $( button_id );
+			if ( 0 === $btn.length || $btn.data( 'wc_apa_chage_bind' ) === action ) {
 				return;
 			}
-			$( button_id ).on( 'click', function( e ) {
+			$btn.data( 'wc_apa_chage_bind', action );
+			$btn.on( 'click', function( e ) {
 				e.preventDefault();
 			} );
 			amazon.Pay.bindChangeAction( button_id, {
@@ -77,28 +79,34 @@
 		}
 
 		function initAmazonPaymentFields() {
+			if ( ! isAmazonCheckout() ) {
+				return;
+			}
 			toggleDetailsVisibility( 'woocommerce-billing-fields' );
 			toggleDetailsVisibility( 'woocommerce-shipping-fields' );
 			toggleDetailsVisibility( 'woocommerce-additional-fields' );
 			activateChange( '#payment_method_widget_change', 'changePayment' );
 			activateChange( '#shipping_address_widget_change', 'changeAddress' );
-		}
 
-		$( 'body' ).on( 'updated_checkout', function() {
-			initAmazonPaymentFields();
-			if ( ! isAmazonCheckout() ) {
-				return;
-			}
 			if ( $( '.woocommerce-billing-fields .woocommerce-billing-fields__field-wrapper > *' ).length > 0 ) {
 				$( '.woocommerce-billing-fields' ).insertBefore( '#payment' );
 			}
+
+			if ( $( '.woocommerce-account-fields' ).length > 0 ) {
+				$( '.woocommerce-account-fields' ).insertBefore( '#wc-apa-account-fields-anchor' );
+			}
+
 			if ( $( '.woocommerce-shipping-fields .woocommerce-shipping-fields__field-wrapper > *' ).length > 0 ) {
 				var title = $( '#ship-to-different-address' );
 				title.find( ':checkbox#ship-to-different-address-checkbox' ).hide();
 				title.find( 'span' ).text( amazon_payments_advanced.shipping_title );
 				$( '.woocommerce-shipping-fields' ).insertBefore( '#payment' );
 			}
 			$( '.woocommerce-additional-fields' ).insertBefore( '#payment' );
-		} );
+		}
+
+		initAmazonPaymentFields();
+
+		$( 'body' ).on( 'updated_checkout', initAmazonPaymentFields );
 	} );
 } )( jQuery );

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "5.7.27",
-        "woocommerce/woocommerce-sniffs": "0.0.8"
+        "woocommerce/woocommerce-sniffs": "0.1.0"
     },
     "require": {
         "amzn/amazon-pay-api-sdk-php": "^2.2"