[18.0][FIX] pos_payment_method_cashdro: Use correct payment line retrieval method + Improve http

pos_payment_method_cashdro/models/__init__.py

@@ -1,2 +1 @@
 from . import pos_payment_method
-from . import pos_session

pos_payment_method_cashdro/models/pos_payment_method.py

@@ -15,6 +15,11 @@ def _get_payment_terminal_selection(self):
     )
     cashdro_user = fields.Char()
     cashdro_password = fields.Char()
+    cashdro_http = fields.Boolean(
+        string="Use HTTP connection",
+        help="Check this to enable HTTP (not secure) connection. You should enable it"
+        " also in Cashdro configuration interface.",
+    )
 
     def _onchange_journal_id(self):
         """Cash payment method force the `use_payment_terminal` to `False` as
@@ -33,3 +38,11 @@ def _compute_hide_use_payment_terminal(self):
         return super(
             PosPaymentMethod, self - cash_payment_types
         )._compute_hide_use_payment_terminal()
+
+    def _load_pos_data_fields(self, config_id):
+        return super()._load_pos_data_fields(config_id) + [
+            "cashdro_host",
+            "cashdro_user",
+            "cashdro_password",
+            "cashdro_http",
+        ]

pos_payment_method_cashdro/static/src/js/payment_cashdro.esm.js

@@ -107,12 +107,15 @@ export class PaymentCashdro extends PaymentInterface {
     _cashdro_url() {
         // Cashdro machines don't support safe POST calls, so we're sending
         // all the data quite unsafely constantly...
-        const method = this.pos.get_order().selected_paymentline.payment_method;
+        const method = this.pos
+            .get_order()
+            .get_selected_paymentline().payment_method_id;
         const host = method && method.cashdro_host;
         if (!host) {
             return false;
         }
-        let url = `${host}/Cashdro3WS/index.php`;
+        const connection = method.cashdro_http ? `http://` : `https://`;
+        let url = `${connection}${host}/Cashdro3WS/index.php`;
         url += `?name=${method.cashdro_user}`;
         url += `&password=${method.cashdro_password}`;
         return url;
@@ -125,7 +128,7 @@ export class PaymentCashdro extends PaymentInterface {
         const operationType = parameters.amount > 0 ? 4 : 3;
         parameters = {...parameters, amount: Math.abs(parameters.amount)};
         let url = `${this._cashdro_url()}&operation=startOperation&type=${operationType}`;
-        url += `&posid=pos-${this.pos.pos_session.name}`;
+        url += `&posid=pos-${this.pos.session.name}`;
         url += `&posuser=${user}`;
         url += `&parameters=${encodeURIComponent(JSON.stringify(parameters))}`;
         return url;

pos_payment_method_cashdro/views/pos_payment_method_views.xml

@@ -10,6 +10,10 @@
                     invisible="use_payment_terminal != 'cashdro'"
                     required="use_payment_terminal == 'cashdro'"
                 />
+                <field
+                    name="cashdro_http"
+                    invisible="use_payment_terminal != 'cashdro'"
+                />
                 <field
                     name="cashdro_user"
                     invisible="use_payment_terminal != 'cashdro'"