[IMP] update for mollie_pos_terminal and payment_mollie_official

mollie_pos_terminal v18.0.0.1
- fixed issue of default customer not being set
- fixed issue of payment refund directly from the terminal
- fixed websocket issue
- fixed payment lines issue in debug mode

payment_mollie_official v18.0.0.1
- added support to capture authorized payment manually and automatically
- added support for auto set delivered quantity for shipping lines when picking confirmed
- improvements for ideal2 support

Author: pga-odoo

mollie_pos_terminal/__manifest__.py

@@ -1,6 +1,6 @@
 {
     'name': 'Mollie Pos Terminal',
-    'version': '18.0.0.0',
+    'version': '18.0.0.1',
     'description': '',
     'summary': 'Connect your pos with mollie terminal',
     'author': 'Mollie',

mollie_pos_terminal/models/pos_payment_method.py

@@ -11,6 +11,12 @@ class PosPaymentMethod(models.Model):
     mollie_latest_response = fields.Json('History', default={})
     mollie_payment_default_partner = fields.Many2one('res.partner')
 
+    @api.model
+    def _load_pos_data_fields(self, config_id):
+        result = super()._load_pos_data_fields(config_id)
+        result += ['mollie_payment_default_partner']
+        return result
+
     def _get_payment_terminal_selection(self):
         return super(PosPaymentMethod, self)._get_payment_terminal_selection() + [('mollie', 'Mollie')]
 

mollie_pos_terminal/models/pos_session.py

@@ -6,11 +6,6 @@
 class PosSession(models.Model):
     _inherit = 'pos.session'
 
-    def _loader_params_pos_payment_method(self):
-        result = super()._loader_params_pos_payment_method()
-        result['search_params']['fields'].append('mollie_payment_default_partner')
-        return result
-
     def _create_split_account_payment(self, payment, amounts):
         payment_aml = super()._create_split_account_payment(payment, amounts)
         if payment and payment.payment_method_id.use_payment_terminal == 'mollie':

mollie_pos_terminal/static/description/index.html

@@ -201,6 +201,18 @@ <h1 style="color: #000;font-weight: bold;/* font-size: 50px; */" class="mt-5 tex
     <span style="width:73px;height: 10px;display:inline-block;border-radius: 4px;background-color: #0077ff;"> </span>
 </div>
 
+<div class="card mx-auto w-md-75">
+    <div class="card-header bg-200">
+        <h4 class="m-0">v18.0.0.1</h4>
+    </div>
+    <div class="card-body">
+        <div> <b class="text-danger"> FIX </b> Improvement in default customer for order.  </div>
+        <div> <b class="text-danger"> FIX </b> Fixed error for payment refund directly from the terminal. </div>
+        <div> <b class="text-danger"> FIX </b> Websocket improvement based on odoo's update.  </div>
+        <div> <b class="text-danger"> FIX </b> Fixed payment lines issue in debug mode.  </div>
+    </div>
+</div>
+
 <div class="card mx-auto w-md-75">
     <div class="card-header bg-200">
         <h4 class="m-0">v18.0.0.0</h4>

mollie_pos_terminal/static/src/app/payment_mollie.js

@@ -107,7 +107,7 @@ export class PaymentMollie extends PaymentInterface {
         if (order.get_selected_paymentline().amount < 0) {
             let refundOrderId = false;
             for (let line of order.lines) {
-                refundOrderId = line?.refunded_orderline_id?._raw?.order_id || false;
+                refundOrderId = line?.refunded_orderline_id?.raw?.order_id || false;
                 if (refundOrderId) {
                     break;
                 }

mollie_pos_terminal/static/src/app/pos_store.js

@@ -6,7 +6,7 @@ import { PosStore } from "@point_of_sale/app/store/pos_store";
 patch(PosStore.prototype, {
     async setup() {
         await super.setup(...arguments);
-        this.onNotified("MOLLIE_TERMINAL_RESPONSE", () => {
+        this.data.connectWebSocket("MOLLIE_TERMINAL_RESPONSE", () => {
             let pendingLine = this.getPendingPaymentLine("mollie");
             if (pendingLine) {
                 pendingLine.payment_method_id.payment_terminal.handleMollieStatusResponse();

mollie_pos_terminal/static/src/overrides/components/payment_screen/payment_screen.js

@@ -2,11 +2,19 @@
 
 import { _t } from "@web/core/l10n/translation";
 import { PaymentScreen } from "@point_of_sale/app/screens/payment_screen/payment_screen";
+import { PaymentScreenPaymentLines } from "@point_of_sale/app/screens/payment_screen/payment_lines/payment_lines";
 import { patch } from "@web/core/utils/patch";
 import { onMounted } from "@odoo/owl";
 import { AlertDialog, ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 import { markup } from "@odoo/owl";
 
+patch(PaymentScreenPaymentLines, {
+    props: {
+        ...PaymentScreenPaymentLines.props,
+        sendMollieStatusCheck: { type: Function, optional: true },
+    },
+});
+
 patch(PaymentScreen.prototype, {
     setup() {
         super.setup(...arguments);
@@ -34,12 +42,11 @@ patch(PaymentScreen.prototype, {
         );
 
         mollieLine = this.currentOrder.payment_ids[0];
-
         if (mollieLine
             && mollieLine.payment_method_id.split_transactions
             && mollieLine.payment_method_id.mollie_payment_default_partner
             && !this.currentOrder.get_partner()) {
-            var partner = this.pos.db.get_partner_by_id(mollieLine.payment_method_id.mollie_payment_default_partner[0]);
+            var partner = mollieLine.payment_method_id.mollie_payment_default_partner['id']
             this.currentOrder.set_partner(partner);
         }
 
@@ -61,7 +68,7 @@ patch(PaymentScreen.prototype, {
     async addNewPaymentLine(paymentMethod) {
         let refundOrderId = false;
         for (let line of this.currentOrder.lines) {
-            refundOrderId = line?.refunded_orderline_id?._raw?.order_id || false;
+            refundOrderId = line?.refunded_orderline_id?.raw?.order_id || false;
             if (refundOrderId) {
                 break;
             }

payment_mollie_official/__init__.py

@@ -2,3 +2,4 @@
 
 from . import controllers
 from . import models
+from . import wizard

payment_mollie_official/__manifest__.py

@@ -2,7 +2,7 @@
 
 {
     'name': 'Mollie Payments Extended',
-    'version': '18.0.0.0',
+    'version': '18.0.0.1',
     'category': 'eCommerce',
     'license': 'LGPL-3',
     'author': 'Mollie',
@@ -15,17 +15,19 @@
     """,
 
     'depends': [
-        'payment_mollie', 'product', 'account'
+        'payment_mollie', 'product', 'account', 'base_automation'
     ],
     'external_dependencies': {},
     'data': [
+        'data/cron.xml',
         'security/ir.model.access.csv',
         'views/payment_views.xml',
         'views/payment_transaction.xml',
         'views/payment_method.xml',
         'views/payment_mollie_templates.xml',
         'views/account_move_view.xml',
         'views/account_payment_register.xml',
+        'wizard/payment_capture_wizard_views.xml',
     ],
 
     'assets': {

payment_mollie_official/controllers/main.py

@@ -13,7 +13,10 @@ def _validate_transaction_kwargs(kwargs, additional_allowed_keys=()):
         if kwargs.get('provider_id'):
             provider_id = request.env['payment.provider'].sudo().browse(int(kwargs['provider_id']))
             if provider_id.code == 'mollie':
-                additional_allowed_keys += ('mollie_card_token', 'mollie_payment_issuer', 'mollie_save_card')
+                if isinstance(additional_allowed_keys, tuple):
+                    additional_allowed_keys += ('mollie_card_token', 'mollie_payment_issuer', 'mollie_save_card')
+                if isinstance(additional_allowed_keys, set):
+                    additional_allowed_keys.update(['mollie_card_token', 'mollie_payment_issuer', 'mollie_save_card'])
         super(MolliePaymentPortal, MolliePaymentPortal)._validate_transaction_kwargs(kwargs, additional_allowed_keys=additional_allowed_keys)
 
     def _create_transaction(