[MIG] pos_ticket_send_by_mail: Migration to 18.0

Author: phucph

pos_ticket_send_by_mail/README.rst

@@ -21,6 +21,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Iván Todorovich <ivan.todorovich@druidoo.io>
+* Phan Hong Phuc <phucph@trobz.com>
 
 Maintainers
 ~~~~~~~~~~~

pos_ticket_send_by_mail/__manifest__.py

@@ -5,23 +5,27 @@
 
 {
     "name": "POS Receipt By Email",
-    "version": "12.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Custom",
-    "author": "Druidoo",
+    "author": "Druidoo, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/pos",
     "license": "AGPL-3",
     "depends": [
         "point_of_sale",
     ],
     "data": [
-        "security/ir.model.access.csv",
         "views/report_paperformat.xml",
         "views/view_pos_config_settings.xml",
         "data/email_template_data.xml",
         "data/ir_cron_data.xml",
         "views/view_res_partner.xml",
         "views/report_receipt.xml",
-        "static/src/xml/templates.xml",
     ],
+    "assets": {
+        "point_of_sale._assets_pos": [
+            "pos_ticket_send_by_mail/static/src/js/*",
+            "pos_ticket_send_by_mail/static/src/xml/*",
+        ],
+    },
     "installable": True,
 }

pos_ticket_send_by_mail/data/email_template_data.xml

@@ -5,27 +5,28 @@
         <field name="name">Send Received</field>
         <field
             name="email_from"
-        >ticket@${object.user_id.company_id.email.split('@')[1] or ''|safe}</field>
+        >{{ (object.user_id.company_id.email_formatted or user.email_formatted) }}</field>
         <field
             name="subject"
-        >${object.user_id.company_id.name} Received ${object.pos_reference and object.pos_reference.split(' ')[1] or ''}</field>
-        <field name="partner_to">${object.partner_id.id}</field>
+        >{{ object.user_id.company_id.name }} Received {{ object.pos_reference and object.pos_reference.split(' ')[1] or '' }}</field>
+        <field name="partner_to">{{ object.partner_id.id }}</field>
         <field name="model_id" ref="point_of_sale.model_pos_order" />
-        <field name="auto_delete" eval="True" />
         <field
-            name="report_template"
-            ref="pos_ticket_send_by_mail.action_report_pos_receipt"
+            name="report_template_ids"
+            eval="[(4, ref('pos_ticket_send_by_mail.action_report_pos_receipt'))]"
         />
-        <field name="report_name">Ticket ${object.pos_reference}</field>
-        <field name="lang">${object.partner_id.lang}</field>
-        <field
-            name="body_html"
-        ><![CDATA[
-            <p>Thank you for your visit !</p>
-            <p>You will find your receipt ${object.pos_reference and object.pos_reference.split(' ')[1] or ''} attached.<p/>
-            <p>Sincerely,</p>
-            <p>The team of the cooperative</p>
-                        ]]>
+        <field name="auto_delete" eval="True" />
+        <field name="lang">{{ object.partner_id.lang }}</field>
+        <field name="body_html" type="html">
+            <div>
+                <p>Thank you for your visit !</p>
+                <p>You will find your receipt <t
+                    t-out="object.pos_reference and object.pos_reference.split(' ')[1] or ''"
+                /> attached.</p>
+                <p />
+                <p>Sincerely,</p>
+                <p>The team of the cooperative</p>
+            </div>
         </field>
     </record>
 </odoo>

pos_ticket_send_by_mail/data/ir_cron_data.xml

@@ -4,8 +4,6 @@
         <field name="name">Send Reciept via Email</field>
         <field name="interval_number">1</field>
         <field name="interval_type">minutes</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False" />
         <field name="model_id" ref="point_of_sale.model_pos_order" />
         <field name="code">model._send_order_cron()</field>
         <field name="state">code</field>

pos_ticket_send_by_mail/i18n/email_pos_receipt.pot

@@ -5,4 +5,5 @@
 
 from . import res_partner
 from . import pos_order
+from . import pos_config
 from . import res_config_settings

pos_ticket_send_by_mail/models/__init__.py

@@ -0,0 +1,19 @@
+from odoo import fields, models
+
+
+class PosConfig(models.Model):
+    _inherit = "pos.config"
+
+    receipt_options = fields.Selection(
+        [
+            ("1", "Do not send receipt via email"),
+            ("2", "Email receipt and print it"),
+            (
+                "3",
+                "Email receipt and print it unless configured on user that \
+                   he only receives electronically",
+            ),
+            ("4", "Email receipt"),
+        ],
+        string="Receipt",
+    )

pos_ticket_send_by_mail/models/pos_config.py

