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

[FIX] snailmail: better tests & delivery address now visible on report

Browse Source 
Tests now check for the 'error' field in Pingen repsonse
snailmail_external_layout.js now targets the right div

closes odoo/odoo#76288

Task: 2588145 & 2583718
X-original-commit: 64ba95bc847f9db661d0e348f8bca1249da0b960
Signed-off-by: Florian Daloze (fda) <fda@odoo.com>
This commit is contained in:
François (FRC)
2021-09-13 10:38:40 +00:00
parent 300b4cc624
commit 94c2717890
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/snailmail/static/src/js/snailmail_external_layout.js
+6 -5
View File
@@ -1,7 +1,8 @@
// Change address font-size if needed
document.addEventListener('DOMContentLoaded', function (evt) {
var recipientAddress = document.getElementsByClassName('address row')[0].getElementsByTagName('address')[0];
var height = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('height'));
var fontSize = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('font-size'));
recipientAddress.style.fontSize = (85/height) * fontSize + 'px';
});
var recipientAddress = document.querySelector(".address.row > div[name='address'] > div")
var style = window.getComputedStyle(recipientAddress, null);
var height = parseFloat(style.getPropertyValue('height'));
var fontSize = parseFloat(style.getPropertyValue('font-size'));
recipientAddress.style.fontSize = (85 / (height / fontSize)) + 'px';
});
addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
+5 -2
View File
@@ -22,10 +22,13 @@
width: 50%;
}
}
.article > .address.row > div[name="address"] {
.pt-5 {
padding-top: 48px !important;
}
.article > div > .address.row > div[name="address"] {
height: 65mm;
background-color: #ffffff;
padding-top: 23mm;
padding-top: 11mm;
padding-left: 5mm;
padding-bottom: 5mm;
left: -20px !important;
addons/snailmail_account/tests/test_pingen_send.py
+2 -2
View File
@@ -62,14 +62,14 @@ class TestPingenSend(HttpCase):
}
response = requests.post(self.pingen_url, data=self.data, files=files)
if 400 <= response.status_code <= 599:
if 400 <= response.status_code <= 599 or response.json()['error']:
msg = "%(code)s %(side)s Error: %(reason)s for url: %(url)s\n%(body)s" % {
'code': response.status_code,
'side': r"%s",
'reason': response.reason,
'url': self.pingen_url,
'body': response.text}
if response.status_code <= 499:
if response.status_code <= 499 or response.json()['error']:
raise requests.HTTPError(msg % "Client")
else:
_logger.warning(msg % "Server")