From 0e766c240514af77d6229a3379f20ebfc0f1e97e Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 30 Jan 2017 12:09:18 +0100
Subject: [PATCH 01/12] [IMP] website_portal_sale: replace typo Quotes by
 Quotations

Uniformize the homepage portal where no records.
---
 .../website_crm_partner_assign_templates.xml   |  4 ++--
 .../views/website_portal_sale_templates.xml    | 18 +++++++++---------
 .../views/project_templates.xml                |  4 ++--
 .../views/project_issue_templates.xml          |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index df60fa3eac8..d3698898541 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -215,7 +215,7 @@
                                 <span class='badge'><t t-esc="lead_count"/></span>
                             </t>
                             <t t-if="not lead_count">
-                                There are currently no leads for your account.
+                                There are currently no leads.
                             </t>
                         </small>
                     </a>
@@ -227,7 +227,7 @@
                                 <span class='badge'><t t-esc="opp_count"/></span>
                             </t>
                             <t t-if="not opp_count">
-                                There are currently no opportunities for your account.
+                                There are currently no opportunities.
                             </t>
                         </small>
                     </a>
diff --git a/addons/website_portal_sale/views/website_portal_sale_templates.xml b/addons/website_portal_sale/views/website_portal_sale_templates.xml
index 9f491fa0e77..b12cec8c335 100644
--- a/addons/website_portal_sale/views/website_portal_sale_templates.xml
+++ b/addons/website_portal_sale/views/website_portal_sale_templates.xml
@@ -9,7 +9,7 @@
     <template id="portal_my_home_menu_sale" name="Portal layout : sales menu entries" inherit_id="website_portal.portal_layout" priority="25">
         <xpath expr="//ul[contains(@class,'o_portal_submenu')]" position="inside">
             <li t-att-class="page_name == 'quote' and 'active'">
-                <a href="/my/quotes">Quotes</a>
+                <a href="/my/quotes">Quotations</a>
             </li>
             <li t-att-class="page_name == 'order' and 'active'">
                 <a href="/my/orders">Orders</a>
@@ -23,13 +23,13 @@
     <template id="portal_my_home_sale" name="Portal My Home : sales entries" inherit_id="website_portal.portal_my_home" priority="25">
         <xpath expr="//div[contains(@class,'o_my_home_content')]" position="inside">
             <h3 class="page-header">
-                <a href="/my/quotes">Your Quotes
+                <a href="/my/quotes">Your Quotations
                     <small class="ml8">
                         <t t-if="quotation_count">
                             <span class='badge'><t t-esc="quotation_count"/></span>
                         </t>
                         <t t-if="not quotation_count">
-                            There are currently no quotes for your account.
+                            There are currently no quotations.
                         </t>
                     </small>
                 </a>
@@ -41,7 +41,7 @@
                             <span class='badge'><t t-esc="order_count"/></span>
                         </t>
                         <t t-if="not order_count">
-                            There are currently no orders for your account.
+                            There are currently no orders.
                         </t>
                     </small>
                 </a>
@@ -53,7 +53,7 @@
                             <span class='badge'><t t-esc="invoice_count"/></span>
                         </t>
                         <t t-if="not invoice_count">
-                            There are currently no invoices for your account.
+                            There are currently no invoices and payments.
                         </t>
                     </small>
                 </a>
@@ -64,11 +64,11 @@
     <template id="portal_my_quotations" name="My Quotations">
       <t t-call="website_portal.portal_layout">
         <div class="page-header">
-            <span class="h3">Your Quotes</span>
+            <span class="h3">Your Quotations</span>
             <t t-call="website_portal.portal_searchbar"/>
         </div>
         <t t-if="not quotations">
-            <p>There are currently no quotes for your account.</p>
+            <p>There are currently no quotations for your account.</p>
         </t>
         <t t-if="quotations">
             <div class="table-responsive"><table class="table table-hover o_my_status_table">
@@ -162,7 +162,7 @@
             <t t-call="website_portal.portal_searchbar"/>
         </div>
         <t t-if="not invoices">
-            <p>There are currently no invoices for your account.</p>
+            <p>There are currently no invoices and payments for your account.</p>
         </t>
         <t t-if="invoices">
             <div class="table-responsive"><table class="table table-hover o_my_status_table">
