Commit 17cb8cb9 authored by attilak's avatar attilak

Update with develop

parents 706a2a0a 4ec964b0
...@@ -209,28 +209,30 @@ define( ...@@ -209,28 +209,30 @@ define(
}, },
}; };
}, },
/**
/** * Return the formatted currency. Adyen accepts the currency in multiple formats.
* Return the formatted currency. Adyen accepts the currency in multiple formats. * @param $amount
* @param $amount * @param $currency
* @param $currency * @return string
* @return string */
*/ formatAmount: function (amount, format) {
formatAmount: function(amount, format) { return Math.round(amount * (Math.pow(10, format)))
return Math.round(amount * (Math.pow(10, format))); },
}, isVaultEnabled: function () {
isVaultEnabled: function() { return this.vaultEnabler.isVaultEnabled();
return this.vaultEnabler.isVaultEnabled(); },
}, getVaultCode: function () {
getVaultCode: function() { return "adyen_google_pay_vault";
return 'adyen_google_pay_vault'; },
}, getOriginKey: function () {
getOriginKey: function() { return window.checkoutConfig.payment.adyen.originKey;
return window.checkoutConfig.payment.adyen.originKey; },
}, getCheckoutEnvironment: function () {
getCheckoutEnvironment: function() { return window.checkoutConfig.payment.adyenGooglePay.checkoutEnvironment;
return window.checkoutConfig.payment.adyen.checkoutEnvironment; },
}, onPaymentMethodContentChange: function (data, event) {
}); $(this.googlePayNode).find('button').prop('disabled', !this.validate());
}, }
});
}
); );
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<!--/ko--> <!--/ko-->
</div> </div>
<div class="checkout-agreements-block" afterRender="bindDomEventListener"> <div class="checkout-agreements-block">
<!-- ko foreach: $parent.getRegion('before-place-order') --> <!-- ko foreach: $parent.getRegion('before-place-order') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko--> <!--/ko-->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment