From 582b89489d036097143a918a370b0ee688fa66bb Mon Sep 17 00:00:00 2001
From: Tymofii GLUKHOV <tima@invitu.com>
Date: Mon, 11 Feb 2019 14:38:48 -1000
Subject: [PATCH 1/2] [MIG] legal_age_notice

---
 .../{__openerp__.py => __manifest__.py}       |  2 +-
 .../controllers/website_legal_age_notice.py   |  4 +-
 .../static/src/js/website_legal_age_notice.js | 48 ++++++++++---------
 website_legal_age_notice/templates/assets.xml |  6 +--
 .../templates/website.xml                     |  6 +--
 5 files changed, 34 insertions(+), 32 deletions(-)
 rename website_legal_age_notice/{__openerp__.py => __manifest__.py} (97%)

diff --git a/website_legal_age_notice/__openerp__.py b/website_legal_age_notice/__manifest__.py
similarity index 97%
rename from website_legal_age_notice/__openerp__.py
rename to website_legal_age_notice/__manifest__.py
index 86ad2f20..d5d6e9d0 100644
--- a/website_legal_age_notice/__openerp__.py
+++ b/website_legal_age_notice/__manifest__.py
@@ -22,7 +22,7 @@
     'name': 'Legal age notice',
     'category': 'website',
     'summary': 'Show legal age notice according to law',
