From f9750a5b3612dfde3b74d3ccd1d1bdadfe621dab Mon Sep 17 00:00:00 2001 From: "Jacky (trj)" Date: Wed, 17 Aug 2022 15:02:04 +0000 Subject: [PATCH] [IMP] point_of_sale: pos_bill support for both US and EU In order to support US and EU at the same time, we're adding 0.25 as `pos_bill` and removing the 500 one. Increasing the height of the `MoneyDetailsPopup` to avoid having a scroll bar while having default data. closes odoo/odoo#98315 Signed-off-by: Masereel Pierre --- addons/point_of_sale/data/point_of_sale_data.xml | 12 ++++++------ .../static/src/css/popups/money_details_popup.css | 6 +++--- .../static/src/js/Popups/MoneyDetailsPopup.js | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/point_of_sale/data/point_of_sale_data.xml b/addons/point_of_sale/data/point_of_sale_data.xml index 306572bf709..52ff5f02a34 100644 --- a/addons/point_of_sale/data/point_of_sale_data.xml +++ b/addons/point_of_sale/data/point_of_sale_data.xml @@ -76,6 +76,12 @@ + + 0.25 + 0.25 + + + 0.50 0.50 @@ -130,12 +136,6 @@ - - 500.00 - 500.00 - - - diff --git a/addons/point_of_sale/static/src/css/popups/money_details_popup.css b/addons/point_of_sale/static/src/css/popups/money_details_popup.css index 5f23d374ac0..706ff2ffbca 100644 --- a/addons/point_of_sale/static/src/css/popups/money_details_popup.css +++ b/addons/point_of_sale/static/src/css/popups/money_details_popup.css @@ -1,6 +1,6 @@ .pos .popup.money-details { width: 350px; - max-height: 400px; + max-height: 440px; } .pos .money-details.invisible { @@ -8,7 +8,7 @@ } .pos .money-details .body { - max-height: 306px; + max-height: 350px; } .pos .money-details .money-details-title { @@ -22,7 +22,7 @@ display: flex; justify-content: space-between; overflow: auto; - max-height: 235px; + max-height: 280px; padding: 0 15px; } diff --git a/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js b/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js index 4cedd9ea95e..26aba2664d5 100644 --- a/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js @@ -25,11 +25,11 @@ odoo.define('point_of_sale.MoneyDetailsPopup', function(require) { } get firstHalfMoneyDetails() { const moneyDetailsKeys = Object.keys(this.state.moneyDetails).sort((a, b) => a - b); - return moneyDetailsKeys.slice(0, moneyDetailsKeys.length/2); + return moneyDetailsKeys.slice(0, Math.ceil(moneyDetailsKeys.length/2)); } get lastHalfMoneyDetails() { const moneyDetailsKeys = Object.keys(this.state.moneyDetails).sort((a, b) => a - b); - return moneyDetailsKeys.slice(moneyDetailsKeys.length/2, moneyDetailsKeys.length); + return moneyDetailsKeys.slice(Math.ceil(moneyDetailsKeys.length/2), moneyDetailsKeys.length); } updateMoneyDetailsAmount() { let total = Object.entries(this.state.moneyDetails).reduce((total, money) => total + money[0] * money[1], 0);