@@ -5,6 +5,7 @@
 
 import logging
 
+import odoo
 from odoo import api, fields, models
 
 _logger = logging.getLogger(__name__)
@@ -23,15 +24,21 @@ class PosOrder(models.Model):
     @api.model
     def _send_order_cron(self):
         _logger.info("------------------------------------------------------")
-        mail_template = self.env.ref("pos_ticket_send_by_mail.email_send_pos_receipt")
+        mail_template = self.env.ref(
+            "pos_ticket_send_by_mail.email_send_pos_receipt",
+            raise_if_not_found=False,
+        )
+        if not mail_template.exists():
+            _logger.warning("No mail template found for sending ticket")
+            return
         _logger.info("Start to send ticket")
         for order in self.search([("email_status", "=", "to_send")]):
             mail_template.send_mail(order.id, force_send=True)
             order.email_status = "sent"
             # Make sure we commit the change to not send ticket twice
-            self.env.cr.commit()
+            if not odoo.tools.config["test_enable"]:
+                self.env.cr.commit()  # pylint: disable=E8102
 
-    @api.multi
     def action_pos_order_paid(self):
         # Send e-receipt for the partner.
         # It depends on value of the field `receipt_option`
@@ -43,8 +50,7 @@ def action_pos_order_paid(self):
         return res
 
     def _set_order_to_send(self):
-        icp_sudo = self.env["ir.config_parameter"].sudo()
-        receipt_options = icp_sudo.get_param("point_of_sale.receipt_options")
+        receipt_options = self.config_id.receipt_options
         receipt_options = receipt_options and int(receipt_options) or False
         for order in self:
             if (

pos_ticket_send_by_mail/models/pos_order.py

@@ -9,7 +9,7 @@
 class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
-    receipt_options = fields.Selection(
+    pos_receipt_options = fields.Selection(
         [
             ("1", "Do not send receipt via email"),
             ("2", "Email receipt and print it"),
@@ -21,33 +21,13 @@ class ResConfigSettings(models.TransientModel):
             ("4", "Email receipt"),
         ],
         string="Receipt",
-        config_parameter="point_of_sale.receipt_options",
+        related="pos_config_id.receipt_options",
     )
 
     @api.model
     def get_values(self):
         res = super().get_values()
-        icp_sudo = self.env["ir.config_parameter"].sudo()
-        receipt_options = icp_sudo.get_param("point_of_sale.receipt_options")
+        IrConfigParameter = self.env["ir.config_parameter"].sudo()
+        receipt_options = IrConfigParameter.get_param("point_of_sale.receipt_options")
         res.update(receipt_options=receipt_options)
         return res
-
-    @api.model
-    def get_default_receipt_options(self):
-        receipt_options = self.env["ir.values"].get_default(
-            "res.config.settings", "receipt_options"
-        )
-        return {
-            "receipt_options": receipt_options,
-        }
-
-    @api.multi
-    def set_default_receipt_options(self):
-        self.ensure_one()
-        return (
-            self.env["ir.values"]
-            .sudo()
-            .set_default(
-                "res.config.settings", "receipt_options", self.receipt_options or None
-            )
-        )

pos_ticket_send_by_mail/models/res_config_settings.py

@@ -3,28 +3,24 @@
 # @author: La Louve
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
-    email_pos_receipt = fields.Boolean(
-        string="E-receipt",
-        default=False,
-        help="If you tick this box and option 3 is selected for 'Receipt'\
-         in point of sale settings, the user will only receive e-receipt ",
+    pos_email_receipt = fields.Selection(
+        [
+            ("email_pos_receipt", "E-receipt Only"),
+            ("no_email_pos_receipt", "No E-receipt"),
+        ],
+        string="POS Email Receipt Preference",
+        help="- E-receipt: The user will only receive e-receipt \n"
+        "- No E-receipt: The user will not receive e-receipt",
     )
-    no_email_pos_receipt = fields.Boolean(
-        string="No E-receipt",
-        default=False,
-        help="If you tick this box, the user will not receive e-receipt ",
-    )
-    config_receipt_options = fields.Integer(compute="_compute_config_receipt_options")
 
-    def _compute_config_receipt_options(self):
-        icp_sudo = self.env["ir.config_parameter"].sudo()
-        receipt_options = icp_sudo.get_param("point_of_sale.receipt_options")
-        receipt_options = receipt_options and int(receipt_options) or 0
-        for record in self:
-            record.config_receipt_options = receipt_options
+    @api.model
+    def _load_pos_data_fields(self, config_id):
+        fields = super()._load_pos_data_fields(config_id)
+        fields.append("email_pos_receipt")
+        return fields