From cb5ddc8ecf7354b708867f71c31e98739928ee8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 7 Mar 2017 09:58:50 +0100
Subject: [PATCH] [FIX] website_sale: fix heuristic of abandoned carts

Abandoned carts are those with lines, not linked to public user, still
in draft mode and having more than one hour of lifetime.

By the way imp typo, abandonned abandoned one n.
---
 addons/website_sale/controllers/backend.py                | 7 +++++--
 .../static/src/xml/website_sale_dashboard.xml             | 6 +++---
 addons/website_sale/views/sale_order_views.xml            | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/website_sale/controllers/backend.py b/addons/website_sale/controllers/backend.py
index a51bc489755..d49889df47e 100644
--- a/addons/website_sale/controllers/backend.py
+++ b/addons/website_sale/controllers/backend.py
@@ -20,7 +20,7 @@ class WebsiteSaleBackend(WebsiteBackend):
             best_sellers=[],
             summary=dict(
                 order_count=0, order_carts_count=0, order_unpaid_count=0,
-                order_to_invoice_count=0, order_carts_abandonned_count=0,
+                order_to_invoice_count=0, order_carts_abandoned_count=0,
                 payment_to_capture_count=0, total_sold=0,
                 order_per_day_ratio=0, order_sold_ratio=0, order_convertion_pctg=0,
             )
@@ -81,10 +81,13 @@ class WebsiteSaleBackend(WebsiteBackend):
         sales_values['summary'].update(
             order_to_invoice_count=request.env['sale.order'].search_count(sale_order_domain + [
                 ('state', 'in', ['sale', 'done']),
+                ('order_line', '!=', False),
+                ('partner_id', '!=', request.env.ref('base.public_partner').id),
                 ('invoice_status', '=', 'to invoice'),
             ]),
-            order_carts_abandonned_count=request.env['sale.order'].search_count(sale_order_domain + [
+            order_carts_abandoned_count=request.env['sale.order'].search_count(sale_order_domain + [
                 ('state', '=', 'draft'),
+                ('order_line', '!=', 'False'),
                 ('date_order', '<=', fields.Datetime.to_string(datetime.now() - timedelta(hours=1))),
             ]),
             payment_to_capture_count=request.env['payment.transaction'].search_count([
diff --git a/addons/website_sale/static/src/xml/website_sale_dashboard.xml b/addons/website_sale/static/src/xml/website_sale_dashboard.xml
index dec7c0087f3..9bf95eeb50f 100644
--- a/addons/website_sale/static/src/xml/website_sale_dashboard.xml
+++ b/addons/website_sale/static/src/xml/website_sale_dashboard.xml
@@ -23,9 +23,9 @@
                 </a>
                 <t t-set="vignette_nbr" t-value="vignette_nbr + 1"/>
             </div>
-            <div t-if="widget.dashboards_data.sales.summary.order_carts_abandonned_count" class="o_inner_box o_main o_box_item" title="Send a recovery email to visitors who haven't completed their order.">
-                <a href="#" class="o_dashboard_action" name="website_sale.action_abandonned_orders_ecommerce">
-                    <div class="o_highlight"><t t-esc="widget.dashboards_data.sales.summary.order_carts_abandonned_count"/></div>
+            <div t-if="widget.dashboards_data.sales.summary.order_carts_abandoned_count" class="o_inner_box o_main o_box_item" title="Send a recovery email to visitors who haven't completed their order.">
+                <a href="#" class="o_dashboard_action" name="website_sale.action_abandoned_orders_ecommerce">
+                    <div class="o_highlight"><t t-esc="widget.dashboards_data.sales.summary.order_carts_abandoned_count"/></div>
                     Abandoned Carts
                 </a>
                 <t t-set="vignette_nbr" t-value="vignette_nbr + 1"/>
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index ac2aa118746..a4625b3e0ee 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -45,11 +45,11 @@
         <field name="help">You don't have any unpaid order from the website.</field>
     </record>
 
-    <record id="action_abandonned_orders_ecommerce" model="ir.actions.act_window">
+    <record id="action_abandoned_orders_ecommerce" model="ir.actions.act_window">
         <field name="name">Abandoned Carts</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state', '=', 'draft'), ('order_line', '!=', False), ('date_order', '&lt;=', (context_today() + datetime.timedelta(hours=-1)).strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('state', '=', 'draft'), ('order_line', '!=', False), ('date_order', '&lt;=', (context_today() - datetime.timedelta(hours=1)).strftime('%Y-%m-%d'))]</field>
         <field name="context">{'show_sale': True, 'search_default_from_website': 1, 'create': False}</field>
         <field name="search_view_id" ref="view_sales_order_filter_ecommerce"/>
         <field name="help" type="xml">
@@ -93,8 +93,8 @@
     <menuitem id="menu_orders_unpaid_orders" name="Unpaid Orders"
         action="action_unpaid_orders_ecommerce"
         parent="menu_orders" sequence="2"/>
-    <menuitem id="menu_orders_abandonned_orders" name="Abandoned Carts"
-        action="action_abandonned_orders_ecommerce"
+    <menuitem id="menu_orders_abandoned_orders" name="Abandoned Carts"
+        action="action_abandoned_orders_ecommerce"
         parent="menu_orders" sequence="3"/>
     <menuitem id="menu_orders_customers" name="Customers"
         action="base.action_partner_customer_form"