diff --git a/pos_multi_order_payment/README.rst b/pos_multi_order_payment/README.rst new file mode 100644 index 0000000000..15c332c5e8 --- /dev/null +++ b/pos_multi_order_payment/README.rst @@ -0,0 +1,84 @@ +======================= +Pos Multi Order Payment +======================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:2d6a9f4e4e0ec916213578a59191c52d01f96c495d945338df8ce58f6da3194d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/17.0/pos_multi_order_payment + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-17-0/pos-17-0-pos_multi_order_payment + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module will allow you to pay several open point of sale orders at +the same time. + +The principal order will return the other orders amount and the other +orders will be payed with this amount. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Dixmit +* INVITU + +Contributors +------------ + +- Enric Tobella +- ``SerpentCS ``: + + - Kamla Dodiya kamla.d.serpentcs@gmail.com + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_multi_order_payment/__init__.py b/pos_multi_order_payment/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/pos_multi_order_payment/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/pos_multi_order_payment/__manifest__.py b/pos_multi_order_payment/__manifest__.py new file mode 100644 index 0000000000..c7559ac3cc --- /dev/null +++ b/pos_multi_order_payment/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2023 Dixmit +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Pos Multi Order Payment", + "summary": """ + Allow to pay multiple orders with the same payment""", + "version": "17.0.1.0.0", + "license": "AGPL-3", + "author": "Dixmit,INVITU,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/pos", + "depends": ["point_of_sale"], + "assets": { + "point_of_sale._assets_pos": [ + "pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js", + "pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml", + "pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js", + "pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml", + "pos_multi_order_payment/static/src/app/models.esm.js", + ], + }, + "data": [], + "demo": [], +} diff --git a/pos_multi_order_payment/models/__init__.py b/pos_multi_order_payment/models/__init__.py new file mode 100644 index 0000000000..e9ab911ddc --- /dev/null +++ b/pos_multi_order_payment/models/__init__.py @@ -0,0 +1 @@ +from . import pos_order diff --git a/pos_multi_order_payment/models/pos_order.py b/pos_multi_order_payment/models/pos_order.py new file mode 100644 index 0000000000..bfb41c4797 --- /dev/null +++ b/pos_multi_order_payment/models/pos_order.py @@ -0,0 +1,46 @@ +# Copyright 2023 Dixmit +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import _, fields, models +from odoo.exceptions import UserError +from odoo.tools import float_is_zero + + +class PosOrder(models.Model): + _inherit = "pos.order" + + payment_order_id = fields.Many2one("pos.order", readonly=True) + + def _export_for_ui(self, order): + result = super()._export_for_ui(order) + result["payment_order_id"] = order.payment_order_id.id + return result + + def _process_payment_lines(self, pos_order, order, pos_session, draft): + rec = super()._process_payment_lines(pos_order, order, pos_session, draft) + prec_acc = order.currency_id.decimal_places + if ( + not draft + and float_is_zero(order.amount_paid, prec_acc) + and pos_order.get("payment_order_id") + ): + order.write({"payment_order_id": pos_order["payment_order_id"]}) + cash_payment_method = pos_session.payment_method_ids.filtered( + "is_cash_count" + )[:1] + if not cash_payment_method: + raise UserError( + _( + """No cash statement found for this session. +Unable to record a multiple order payment.""" + ) + ) + return_payment_vals = { + "name": _("Multi order payment"), + "pos_order_id": order.id, + "amount": order.amount_total, + "payment_date": fields.Datetime.now(), + "payment_method_id": cash_payment_method.id, + } + order.add_payment(return_payment_vals) + return rec diff --git a/pos_multi_order_payment/pyproject.toml b/pos_multi_order_payment/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/pos_multi_order_payment/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/pos_multi_order_payment/readme/CONTRIBUTORS.md b/pos_multi_order_payment/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..3407e27d60 --- /dev/null +++ b/pos_multi_order_payment/readme/CONTRIBUTORS.md @@ -0,0 +1,3 @@ + - Enric Tobella + - `SerpentCS `: + - Kamla Dodiya \ No newline at end of file diff --git a/pos_multi_order_payment/readme/DESCRIPTION.md b/pos_multi_order_payment/readme/DESCRIPTION.md new file mode 100644 index 0000000000..c72121e887 --- /dev/null +++ b/pos_multi_order_payment/readme/DESCRIPTION.md @@ -0,0 +1,3 @@ +This module will allow you to pay several open point of sale orders at the same time. + +The principal order will return the other orders amount and the other orders will be payed with this amount. diff --git a/pos_multi_order_payment/static/description/icon.png b/pos_multi_order_payment/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/pos_multi_order_payment/static/description/icon.png differ diff --git a/pos_multi_order_payment/static/description/index.html b/pos_multi_order_payment/static/description/index.html new file mode 100644 index 0000000000..5308b3e090 --- /dev/null +++ b/pos_multi_order_payment/static/description/index.html @@ -0,0 +1,431 @@ + + + + + +Pos Multi Order Payment + + + +
+

Pos Multi Order Payment

+ + +

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

This module will allow you to pay several open point of sale orders at +the same time.

+

The principal order will return the other orders amount and the other +orders will be payed with this amount.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Dixmit
    • +
  • INVITU
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/pos project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/pos_multi_order_payment/static/src/app/models.esm.js b/pos_multi_order_payment/static/src/app/models.esm.js new file mode 100644 index 0000000000..e088316f75 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/models.esm.js @@ -0,0 +1,44 @@ +/** @odoo-module **/ + +import {Order, Payment} from "@point_of_sale/app/store/models"; + +import {patch} from "@web/core/utils/patch"; + +patch(Order.prototype, { + setup() { + this.payment_order_id = false; + super.setup(...arguments); + }, + init_from_JSON(json) { + super.init_from_JSON(...arguments); + this.payment_order_id = json.payment_order_id; + }, + export_as_JSON() { + const json = super.export_as_JSON(...arguments); + if (this.payment_order_id) { + json.payment_order_id = this.payment_order_id.server_id; + } + return json; + }, + add_paymentline_amount(payment_method, due) { + this.assert_editable(); + if (this.electronic_payment_in_progress()) { + return false; + } + var newPaymentline = new Payment( + {env: this.env}, + {order: this, payment_method: payment_method, pos: this.pos} + ); + this.paymentlines.add(newPaymentline); + this.select_paymentline(newPaymentline); + if (this.pos.config.cash_rounding) { + this.selected_paymentline.set_amount(0); + } + newPaymentline.set_amount(due); + + if (payment_method.payment_terminal) { + newPaymentline.set_payment_status("pending"); + } + return newPaymentline; + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js new file mode 100644 index 0000000000..374853bc5a --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js @@ -0,0 +1,188 @@ +/** @odoo-module **/ + +import {ConfirmPopup} from "@point_of_sale/app/utils/confirm_popup/confirm_popup"; +import {ErrorPopup} from "@point_of_sale/app/errors/popups/error_popup"; +import {PaymentScreen} from "@point_of_sale/app/screens/payment_screen/payment_screen"; +import {PaymentScreenStatus} from "@point_of_sale/app/screens/payment_screen/payment_status/payment_status"; +import {_t} from "@web/core/l10n/translation"; +import {patch} from "@web/core/utils/patch"; +import {roundPrecision as round_pr} from "@web/core/utils/numbers"; +import {usePos} from "@point_of_sale/app/store/pos_hook"; +import {useState} from "@odoo/owl"; + +patch(PaymentScreenStatus.prototype, { + setup() { + super.setup(); + this.pos = usePos(); + }, + get totalDueText() { + var change = + this.props.order.get_total_with_tax() + + this.props.order.get_rounding_applied(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + change = change + order.get_total_with_tax() + order.get_rounding_applied(); + } + return this.env.utils.formatCurrency(change); + }, + get remainingText() { + var due = this.props.order.get_due(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + due += order.get_due(); + } + return this.env.utils.formatCurrency(due > 0 ? due : 0); + }, + get changeText() { + var change = this.props.order.get_change(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + change = + change + + order.get_total_paid() - + order.get_total_with_tax() - + order.get_rounding_applied(); + } + return this.env.utils.formatCurrency( + round_pr(Math.max(0, change), this.pos.currency.rounding) + ); + }, +}); + +patch(PaymentScreen.prototype, { + setup() { + super.setup(...arguments); + this.selectedExtraOrders = useState({ + orders: {}, + invoiceOrders: {}, + }); + }, + async CurrentselectPartner(isEditMode = false, missingFields = [], order = null) { + const targetOrder = order || this.currentOrder; + const currentPartner = targetOrder.get_partner(); + const partnerScreenProps = {partner: currentPartner}; + + if (isEditMode && currentPartner) { + partnerScreenProps.editModeProps = true; + partnerScreenProps.missingFields = missingFields; + } + + const {confirmed, payload: newPartner} = await this.pos.showTempScreen( + "PartnerListScreen", + partnerScreenProps + ); + + if (confirmed) { + targetOrder.set_partner(newPartner); + } + return confirmed; + }, + + async appendOrder(order, forInvoice = false) { + var orders = this.selectedExtraOrders.orders; + var invoiceOrders = this.selectedExtraOrders.invoiceOrders; + + if (forInvoice) { + if (this.selectedExtraOrders.orders[order.cid] === undefined) { + orders[order.cid] = order; + } + if (!order.partner) { + const {confirmed} = await this.popup.add(ConfirmPopup, { + title: _t("Please select the Customer"), + body: _t( + "You need to select the customer before you can invoice or ship an order." + ), + }); + if (confirmed) { + const partnerConfirmed = await this.CurrentselectPartner( + false, + [], + order + ); + if (!partnerConfirmed) { + return false; + } + } else { + return false; + } + } + if (order.partner) { + order.set_to_invoice(true); + } + if (this.selectedExtraOrders.invoiceOrders[order.cid] === undefined) { + invoiceOrders[order.cid] = order; + } else { + delete invoiceOrders[order.cid]; + } + } else { + if (this.selectedExtraOrders.orders[order.cid] === undefined) { + orders[order.cid] = order; + } else { + delete orders[order.cid]; + } + if (this.selectedExtraOrders.invoiceOrders[order.cid] !== undefined) { + delete invoiceOrders[order.cid]; + } + } + this.selectedExtraOrders.orders = {...orders}; + this.selectedExtraOrders.invoiceOrders = {...invoiceOrders}; + }, + addNewPaymentLine(paymentMethod) { + if (Object.keys(this.selectedExtraOrders.orders).length === 0) { + return super.addNewPaymentLine(...arguments); + } + var due = this.currentOrder.get_due(); + for (const order of Object.values(this.selectedExtraOrders.orders)) { + due += order.get_due(); + } + const result = this.currentOrder.add_paymentline_amount(paymentMethod, due); + if (result) { + this.numberBuffer.reset(); + return true; + } + this.popup.add(ErrorPopup, { + title: _t("Error"), + body: _t("There is already an electronic payment in progress."), + }); + return false; + }, + async _finalizeValidation() { + await super._finalizeValidation(...arguments); + for (const order_key in this.selectedExtraOrders.orders) { + const order = this.selectedExtraOrders.orders[order_key]; + if (!order.finalized) { + /* + This should only happen on offline mode + */ + order.finalized = true; + order.payment_order_id = this.currentOrder; + } + } + }, + get orders() { + return this.pos.orders.filter( + (o) => o.canPay() && o.cid !== this.currentOrder.cid + ); + }, + async afterOrderValidation() { + await super.afterOrderValidation(...arguments); + for (const order_key in this.selectedExtraOrders.orders) { + /* + We need to set all the selected extra orders as payed. + */ + const order = this.selectedExtraOrders.orders[order_key]; + order.finalized = true; + order.date_order = luxon.DateTime.now(); + order.payment_order_id = this.currentOrder; + var syncOrderResult = await this.pos.push_single_order(order); + if ( + syncOrderResult && + syncOrderResult.length > 0 && + order.wait_for_push_order() + ) { + await this._postPushOrderResolve( + order, + syncOrderResult.map((res) => res.id) + ); + } + this.pos.db.remove_unpaid_order(order); + } + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml new file mode 100644 index 0000000000..369f9ba529 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml @@ -0,0 +1,44 @@ + + + + + + selectedExtraOrders.orders + + + selectedExtraOrders.orders + + + + +
+

+ Append orders +

+ +
+
+ + + +
+
+ +
+ + + diff --git a/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js new file mode 100644 index 0000000000..845715a19b --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js @@ -0,0 +1,32 @@ +/** @odoo-module **/ + +import {ReceiptScreen} from "@point_of_sale/app/screens/receipt_screen/receipt_screen"; +import {patch} from "@web/core/utils/patch"; + +patch(ReceiptScreen.prototype, { + get printOtherOrders() { + return ( + this.pos.orders.filter((order) => { + return order.finalized && order.cid !== this.currentOrder.cid; + }).length > 0 + ); + }, + isResumeVisible() { + return super.isResumeVisible() && !this.printOtherOrders; + }, + printNextOrder() { + this.pos.removeOrder(this.currentOrder); + this.pos.set_order( + this.pos.orders.find((order) => { + return order.finalized && order.cid !== this.currentOrder.cid; + }) + ); + // As we are reusing the same view, we need to do this stuff... + this.currentOrder = this.pos.get_order(); + const partner = this.currentOrder.get_partner(); + this.orderUiState = this.currentOrder.uiState.ReceiptScreen; + this.orderUiState.inputEmail = + this.orderUiState.inputEmail || (partner && partner.email) || ""; + this.pos.showScreen("ReceiptScreen"); + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml new file mode 100644 index 0000000000..439f9ee178 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml @@ -0,0 +1,47 @@ + + + + + + + + + !printOtherOrders + + +
+ Print next +
+ + + !printOtherOrders + + + + diff --git a/pos_multi_order_payment/tests/__init__.py b/pos_multi_order_payment/tests/__init__.py new file mode 100644 index 0000000000..513f74d64c --- /dev/null +++ b/pos_multi_order_payment/tests/__init__.py @@ -0,0 +1 @@ +from . import test_pos_order diff --git a/pos_multi_order_payment/tests/test_pos_order.py b/pos_multi_order_payment/tests/test_pos_order.py new file mode 100644 index 0000000000..c59b441f13 --- /dev/null +++ b/pos_multi_order_payment/tests/test_pos_order.py @@ -0,0 +1,183 @@ +from datetime import datetime + +from odoo.exceptions import UserError +from odoo.tests import tagged +from odoo.tests.common import TransactionCase + + +@tagged("post_install", "-at_install") +class TestPosMultiOrderPayment(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + + cls.cash_journal = cls.env["account.journal"].create( + { + "name": "Cash Test", + "type": "cash", + "code": "TCSH", + "company_id": cls.env.company.id, + } + ) + + cls.pos_config = cls.env["pos.config"].create( + { + "name": "Test POS", + } + ) + + cls.cash_payment_method = cls.env["pos.payment.method"].create( + { + "name": "Cash", + "is_cash_count": True, + "journal_id": cls.cash_journal.id, + "receivable_account_id": cls.env["account.account"] + .create( + { + "name": "Test Receivable Account", + "code": "TEST.RCV", + "account_type": "asset_receivable", + "reconcile": True, + } + ) + .id, + } + ) + + cls.pos_config.write( + { + "payment_method_ids": [(4, cls.cash_payment_method.id)], + "journal_id": cls.cash_journal.id, + } + ) + + cls.product = cls.env["product.product"].create( + { + "name": "Test Product", + "type": "product", + "list_price": 100, + "available_in_pos": True, + "taxes_id": False, + } + ) + + cls.pos_config.open_ui() + cls.pos_session = cls.pos_config.current_session_id + + def _create_pos_order(self, amount): + """Helper method to create a POS order""" + timestamp = datetime.now().strftime("%Y%m%d%H%M%S") + pos_reference = f"Order {timestamp}-123-1234" + + return self.env["pos.order"].create( + { + "company_id": self.env.company.id, + "session_id": self.pos_session.id, + "amount_tax": 0.0, + "amount_total": amount, + "amount_paid": 0.0, + "amount_return": 0.0, + "pos_reference": pos_reference, + "lines": [ + ( + 0, + 0, + { + "product_id": self.product.id, + "qty": 1, + "price_unit": amount, + "price_subtotal": amount, + "price_subtotal_incl": amount, + }, + ) + ], + } + ) + + def test_process_payment_lines_with_payment_order(self): + """Test processing payment lines with a payment order reference""" + order1 = self._create_pos_order(100) + order2 = self._create_pos_order(50) + pos_order_data = { + "amount_paid": 0, + "amount_total": 50, + "amount_tax": 0, + "amount_return": 0, + "lines": [], + "payment_order_id": order1.id, + "statement_ids": [], + } + + order2._process_payment_lines( + pos_order_data, + order2, + self.pos_session, + False, + ) + + self.assertEqual( + order2.payment_order_id.id, + order1.id, + "Payment order reference not properly set", + ) + + self.assertTrue( + order2.payment_ids, + "No payment created for the order", + ) + self.assertEqual( + order2.payment_ids[0].amount, + 50, + "Payment amount is incorrect", + ) + + def test_process_payment_lines_without_cash_method(self): + """Test processing payment lines without cash payment method""" + pos_config_without_payment = self.env["pos.config"].create( + { + "name": "Test POS Without Payment", + } + ) + + pos_session_without_payment = self.env["pos.session"].create( + { + "user_id": self.env.uid, + "config_id": pos_config_without_payment.id, + } + ) + pos_session_without_payment.action_pos_session_open() + + order1 = self._create_pos_order(100) + order2 = self._create_pos_order(50) + + pos_order_data = { + "amount_paid": 0, + "amount_total": 50, + "amount_tax": 0, + "amount_return": 0, + "lines": [], + "payment_order_id": order1.id, + "statement_ids": [], + } + + with self.assertRaises(UserError): + order2._process_payment_lines( + pos_order_data, + order2, + pos_session_without_payment, + False, + ) + + def test_export_for_ui(self): + """Test the UI export method""" + order1 = self._create_pos_order(100) + order2 = self._create_pos_order(50) + + order2.write({"payment_order_id": order1.id}) + + ui_data = order2._export_for_ui(order2) + self.assertEqual( + ui_data["payment_order_id"], + order1.id, + "Payment order ID not properly exported to UI", + )