@@ -220,7 +220,7 @@
                             <li>
                               <a t-attf-href="/my/#{'quotes' if order.state == 'sent' else 'orders'}?{{ keep_query()}}">
                                 <t t-if="order.state == 'sent'">
-                                    My Quotes
+                                    My Quotations
                                 </t>
                                 <t t-if="order.state != 'sent'">
                                     My Orders
diff --git a/addons/website_project/views/project_templates.xml b/addons/website_project/views/project_templates.xml
index c40e30438f0..2052c80be50 100644
--- a/addons/website_project/views/project_templates.xml
+++ b/addons/website_project/views/project_templates.xml
@@ -20,7 +20,7 @@
                             <span class='badge'><t t-esc="project_count"/></span>
                         </t>
                         <t t-if="not project_count">
-                            There are currently no projects for your account.
+                            There are currently no projects.
                         </t>
                     </small>
                 </a>
@@ -32,7 +32,7 @@
                             <span class='badge'><t t-esc="task_count"/></span>
                         </t>
                         <t t-if="not task_count">
-                            There are currently no quotes for your account.
+                            There are currently no quotes.
                         </t>
                     </small>
                 </a>
diff --git a/addons/website_project_issue/views/project_issue_templates.xml b/addons/website_project_issue/views/project_issue_templates.xml
index f8fc8ff7e89..1205709d967 100644
--- a/addons/website_project_issue/views/project_issue_templates.xml
+++ b/addons/website_project_issue/views/project_issue_templates.xml
@@ -18,7 +18,7 @@
                             <span class='badge'><t t-esc="issue_count"/></span>
                         </t>
                         <t t-if="not issue_count">
-                            There are currently no issues for your account.
+                            There are currently no issues.
                         </t>
                     </small>
                 </a>

From 34fc4a27494fedf4629ce713a4051cf644eed29f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 30 Jan 2017 12:21:23 +0100
Subject: [PATCH 02/12] [FIX] website_sale: avoid scroll to top when add to
 cart

This commit avoid that when you click on the add to cart a-submit link,
you scroll to the top because there are an empty anchor #.

Now we preventdefault th event, and so don't looking for the empty anchor,
and submit form immediately.

