summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortbe-odoo <tbe@odoo.com>2017-08-25 17:51:32 +0200
committertbe-odoo <tbe@odoo.com>2017-08-29 17:13:58 +0200
commit83fdc63b68162682f2d3391d4b0bd24a49db1817 (patch)
tree7d0504ea67c693c37f4c44321850f2f3d2ac973f
parentf74111f79f49edffa463043360090fdb9237819d (diff)
[IMP] payment: Fix crash on install
- Fixed a crash when installing payment module. - Set a more specific css selector to display error on payment form where required input are empty
-rw-r--r--addons/payment/models/payment_acquirer.py4
-rw-r--r--addons/payment/static/src/js/payment_form.js8
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 8393170c2be..5a852ffa96f 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -428,7 +428,7 @@ class PaymentOption(models.Model):
image_resize_images(vals)
if 'image' in vals:
- self.image_payment_form = image_resize_image(vals['image'], size=(45,30))
+ vals['image_payment_form'] = image_resize_image(vals['image'], size=(45,30))
return super(PaymentOption, self).create(vals)
@@ -436,7 +436,7 @@ class PaymentOption(models.Model):
def write(self, vals):
image_resize_images(vals)
if 'image' in vals:
- self.image_payment_form = image_resize_image(vals['image'], size=(45,30))
+ vals['image_payment_form'] = image_resize_image(vals['image'], size=(45,30))
return super(PaymentOption, self).write(vals)
class PaymentTransaction(models.Model):
diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index 0942e46ac92..ba4f0d1a7c8 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -41,10 +41,10 @@ odoo.define('payment.payment_form', function (require){
inputs_form.toArray().forEach(function(element) {
if(element.dataset.isRequired) {
if (element.value.length === 0) {
- $(element).closest('div').addClass('has-error');
+ $(element).closest('div.form-group').addClass('has-error');
}
else {
- $(element).closest('div').removeClass('has-error');
+ $(element).closest('div.form-group').removeClass('has-error');
}
empty_inputs = true;
}
@@ -181,10 +181,10 @@ odoo.define('payment.payment_form', function (require){
inputs_form.toArray().forEach(function(element) {
if(element.dataset.isRequired) {
if (element.value.length === 0) {
- $(element).closest('div').addClass('has-error');
+ $(element).closest('div.form-group').addClass('has-error');
}
else {
- $(element).closest('div').removeClass('has-error');
+ $(element).closest('div.form-group').removeClass('has-error');
}
empty_inputs = true;
}