[IMP] connector_woocommerce: new field woocommerce_enabled to export …

…products. Simplified domains in products.

connector_woocommerce/models/product_product/binding.py

@@ -2,7 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import api, fields, models
-from odoo.osv import expression
 
 
 class WooCommerceProductProduct(models.Model):
@@ -33,30 +32,19 @@ class WooCommerceProductProduct(models.Model):
         ),
     ]
 
-    # TODO: REFACTOR THIS GET_BASE_DOMAIN TO DO IT MORE SIMPLE
     @api.model
     def _get_base_domain(self):
         return [
-            ("variant_is_published", "=", True),
-            ("woocommerce_write_date", "=", False),
+            ("product_tmpl_id.woocommerce_enabled", "=", True),
             ("product_tmpl_id.has_attributes", "=", True),
         ]
 
     def export_products_since(self, backend_record=None, since_date=None):
         domain = self._get_base_domain()
         if since_date:
-            domain = expression.OR(
-                [
-                    domain,
-                    [
-                        (
-                            "woocommerce_write_date",
-                            ">",
-                            fields.Datetime.to_string(since_date),
-                        )
-                    ],
-                ]
-            )
+            domain = [
+                ("woocommerce_write_date", ">", fields.Datetime.to_string(since_date))
+            ]
         self.export_batch(backend_record, domain=domain)
         return True
 

connector_woocommerce/models/product_product/product.py

@@ -19,24 +19,29 @@ class ProductProduct(models.Model):
     )
 
     @api.depends(
-        "woocommerce_bind_ids",
         "is_published",
         "lst_price",
         "type",
         "default_code",
         "image_1920",
-        "product_tmpl_id",
         "default_code",
         "qty_available",
         "product_template_attribute_value_ids",
         "variant_public_description",
         "alternative_product_ids",
         "accessory_product_ids",
         "variant_inventory_availability",
+        "product_tmpl_id",
+        "product_tmpl_id.has_attributes",
+        "product_tmpl_id.woocommerce_enabled",
     )
     def _compute_woocommerce_write_date(self):
         for rec in self:
-            if rec.is_published or rec.woocommerce_write_date:
+            if (
+                rec.product_tmpl_id.woocommerce_enabled
+                or rec.variant_is_published
+                or rec.woocommerce_write_date
+            ):
                 rec.woocommerce_write_date = fields.Datetime.now()
 
     variant_public_description = fields.Text(

connector_woocommerce/models/product_template/binding.py

@@ -32,15 +32,19 @@ class WooCommerceProductTemplate(models.Model):
     @api.model
     def _get_base_domain(self):
         return [
-            ("is_published", "=", True),
+            ("woocommerce_enabled", "=", True),
             ("has_attributes", "=", False),
         ]
 
     def export_product_tmpl_since(self, backend_record=None, since_date=None):
         domain = self._get_base_domain()
         if since_date:
-            domain += [
-                ("woocommerce_write_date", ">", fields.Datetime.to_string(since_date)),
+            domain = [
+                (
+                    "woocommerce_write_date",
+                    ">",
+                    fields.Datetime.to_string(since_date),
+                )
             ]
         self.export_batch(backend_record, domain=domain)
         return True

connector_woocommerce/models/product_template/product_template.py

@@ -29,23 +29,28 @@ def _compute_has_attributes(self):
             rec.has_attributes = bool(rec.attribute_line_ids)
 
     @api.depends(
-        "woocommerce_bind_ids",
         "is_published",
         "name",
         "lst_price",
         "active",
-        "product_variant_id.qty_available",
+        "qty_available",
         "image_1920",
         "default_code",
-        "qty_available",
         "description",
         "public_categ_ids",
         "attribute_line_ids",
         "public_description",
+        "inventory_availability",
+        "has_attributes",
+        "woocommerce_enabled",
     )
     def _compute_woocommerce_write_date(self):
         for rec in self:
-            if rec.is_published or rec.woocommerce_write_date:
+            if (
+                rec.woocommerce_enabled
+                or rec.is_published
+                or rec.woocommerce_write_date
+            ):
                 rec.woocommerce_write_date = fields.Datetime.now()
 
     public_description = fields.Text(
@@ -60,6 +65,15 @@ def _compute_woocommerce_write_date(self):
     button_is_published = fields.Boolean(
         related="is_published",
     )
+    woocommerce_enabled = fields.Boolean(
+        compute="_compute_woocommerce_enabled",
+        store=True,
+        readonly=False,
+    )
+
+    def _compute_woocommerce_enabled(self):
+        for rec in self:
+            rec.woocommerce_enabled = rec.is_published
 
     @api.depends("product_variant_ids.variant_is_published")
     def _compute_template_is_published(self):

connector_woocommerce/views/product_template.xml

@@ -46,6 +46,11 @@
             </xpath>
             <field name="website_sequence" position="before">
                 <field name="is_published" />
+                <field
+                    name="woocommerce_enabled"
+                    attrs="{'readonly': [('woocommerce_enabled', '=', True), ('woocommerce_bind_ids', '!=', [])]}"
+                />
+                <field name="woocommerce_bind_ids" invisible="1" />
             </field>
             <field name="website_ribbon_id" position="after">
                 <field name="public_description" />