Courtesy of @mge-odoo for the reporting.
---
 addons/website_sale/static/src/js/website_sale.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 1bb49194f37..df755916fdc 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -201,11 +201,13 @@ odoo.define('website_sale.website_sale', function (require) {
 
         $('.oe_website_sale .a-submit, #comment .a-submit').off('click').on('click', function (event) {
             if (!event.isDefaultPrevented() && !$(this).is(".disabled")) {
+                event.preventDefault();
                 $(this).closest('form').submit();
             }
         });
         $('form.js_attributes input, form.js_attributes select', oe_website_sale).on('change', function (event) {
             if (!event.isDefaultPrevented()) {
+                event.preventDefault();
                 $(this).closest("form").submit();
             }
         });

From 371bcc69938711b73db39e03cc2a30709770da3a Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 30 Jan 2017 14:01:48 +0100
Subject: [PATCH 03/12] [FIX] website_crm_partner_assign: fix layout when no
 opps

---
 .../views/website_crm_partner_assign_templates.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index d3698898541..668848908ab 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -307,13 +307,13 @@
                     </form>
                 </div>
             </div>
-            <div class="panel panel-default">
-                <t t-if="not opportunities">
-                    <div class="alert alert-warning mt8" role="alert">
-                        There are no opportunities.
-                    </div>
-                </t>
-                <table t-if="opportunities" class="table table-hover">
+            <t t-if="not opportunities">
+                <div class="alert alert-warning mt8" role="alert">
+                    There are no opportunities.
+                </div>
+            </t>
+            <div class="panel panel-default" t-if="opportunities">
+                <table class="table table-hover">
                     <thead>
                         <tr class="active">
                             <th class="col-xs-2">Date</th>

From 3d0cc2d6d2dbd567cfaa93de4cb90787d0c07c9e Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 30 Jan 2017 16:08:50 +0100
Subject: [PATCH 04/12] [FIX] website_portal: allow non employee user to log in
 to the portal

Commit #3649b7f359b640635cbe0bc4f161884ba64c2318 remove sudo when loading the menu.

Add test to check that homepage portal can be loaded with user portal.
That's the first test using portal user, it don't really test the portal features,
but just that the loading of portal homeapge works...
---
 .../static/src/js/website_portal_tour.js      | 24 +++++++++++++++++++
 addons/website_portal/tests/__init__.py       |  1 +
 .../website_portal/tests/test_load_process.py | 16 +++++++++++++
 .../views/website_portal_templates.xml        |  1 +
 odoo/addons/base/ir/ir_ui_menu.py             |  2 +-
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 addons/website_portal/static/src/js/website_portal_tour.js
 create mode 100644 addons/website_portal/tests/__init__.py
 create mode 100644 addons/website_portal/tests/test_load_process.py

diff --git a/addons/website_portal/static/src/js/website_portal_tour.js b/addons/website_portal/static/src/js/website_portal_tour.js
new file mode 100644
index 00000000000..9b63d711a29
--- /dev/null
+++ b/addons/website_portal/static/src/js/website_portal_tour.js
@@ -0,0 +1,24 @@
+odoo.define('website_portal.tour', function (require) {
+'use strict';
+
+var tour = require("web_tour.tour");
+var base = require("web_editor.base");
+
+tour.register('portal_load_homepage', {
+    test: true,
+    url: '/my',
+    wait_for: base.ready()
+},
+    [
+        {
+            content: "Check portal is loaded",
+            trigger: 'a[href*="/my/account"]:contains("Change"):first',
+        },
+        {
+            content: "Load my account details",
+            trigger: 'body:contains("Contact Details")',
+        }
+    ]
+);
+
+});
diff --git a/addons/website_portal/tests/__init__.py b/addons/website_portal/tests/__init__.py
new file mode 100644
index 00000000000..a2e745ce861
--- /dev/null
+++ b/addons/website_portal/tests/__init__.py
@@ -0,0 +1 @@
+import test_load_process
\ No newline at end of file
diff --git a/addons/website_portal/tests/test_load_process.py b/addons/website_portal/tests/test_load_process.py
new file mode 100644
index 00000000000..25b139e6dfc
--- /dev/null
+++ b/addons/website_portal/tests/test_load_process.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import odoo.tests
+
+
+@odoo.tests.common.at_install(False)
+@odoo.tests.common.post_install(True)
+class TestUi(odoo.tests.HttpCase):
+    def test_01_portal_load_tour(self):
+        self.phantom_js(
+            "/",
+            "odoo.__DEBUG__.services['web_tour.tour'].run('portal_load_homepage')",
+            "",
+            login="portal"
+        )
+
diff --git a/addons/website_portal/views/website_portal_templates.xml b/addons/website_portal/views/website_portal_templates.xml
index 3e5924938a7..faf78b64d4a 100644
--- a/addons/website_portal/views/website_portal_templates.xml
+++ b/addons/website_portal/views/website_portal_templates.xml
@@ -5,6 +5,7 @@
       <xpath expr="." position="inside">
           <link rel='stylesheet' href='/website_portal/static/src/less/website_portal.less'/>
           <script type="text/javascript" src="/website_portal/static/src/js/website_portal.js"></script>
+          <script type="text/javascript" src="/website_portal/static/src/js/website_portal_tour.js"></script>
       </xpath>
     </template>
 
diff --git a/odoo/addons/base/ir/ir_ui_menu.py b/odoo/addons/base/ir/ir_ui_menu.py
index 6d357866bcc..b319f77f909 100644
--- a/odoo/addons/base/ir/ir_ui_menu.py
+++ b/odoo/addons/base/ir/ir_ui_menu.py
@@ -102,7 +102,7 @@ class IrUiMenu(models.Model):
             'ir.actions.report.xml': lambda action: action.model,
             'ir.actions.server': lambda action: action.model_id.model,
         }
-        for menu in action_menus:
+        for menu in action_menus.sudo():
             get_model = MODEL_GETTER.get(menu.action._name)
             if not get_model or not get_model(menu.action) or \
                     access.check(get_model(menu.action), 'read', False):

From ce584f756af0040df6f4817638d50d1cd9ebfb66 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:02:14 +0100
Subject: [PATCH 05/12] [FIX] website_crm_Partner_assign: avoid open lead in
 opp form and vice-versa

---
 .../controllers/main.py                        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 46267ee55c4..3d71c31b300 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -5,6 +5,7 @@ import datetime
 import werkzeug
 
 from collections import OrderedDict
+from werkzeug.exceptions import NotFound
 
 from odoo import fields
 from odoo import http
@@ -149,16 +150,21 @@ class WebsiteAccount(website_account):
         })
         return request.render("website_crm_partner_assign.portal_my_opportunities", values)
 
