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 @@ -
- -
+
+ +
Abandoned Carts
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 @@ You don't have any unpaid order from the website. - + Abandoned Carts sale.order tree,form - [('state', '=', 'draft'), ('order_line', '!=', False), ('date_order', '<=', (context_today() + datetime.timedelta(hours=-1)).strftime('%Y-%m-%d'))] + [('state', '=', 'draft'), ('order_line', '!=', False), ('date_order', '<=', (context_today() - datetime.timedelta(hours=1)).strftime('%Y-%m-%d'))] {'show_sale': True, 'search_default_from_website': 1, 'create': False} @@ -93,8 +93,8 @@ -