-    'version': '8.0.0.1',
+    'version': '10.0.0.1',
     'author': 'Trey (www.trey.es)',
     'depends': [
         'website',
diff --git a/website_legal_age_notice/controllers/website_legal_age_notice.py b/website_legal_age_notice/controllers/website_legal_age_notice.py
index 6bfba639..6e27d51f 100644
--- a/website_legal_age_notice/controllers/website_legal_age_notice.py
+++ b/website_legal_age_notice/controllers/website_legal_age_notice.py
@@ -2,11 +2,11 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import http
+from odoo import http
 
 
 class LegalAgeNotice(http.Controller):
     @http.route('/website_legal_age_notice/yes', auth='public', type='http')
     def accept_legal_age(self):
-        http.request.httpsession['accepted_legal_age'] = True
+        http.request.session['accepted_legal_age'] = True
         return http.local_redirect('/')
diff --git a/website_legal_age_notice/static/src/js/website_legal_age_notice.js b/website_legal_age_notice/static/src/js/website_legal_age_notice.js
index 638f3201..c83e1d87 100644
--- a/website_legal_age_notice/static/src/js/website_legal_age_notice.js
+++ b/website_legal_age_notice/static/src/js/website_legal_age_notice.js
@@ -1,29 +1,31 @@
-(function() {
-    'use strict';
+odoo.define('website_legal_age_notice.website_legal_age_notice', function(require) {
+    "use strict";
 
-    var website = openerp.website;
+
+    var website = require('website.website');
 
     website.ready().done(function() {
-        openerp.website.if_dom_contains('.js_wlan_message', function() {
-            var $legalAgeMessage = $('.js_wlan_message');
-            var $legalAgePopup = $('.js_wlan_message .modal');
-            $legalAgePopup.modal();
-            $('.js_wlan_btn_yes').click(function(event){
-                event.preventDefault();
-                $.ajax($(event.target).attr('href'), {
-                    'complete': function(jqXHR, textStatus){
-                        $legalAgeMessage.fadeOut('fast');
-                        $legalAgePopup.modal('hide');
-                    }
-                });
-            });
-            $('.js_wlan_btn_no').click(function(event){
-                event.preventDefault();
-                var $legalAgeQuestion = $('.js_wlan_question');
-                var $legalAgeNo = $('.js_wlan_legal_age_no');
-                $legalAgeQuestion.hide();
-                $legalAgeNo.removeClass('hidden');
+        if(!$('.js_wlan_message').length) {
+            return $.Deffered().reject("DOM doesn't contain '.js_wlan_message'");
+        }
+        var $legalAgeMessage = $('.js_wlan_message');
+        var $legalAgePopup = $('.js_wlan_message .modal');
+        $legalAgePopup.modal();
+        $('.js_wlan_btn_yes').click(function(event){
+            event.preventDefault();
+            $.ajax($(event.target).attr('href'), {
+                'complete': function(jqXHR, textStatus){
+                    $legalAgeMessage.fadeOut('fast');
+                    $legalAgePopup.modal('hide');
+                }
             });
         });
+        $('.js_wlan_btn_no').click(function(event){
+            event.preventDefault();
+            var $legalAgeQuestion = $('.js_wlan_question');
+            var $legalAgeNo = $('.js_wlan_legal_age_no');
+            $legalAgeQuestion.hide();
+            $legalAgeNo.removeClass('hidden');
+        });
     });
-})();
+});
diff --git a/website_legal_age_notice/templates/assets.xml b/website_legal_age_notice/templates/assets.xml
index 0a04de0c..7026b1ca 100644
--- a/website_legal_age_notice/templates/assets.xml
+++ b/website_legal_age_notice/templates/assets.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
 <data>
     <template id="loader" name="Legal age script loader">
-        <t t-if="request and not request.httpsession.get('accepted_legal_age')">
+        <t t-if="request and not request.session.get('accepted_legal_age')">
             <script type="text/javascript" src="/website_legal_age_notice/static/src/js/website_legal_age_notice.js"/>
         </t>
     </template>
@@ -12,4 +12,4 @@
         </xpath>
     </template>
 </data>
-</openerp>
+</odoo>
diff --git a/website_legal_age_notice/templates/website.xml b/website_legal_age_notice/templates/website.xml
index ea6f46d1..a284579f 100644
--- a/website_legal_age_notice/templates/website.xml
+++ b/website_legal_age_notice/templates/website.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
 <data>
     <template id="message" name="Legal age notice">
-        <t t-if="request and not request.httpsession.get('accepted_legal_age')">
+        <t t-if="request and not request.session.get('accepted_legal_age')">
             <div class="js_wlan_message">
                 <div class="modal fade" tabindex="-1" role="dialog">
                     <div class="modal-dialog" role="document">
@@ -34,4 +34,4 @@
         </xpath>
     </template>
 </data>
-</openerp>
+</odoo>

From 402b794107cb0105c5660fced6693657a02b22a1 Mon Sep 17 00:00:00 2001
From: Tymofii GLUKHOV <tima@invitu.com>
Date: Mon, 11 Feb 2019 15:49:33 -1000
Subject: [PATCH 2/2] [ADD] French translation

---
 website_legal_age_notice/i18n/fr.po | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 website_legal_age_notice/i18n/fr.po

diff --git a/website_legal_age_notice/i18n/fr.po b/website_legal_age_notice/i18n/fr.po
new file mode 100644
index 00000000..cc5ee708
--- /dev/null
+++ b/website_legal_age_notice/i18n/fr.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* website_legal_age_notice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-12 01:28+0000\n"
+"PO-Revision-Date: 2019-02-12 01:28+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_legal_age_notice
+#: model:ir.ui.view,arch_db:website_legal_age_notice.message
+msgid "Are you of legal age?"
+msgstr "Avez-vous 18 ans?"
+
+#. module: website_legal_age_notice
+#: model:ir.ui.view,arch_db:website_legal_age_notice.message
+msgid "Legal Age Notice"
+msgstr "Contenu reservé à un public majeur et averti"
+
+#. module: website_legal_age_notice
+#: model:ir.ui.view,arch_db:website_legal_age_notice.message
+msgid "No"
+msgstr "Non"
+
+#. module: website_legal_age_notice
+#: model:ir.ui.view,arch_db:website_legal_age_notice.message
+msgid "We are sorry, but you must be of legal age to visit our site."
+msgstr "Nous sommes désolés, mais vous devez être majeur pour visiter ce site."
+
+#. module: website_legal_age_notice
+#: model:ir.ui.view,arch_db:website_legal_age_notice.message
+msgid "Yes"
+msgstr "Oui, j'ai 18 ans"
+