pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] payment*: better handling of error message

Browse Source 
Sometimes there's a title + content, sometimes not; reading the message
itself usually yields a None somewhere which is fugly.
This commit is contained in:
Damien Bouvy
2019-08-16 15:52:40 +00:00
parent c284bda4b0
commit 5193f0d010
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/payment/static/src/js/payment_form.js
+9 -3
View File
@@ -139,6 +139,12 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
$(button).children('.fa').addClass('fa-lock');
$(button).find('span.o_loader').remove();
},
_parseError: function(e) {
if (e.message.data.arguments[1]) {
return e.message.data.arguments[0] + e.message.data.arguments[1];
}
return e.message.data.arguments[0];
},
//--------------------------------------------------------------------------
// Handlers
@@ -246,7 +252,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
self.displayError(
_t('Server Error'),
_t("We are not able to add your payment method at the moment.") +
error.message.data.message
this._parseError(error)
);
});
}
@@ -296,7 +302,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
self.displayError(
_t('Server Error'),
_t("We are not able to redirect you to the payment form. ") +
error.message.data.message
this._parseError(error)
);
});
}
@@ -428,7 +434,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
self.displayError(
_t('Server error'),
_t("We are not able to add your payment method at the moment.</p>") +
error.message.data.message
this._parseError(error)
);
});
}
addons/payment_authorize/static/src/js/payment_form.js
+1 -1
View File
@@ -78,7 +78,7 @@ PaymentForm.include({
self.displayError(
_t('Server Error'),
_t("We are not able to add your payment method at the moment.") +
error.message.data.message
this._parseError(error)
);
});
};
addons/payment_stripe/static/src/js/payment_form.js
+1 -1
View File
@@ -84,7 +84,7 @@ PaymentForm.include({
self.displayError(
_t('Unable to save card'),
_t("We are not able to add your payment method at the moment. ") +
error.message.data.message
this._parseError(error)
);
});
},