-    @http.route(['/my/lead/<model("crm.lead"):lead>'], type='http', auth="user", website=True)
-    def portal_my_lead(self, lead=None, **kw):
+    @http.route(['''/my/lead/<model('crm.lead', "[('type','=', 'lead')]"):lead>'''], type='http', auth="user", website=True)
+    def portal_my_lead(self, lead, **kw):
+        if lead.type != 'lead':
+            raise NotFound()
         return request.render("website_crm_partner_assign.portal_my_lead", {'lead': lead})
 
-    @http.route(['/my/opportunity/<model("crm.lead"):lead>'], type='http', auth="user", website=True)
-    def portal_my_opportunity(self, lead=None, **kw):
+    @http.route(['''/my/opportunity/<model('crm.lead', "[('type','=', 'opportunity')]"):opp>'''], type='http', auth="user", website=True)
+    def portal_my_opportunity(self, opp, **kw):
+        if opp.type != 'opportunity':
+            raise NotFound()
+
         return request.render(
             "website_crm_partner_assign.portal_my_opportunity", {
-                'opportunity': lead,
-                'user_activity': lead.activity_ids.filtered(lambda activity: activity.user_id == request.env.user)[:1],
+                'opportunity': opp,
+                'user_activity': opp.activity_ids.filtered(lambda activity: activity.user_id == request.env.user)[:1],
                 'stages': request.env['crm.stage'].search([('probability', '!=', '100')], order='sequence desc'),
                 'activity_types': request.env['mail.activity.type'].sudo().search([]),
                 'states': request.env['res.country.state'].sudo().search([]),

From 8de2ada34466b65b99406283667c63c4f855b56f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:02:49 +0100
Subject: [PATCH 06/12] [FIX] website_crm_partner_assign: fix filter domain

Before this commit, lost was always empty because we didn't look for unactive record.
All is replaced by Active (All without lost)
...
---
 addons/website_crm_partner_assign/controllers/main.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 3d71c31b300..9edc425e69a 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -94,13 +94,13 @@ class WebsiteAccount(website_account):
         this_week_end_date = fields.Date.to_string(fields.Date.from_string(today) + datetime.timedelta(days=7))
 
         searchbar_filters = {
-            'all': {'label': _('All'), 'domain': []},
+            'all': {'label': _('Active'), 'domain': []},
             'today': {'label': _('Today Activities'), 'domain': [('activity_date_deadline', '=', today)]},
             'week': {'label': _('This Week Activities'),
                      'domain': [('activity_date_deadline', '>=', today), ('activity_date_deadline', '<=', this_week_end_date)]},
             'overdue': {'label': _('Overdue Activities'), 'domain': [('activity_date_deadline', '<', today)]},
-            'won': {'label': _('Won'), 'domain': [('stage_id.probability', '=', 100), ('stage_id.fold', '=', True)]},
-            'lost': {'label': _('Lost'), 'domain': [('active', '=', False)]},
+            'won': {'label': _('Won'), 'domain': [('stage_id.probability', '=', 100), ('stage_id.on_change', '=', True)]},
+            'lost': {'label': _('Lost'), 'domain': [('active', '=', False), ('probability', '=', 0)]},
         }
         searchbar_sortings = {
             'date': {'label': _('Newest'), 'order': 'create_date desc'},
@@ -119,6 +119,8 @@ class WebsiteAccount(website_account):
         if not filterby:
             filterby = 'all'
         domain += searchbar_filters[filterby]['domain']
+        if filterby == 'lost':
+            CrmLead = CrmLead.with_context(active_test=False)
 
         # archive groups - Default Group By 'create_date'
         archive_groups = self._get_archive_groups('crm.lead', domain)

From 85f7d4b5f20bd81aa3dde3ae723a8986915589d0 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:04:13 +0100
Subject: [PATCH 07/12] [FIX] website_crm_partner_assign: fix date_deadline and
 active_date_deadline mixing

Now we only update/create activity if a date has been setted.
Now we save the deadline that user encode
---
 .../models/crm_lead.py                        | 33 ++++++++++---------
 .../static/src/js/crm_partner_assign.js       |  1 +
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 95cf731c869..6556deeec70 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -232,26 +232,29 @@ class CrmLead(models.Model):
                 'planned_revenue': values['planned_revenue'],
                 'probability': values['probability'],
                 'priority': values['priority'],
+                'date_deadline': values['date_deadline'] or False,
             }
             # As activities may belong to several users, only the current portal user activity
             # will be modified by the portal form. If no activity exist we create a new one instead
             # that we assign to the portal user.
+
             user_activity = lead.activity_ids.filtered(lambda activity: activity.user_id == self.env.user)[:1]
-            if user_activity:
-                user_activity.sudo().write({
-                    'activity_type_id': values['activity_type_id'],
-                    'summary': values['activity_summary'],
-                    'date_deadline': values['activity_date_deadline'],
-                })
-            else:
-                self.env['mail.activity'].sudo().create({
-                    'res_model_id': self.env.ref('crm.model_crm_lead').id,
-                    'res_id': lead.id,
-                    'user_id': self.env.user.id,
-                    'activity_type_id': values['activity_type_id'],
-                    'summary': values['activity_summary'],
-                    'date_deadline': values['activity_date_deadline'],
-                })
+            if values['activity_date_deadline']:
+                if user_activity:
+                    user_activity.sudo().write({
+                        'activity_type_id': values['activity_type_id'],
+                        'summary': values['activity_summary'],
+                        'date_deadline': values['activity_date_deadline'],
+                    })
+                else:
+                    self.env['mail.activity'].sudo().create({
+                        'res_model_id': self.env.ref('crm.model_crm_lead').id,
+                        'res_id': lead.id,
+                        'user_id': self.env.user.id,
+                        'activity_type_id': values['activity_type_id'],
+                        'summary': values['activity_summary'],
+                        'date_deadline': values['activity_date_deadline'],
+                    })
             lead.write(lead_values)
 
     @api.model
diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index 3357c9d9384..c33f36f00c7 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -124,6 +124,7 @@ $('.edit_opp_confirm').on('click',function(){
     $btn.prop('disabled', true);
     new Model('crm.lead')
         .call("update_lead_portal", [[parseInt($('.edit_opp_form .opportunity_id').val())],{
+            date_deadline: $('.edit_opp_form .date_deadline').val(),
             planned_revenue: parseFloat($('.edit_opp_form .planned_revenue').val()),
             probability: parseFloat($('.edit_opp_form .probability').val()),
             activity_type_id: parseInt($('.edit_opp_form .next_activity').find(":selected").attr('data')),

From 43347152942d07524308255e1d33ea57669a1463 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:14:30 +0100
Subject: [PATCH 08/12] [fix] website_crm_partner_assign: avoid duplicate
 creation of opp in portal.

Disable confirm button during creation to avoid double click, triple click,
quadruple click, quintuple click and even undecuple click ... n-tuple click
---
 .../static/src/js/crm_partner_assign.js                    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index c33f36f00c7..b5920cb31ee 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -101,6 +101,8 @@ $('.edit_contact_confirm').on('click',function(){
 });
 
 $('.new_opp_confirm').on('click',function(e){
+    var $btn = $(this);
+    $btn.prop('disabled', true);
     new Model('crm.lead')
         .call("create_opp_portal", [{
             contact_name: $('.new_opp_form .contact_name').val(),
@@ -111,10 +113,15 @@ $('.new_opp_confirm').on('click',function(e){
             if (response.errors) {
                 $('#new-opp-dialog .alert').remove();
                 $('#new-opp-dialog div:first').prepend("<div class='alert alert-danger'>" + response.errors + "</div>");
+                $btn.prop('disabled', false);
+
             }
             else {
                 window.location = '/my/opportunity/' + response.id;
             }
+        })
+        .fail(function() {
+            $btn.prop('disabled', false);
         });
     return false;
 });

From e71b97e4d9254008212c149f6a05cc22704e36e2 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:40:55 +0100
Subject: [PATCH 09/12] [FIX] website_portal: word wrap table by default

Split row content for small screen by default
---
 addons/website_portal/static/src/less/website_portal.less | 4 ++++
 addons/website_portal/views/website_portal_templates.xml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/website_portal/static/src/less/website_portal.less b/addons/website_portal/static/src/less/website_portal.less
index 11f4219abbd..ef62ecbc2f5 100644
--- a/addons/website_portal/static/src/less/website_portal.less
+++ b/addons/website_portal/static/src/less/website_portal.less
@@ -9,3 +9,7 @@
 .o_my_home_content > .page-header > a:hover {
     text-decoration: none;
 }
+
+.portal-wrap table.table tr {
+    word-wrap: break-word;
+}
\ No newline at end of file
diff --git a/addons/website_portal/views/website_portal_templates.xml b/addons/website_portal/views/website_portal_templates.xml
index faf78b64d4a..cc6005e5640 100644
--- a/addons/website_portal/views/website_portal_templates.xml
+++ b/addons/website_portal/views/website_portal_templates.xml
@@ -91,7 +91,7 @@
                     </div>
                 </div>
             </div>
-            <div id="wrap">
+            <div id="wrap" class='portal-wrap'>
                 <div class="container mb64">
                     <div class="row">
                         <div class="col-md-9 col-lg-8">

From 69e0cb0a115277ab687101bdf2382d74986e1b32 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 16:44:12 +0100
Subject: [PATCH 10/12] [FIX] website_sale: no footer during checkout for
 address edition

+ fix margin to be coherent with others pages
---
 addons/website_sale/views/templates.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index a0e7a925946..410071d689b 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1151,6 +1151,7 @@
     </template>
 
     <template id="address" name="Address Management">
+        <t t-set="no_footer">1</t>
         <t t-call="website.layout">
             <div id="wrap">
                 <div class="container oe_website_sale">
@@ -1163,17 +1164,17 @@
                         <div class="col-md-9 oe_cart">
                             <div class="row">
                                 <t t-if="mode == ('new', 'billing')">
-                                    <h2 class="page-header mt16">Your Address
+                                    <h2 class="page-header mt16 ml16">Your Address
                                         <small> or </small>
                                         <t t-set='connect' t-value="request.env['ir.config_parameter'].sudo().get_param('auth_signup.allow_uninvited') == 'True' and ('signup', 'Sign Up') or ('login', 'Log In')"/>
                                         <a t-attf-href='/web/{{connect[0]}}?redirect=/shop/checkout' class='btn btn-primary' style="margin-top: -11px"><t t-esc='connect[1]'/></a>
                                     </h2>
                                 </t>
                                 <t t-if="mode == ('edit', 'billing')">
-                                    <h2 class="page-header mt16">Your Address</h2>
+                                    <h2 class="page-header mt16 ml16">Your Address</h2>
                                 </t>
                                 <t t-if="mode[1] == 'shipping'">
-                                    <h2 class="page-header mt16">Shipping Address </h2>
+                                    <h2 class="page-header mt16 ml16">Shipping Address </h2>
                                 </t>
                                 <t t-if="error" t-foreach="error.get('error_message', [])" t-as="err">
                                     <h4 class="text-danger" t-esc="err" />

From ea7d98ca2476aa0a08c62d52b8aad53e9b25c0ab Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 17:25:09 +0100
Subject: [PATCH 11/12] [IMP] website_portal_sale: try to make /my/order/ route
 more responsive

---
 .../views/website_portal_sale_templates.xml   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/website_portal_sale/views/website_portal_sale_templates.xml b/addons/website_portal_sale/views/website_portal_sale_templates.xml
index b12cec8c335..a93159ceb1b 100644
--- a/addons/website_portal_sale/views/website_portal_sale_templates.xml
+++ b/addons/website_portal_sale/views/website_portal_sale_templates.xml
@@ -311,28 +311,28 @@
                         <div class="col-md-6">
                           <strong>Product</strong>
                         </div>
-                        <div class="col-md-2 text-right">
+                        <div class="hidden-sm hidden-xs col-md-2 text-right">
                           <strong>Unit Price</strong>
                         </div>
-                        <div class="col-md-2 text-right">
+                        <div class="hidden-sm hidden-xs col-md-2 text-right">
                           <strong>Quantity</strong>
                         </div>
-                        <div class="col-md-2 text-right">
+                        <div class="hidden-sm hidden-xs col-md-2 text-right">
                           <strong>Subtotal</strong>
                         </div>
                       </div>
                       <t t-foreach="order.order_line" t-as="ol">
                         <div class="row orders_vertical_align">
-                            <div class="col-md-1 text-center">
-                                <img t-att-src="'/web/image/product.product/%s/image_small/48x48' % ol.product_id.id"/>
+                            <div class="visible-lg col-lg-1 text-center">
+                              <span t-field="ol.product_id.image_small" t-options="{'widget': 'image', 'class': 'img-rounded', 'style':'width: 48px;height:48px'}" />
                             </div>
-                            <div id='product_name' class="col-md-5">
+                            <div id='product_name' class="col-lg-4 col-sm-6 col-xs-4">
                               <span t-esc="ol.product_id.name"/>
                             </div>
-                          <div class="col-md-2 text-right">
+                          <div class="col-xs-3 text-right">
                             <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                           </div>
-                          <div class="col-md-2 text-right">
+                          <div class="col-xs-2 text-right">
                             <t t-if="ol._name == 'sale.order.line'">
                               <span t-esc="ol.product_uom_qty"/>
                             </t>
@@ -340,7 +340,7 @@
                               <span t-esc="ol.quantity"/>
                             </t>
                           </div>
-                          <div class="col-md-2 text-right">
+                          <div class="col-sm-2 col-xs-3 text-right">
                             <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                           </div>
                         </div>
@@ -354,29 +354,30 @@
                             <strong>Contact</strong>
                           </div>
                           <div t-field="order.user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone"]}'/>
+                          <br/>
                         </div>
                         <div class="col-md-6">
                           <div class="row">
-                            <div class="col-md-10 text-right">
+                            <div class="col-md-10 col-xs-8 text-right">
                               Untaxed Amount:
                             </div>
-                            <div class="col-md-2 text-right">
+                            <div class="col-md-2 col-xs-4 text-right">
                               <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                             </div>
                           </div>
                           <div class="row">
-                            <div class="col-md-10 text-right">
+                            <div class="col-md-10 col-xs-8 text-right">
                               Taxes:
                             </div>
-                            <div class="col-md-2 text-right">
+                            <div class="col-md-2 col-xs-4 text-right">
                               <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                             </div>
                           </div>
                           <div class="row">
-                            <div class="col-md-10 text-right">
+                            <div class="col-md-10 col-xs-8 text-right">
                               <strong>Total:</strong>
                             </div>
-                            <div class="col-md-2 text-right">
+                            <div class="col-md-2 col-xs-4 text-right">
                               <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></strong>
                             </div>
                           </div>

From 3bb2318baf31f4d34a1ede0a3a5811b05568007f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 31 Jan 2017 18:01:55 +0100
Subject: [PATCH 12/12] [FIX] website_payment: use msg from payment acquirer in
 portal

---
 addons/website_payment/controllers/main.py            | 11 +++++++++--
 .../views/website_payment_templates.xml               |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/website_payment/controllers/main.py b/addons/website_payment/controllers/main.py
index dd4ef720e16..31244b87cda 100644
--- a/addons/website_payment/controllers/main.py
+++ b/addons/website_payment/controllers/main.py
@@ -78,8 +78,15 @@ class WebsitePayment(http.Controller):
         tx_id = request.session.pop('website_payment_tx_id', False)
         if tx_id:
             tx = request.env['payment.transaction'].browse(tx_id)
-            status = (tx.state == 'done' and 'success') or 'danger'
-            message = (tx.state == 'done' and 'Your payment was successful! It may take some time to be validated on our end.') or 'OOps! There was a problem with your payment.'
+            if tx.state == 'done':
+                status = 'success'
+                message = tx.acquirer_id.done_msg
+            elif tx.state == 'pending':
+                status = 'warning'
+                message = tx.acquirer_id.pending_msg
+            else:
+                status = 'danger'
+                message = tx.acquirer_id.error_msg
             return request.render('website_payment.confirm', {'tx': tx, 'status': status, 'message': message})
         else:
             return request.redirect('/my/home')
diff --git a/addons/website_payment/views/website_payment_templates.xml b/addons/website_payment/views/website_payment_templates.xml
index bf01e712999..a7ec331cc59 100644
--- a/addons/website_payment/views/website_payment_templates.xml
+++ b/addons/website_payment/views/website_payment_templates.xml
@@ -136,7 +136,7 @@
                     <div class="row">
                         <div class="col-md-6">
                             <div class="form-horizontal">
-                                <div t-attf-class="alert alert-#{status}" t-esc="message"/>
+                                <div t-attf-class="alert alert-#{status}" t-raw="message"/>
                                 <div class="form-group">
                                     <label for="form_partner_name" class="col-sm-3 control-label">From</label>
                                     <div class="col-sm-9">