diff options
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js b/addons/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js index 5bba625c61b..65a735df033 100644 --- a/addons/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js @@ -31,6 +31,7 @@ odoo.define('point_of_sale.PaymentScreen', function (require) { onChangeOrder(this._onPrevOrder, this._onNewOrder); useErrorHandlers(); this.payment_interface = null; + this.payment_methods_from_config = this.env.pos.payment_methods.filter(method => this.env.pos.config.payment_method_ids.includes(method.id)); } get currentOrder() { return this.env.pos.get_order(); diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index f2081eefd6d..62424ef80ef 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -504,9 +504,7 @@ exports.PosModel = Backbone.Model.extend({ },{ model: 'pos.payment.method', fields: ['name', 'is_cash_count', 'use_payment_terminal'], - domain: function(self, tmp) { - return [['id', 'in', tmp.payment_method_ids]]; - }, + domain: function(self){return ['|',['active', '=', false], ['active', '=', true]]; }, loaded: function(self, payment_methods) { self.payment_methods = payment_methods.sort(function(a,b){ // prefer cash payment_method to be first in the list diff --git a/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml b/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml index a06e09db484..d78128c933d 100644 --- a/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml +++ b/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml @@ -29,7 +29,7 @@ <div class="paymentmethods-container"> <PaymentScreenPaymentLines paymentLines="paymentLines" /> <div class="paymentmethods"> - <t t-foreach="env.pos.payment_methods" t-as="paymentMethod" + <t t-foreach="payment_methods_from_config" t-as="paymentMethod" t-key="paymentMethod.id"> <PaymentMethodButton paymentMethod="paymentMethod" /> </t> |