Skip to content

Commit

Permalink
Merge pull request #75 from Adyen/develop-1
Browse files Browse the repository at this point in the history
Release 1.2.1
  • Loading branch information
khushboo-singhvi authored Jan 26, 2024
2 parents cd2c53a + 3dcb744 commit 3961179
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "adyen/adyen-magento2-expresscheckout",
"description": "Official Adyen Magento2 plugin to add express payment method shortcuts.",
"type": "magento2-module",
"version": "1.2.0",
"version": "1.2.1",
"license": "MIT",
"repositories": [
{
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Adyen_ExpressCheckout" setup_version="1.2.0">
<module name="Adyen_ExpressCheckout" setup_version="1.2.1">
<sequence>
<module name="Adyen_Payment"/>
</sequence>
Expand Down
10 changes: 9 additions & 1 deletion view/frontend/web/js/googlepay/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,15 @@ define([
activateCart(this.isProductView)
.then(() => getShippingMethods(payload, this.isProductView))
.then(function (response) {
// Stop if no shipping methods.

// If the shipping_method is not available, remove it from the response array.
for (let key in response) {
if (response[key].available === false) {
response.splice(key, 1);
}
}

// Stop if no shipping methods.
if (response.length === 0) {
reject($t('There are no shipping methods available for you right now. Please try again or use an alternative payment method.'));
return;
Expand Down

0 comments on commit 3961179

Please sign in to comment.