diff --git a/pos_usability/__manifest__.py b/pos_usability/__manifest__.py index 543f544..7f43705 100644 --- a/pos_usability/__manifest__.py +++ b/pos_usability/__manifest__.py @@ -34,6 +34,7 @@ Akretion: "views/pos_order.xml", "views/pos_config.xml", "views/product.xml", + "views/pos_payment_method.xml", ], "installable": True, } diff --git a/pos_usability/models/pos_payment_method.py b/pos_usability/models/pos_payment_method.py index 4707db3..cf16d6e 100644 --- a/pos_usability/models/pos_payment_method.py +++ b/pos_usability/models/pos_payment_method.py @@ -8,5 +8,7 @@ from odoo import fields, models class PosPaymentMethod(models.Model): _inherit = 'pos.payment.method' _check_company_auto = True + _order = 'sequence, id' cash_journal_id = fields.Many2one(check_company=True) + sequence = fields.Integer(default=10) diff --git a/pos_usability/pos_payment_method-sort_by_sequence.diff b/pos_usability/pos_payment_method-sort_by_sequence.diff new file mode 100644 index 0000000..2e2d5a3 --- /dev/null +++ b/pos_usability/pos_payment_method-sort_by_sequence.diff @@ -0,0 +1,22 @@ +diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js +index 86a7b44bcfb..06b46ba5645 100644 +--- a/addons/point_of_sale/static/src/js/models.js ++++ b/addons/point_of_sale/static/src/js/models.js +@@ -514,16 +514,7 @@ exports.PosModel = Backbone.Model.extend({ + fields: ['name', 'is_cash_count', 'use_payment_terminal'], + 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 +- if (a.is_cash_count && !b.is_cash_count) { +- return -1; +- } else if (!a.is_cash_count && b.is_cash_count) { +- return 1; +- } else { +- return a.id - b.id; +- } +- }); ++ self.payment_methods = payment_methods; + self.payment_methods_by_id = {}; + _.each(self.payment_methods, function(payment_method) { + self.payment_methods_by_id[payment_method.id] = payment_method; diff --git a/pos_usability/views/pos_payment_method.xml b/pos_usability/views/pos_payment_method.xml new file mode 100644 index 0000000..b95de63 --- /dev/null +++ b/pos_usability/views/pos_payment_method.xml @@ -0,0 +1,20 @@ + + + + + + + pos.payment.method + + + + + + + + +