Algemene Mailcatcher toegevoegd voor hnode4

Fix

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,16 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="email_validator" />
+            <item index="1" class="java.lang.String" itemvalue="freezegun" />
+            <item index="2" class="java.lang.String" itemvalue="python-dateutil" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.10" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/testserver.iml" filepath="$PROJECT_DIR$/.idea/testserver.iml" />
+    </modules>
+  </component>
+</project>

.idea/testserver.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

README.md

@@ -6,6 +6,33 @@ chmod +x install_mailhog_as_service.sh
 ./install_mailhog_as_service.sh
 ```
 
+## Workaround bij foutmelding in Ubuntu 22.04: "note: module requires Go 1.20"
+```
+- Download gewenste versie van Go:
+wget -c https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
+
+- Ga naar de map waar het bestand staat en pak het uit:
+sudo tar -C /usr/local/ -xzf go1.22.0.linux-amd64.tar.gz
+
+- Set PATH Environment Variable
+export PATH=$PATH:/usr/local/go/bin
+
+- Voeg onderstaande code toe aan .profile om het definitief te maken:
+# set PATH so it includes /usr/local/go/bin if it exists
+if [ -d "/usr/local/go/bin" ] ; then
+    PATH="/usr/local/go/bin:$PATH"
+fi
+
+- reload .profile (let op: mét punt!)
+. ~/.profile
+
+- Controleer welke versie van Go actief is:
+go version
+
+- Installeer nu Mailhog met het installatie script
+
+```
+
 ## Na de installatie
 ```
 systemctl enable mailhog
@@ -61,18 +88,35 @@ server {
 
 In de nginx config file een wachtwoord opnemen:
 ```
-    auth_basic "Administrator Area";
-    auth_basic_user_file /etc/nginx/.htpasswd;
-    
-apt-get install apache2-utils
-apt update
-apt install apache2-utils
-ls /etc/apache2
-cd /etc
-ls
-htpasswd -c /etc/nginx/.htpasswd admin
+
+
+========================================================
+Voorbeeld: 
+In de nginx config file voor omgeving 499 een wachtwoord instellen:
+========================================================
+
+   auth_basic "Administrator Area";
+   auth_basic_user_file /etc/nginx/.htpasswd-499;
+========================================================
+
+Voor iedere omgeving is op de 401 een aparte .htpasswd aangemaakt in de map /etc/nginx/
+Voor alle test-omgevingen in de reeks 402 en 499 is een bestand aangemaakt.
+Om een nieuw htpasswd te maken (bijvoorbeeld in de 500-reeks) kan het beste een bestaande file gekopieerd worden:
+   cp /etc/nginx/.htpasswd-402 /etc/nginx/.htpasswd-499
+
+Om al de (verborgen) .htpasswd bestanden opvragen:
+   ls -rtla /etc/nginx | grep .htpasswd
+
+Een .htpasswd kan bekeken worden met nano, maar je ziet dan alleen de user én het encrypte wachtwoord:
+   nano  /etc/nginx/.htpasswd-499
+
+Om een nieuw wachtwoord in te stellen voor de user 'mail' voor omgeving 499:
+   htpasswd /etc/nginx/.htpasswd-499 mail
+
+=================================================
+Om de wijzigingen toe te passen moet nginx herstart worden:
 service nginx restart
-nano /etc/nginx/.htpasswd
+=================================================
 ```
 
 

install_mailhog_as_service.sh

@@ -1,15 +1,28 @@
 #!/bin/bash
 echo "";
-echo "===================================";
-echo "Install golang-go...";
-echo "===================================";
-apt-get -y install golang-go;
-if [ $? == 0 ] ; then
-  echo 'golang-go installed'
-else 
-  echo 'ERROR: Installing golang-go NOT succesfull!'
-  exit 
-fi
+set -e
+GO_VERSION=1.22.5   # of een andere recente 1.22.x / 1.23.x
+echo "==================================="
+echo "Installeren van Go ${GO_VERSION}..."
+echo "==================================="
+apt-get update
+apt-get -y install curl ca-certificates
+cd /tmp
+curl -LO https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
+# Oude Go-installatie weghalen (indien aanwezig)
+rm -rf /usr/local/go
+# Nieuwe Go installeren
+tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
+# Go in PATH zetten voor dit script
+export PATH=/usr/local/go/bin:$PATH
+go version  # zou nu go1.22.x moeten tonen
+#apt-get -y install golang-go;
+#if [ $? == 0 ] ; then
+#  echo 'golang-go installed'
+#else 
+#  echo 'ERROR: Installing golang-go NOT succesfull!'
+#  exit 
+#fi
 echo "";
 echo "===================================";
 echo "Installing mailhog...";

mailcatcher_menu/models/mailcatcher_menu.py

@@ -17,7 +17,9 @@ class IrActionUrl(models.Model):
             parameter = parameters[0]
             cont_nr = parameter.value.split("//",1)[1] #Haal https://  van string
             cont_nr = cont_nr[0:3] #De eerste 3 karakters is het containernummer
-            act_url = "https://" + cont_nr + "-mailcatcher.staging.open2bizz.com"
+            node = parameter.value.split("staging",1)[1] #Haal alles van string weg t/m staging
+            node = node[0:1] #Het eerste karakters is het de stagingarea
+            act_url = "https://" + cont_nr + "-mailcatcher.staging" + node + ".open2bizz.com"
             _logger.info('----------  ACT_URL ---------- %s', act_url)
             action_id = self.env['ir.model.data']._xmlid_to_res_id('mailcatcher_menu.action_mailcatcher_url')
             action = self.env['ir.actions.act_url'].browse(action_id)

testserver_o2b/__manifest__.py

@@ -3,17 +3,18 @@
     'name': "testserver_o2b",
 
     'summary': """
-        Short (1 phrase/line) summary of the module's purpose, used as
-        subtitle on modules listing or apps.openerp.com""",
+        Set Odoo as a test env.""",
 
     'description': """
-        Long description of module's purpose
+        This module is to be installed when the Odoo env. server is to be used as test env.
+        Disables: email, cron jobs, account sync and removes Enterprise Sub code. 
+        Adds a web ribbon to identify web frontendas test
     """,
 
-    'author': "My Company",
-    'website': "http://www.yourcompany.com",
-    'category': 'Uncategorized',
-    'version': '0.1',
+    'author': "Open2bizz BV",
+    'website': "http://www.open2bizz.nl",
+    'category': 'Tools',
+    'version': "16.0.1.2.0",
     'depends': ['web_environment_ribbon', 'mail','base',],
     'data': [
         'views/views.xml',

testserver_o2b/models/init_test.py

@@ -25,6 +25,9 @@ class IrLogging(models.Model):
         UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';     
         INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');                        
         INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('hnode6.openworx.nl','1025','Algemene mailcatcher vanaf hnode4','login','name','t');
+        UPDATE website SET google_analytics_key = NULL WHERE google_analytics_key IS NOT NULL;
+        UPDATE product_template SET is_published = FALSE WHERE is_published = TRUE;
         """ %(db_id))
         if self.env['ir.config_parameter'].search([('key','=','web.base.url.freeze')]):
             self.env.cr.execute("""DELETE FROM ir_config_parameter WHERE key = 'web.base.url.freeze';""")
@@ -63,3 +66,24 @@ class IrLogging(models.Model):
         for ap in ADDONS_PATH.split(','):
             if ap[-10:] == 'testserver':
                 _logger.error(os.system('./%s/testserver.sh' %(ap)))
+
+        model_website_page = self.env['ir.model'].search([('model','=','website.page')])
+        if model_website_page:
+            for page in self.env['website.page'].search([('is_published','=',True)]):
+                page.write({
+                    'is_published': False
+                })
+            for website in self.env['website'].search([]):
+                website.write({
+                    'domain': ""
+                })
+            for menu in self.env['website.menu'].search([('is_visible','=',True)]):
+                if menu.website_id and menu.parent_id:
+                    menu.write({
+                        'website_id': False
+                    })
+                elif menu.website_id and menu.url == "/":
+                    view = self.env['ir.ui.view']._xmlid_to_res_id('testserver_o2b.testserver_page_website')
+                    if view:
+                        menu.page_id.view_id = view.id
+

testserver_o2b/views/templates.xml

@@ -1,24 +1,61 @@
 <odoo>
     <data>
-<!--
-        <template id="listing">
-          <ul>
-            <li t-foreach="objects" t-as="object">
-              <a t-attf-href="#{ root }/objects/#{ object.id }">
-                <t t-esc="object.display_name"/>
-              </a>
-            </li>
-          </ul>
+        <!-- Banner for web layout (backend Odoo) -->
+        <template id="testserver_banner_web" name="TOP banner test backend" inherit_id="web.layout">
+            <xpath expr="//body" position="inside">
+                <div>
+                    <span style="text-align: center;color: #FFFFFF;background-color: #006CFE;position: relative;display: block;font-size: 16px;">
+                        This is a test database.
+                        <a href="https://www.open2bizz.tech/helpdesk" target="_blank" style="color: #000000;">
+                           See website to report issue's.
+                        </a>
+                    </span>
+                </div>
+            </xpath>
         </template>
-        <template id="object">
-          <h1><t t-esc="object.display_name"/></h1>
-          <dl>
-            <t t-foreach="object._fields" t-as="field">
-              <dt><t t-esc="field"/></dt>
-              <dd><t t-esc="object[field]"/></dd>
+
+        <!-- Banner for web layout (website Odoo) -->
+        <template id="testserver_banner_website" name="TOP banner test front" inherit_id="website.layout">
+            <xpath expr="//body" position="before">
+                <div>
+                    <span style="text-align: center;color: #FFFFFF;background-color: #006CFE;position: relative;display: block;font-size: 16px;">
+                        ***** This is a test environment *****
+                        <a href="https://www.open2bizz.tech/helpdesk" target="_blank" style="color: #000000;">
+                           See website to report issue's.
+                        </a>
+                    </span>
+                </div>
+            </xpath>
+        </template>
+
+        <!-- Replacement layout (website Odoo) -->
+        <template id="testserver_page_website" name="Website page front">
+            <t t-name="website.test-env">
+                <t t-call="website.layout">
+                    <div id="wrap" class="oe_structure oe_empty">
+                        <section class="s_banner parallax s_parallax_is_fixed pb96 o_colored_level pt40"
+                                 data-scroll-background-ratio="1"
+                                 data-snippet="s_banner" data-name="Banner" style="background-image: none;">
+                            <span class="s_parallax_bg oe_img_bg o_bg_img_center"
+                                  style="background-image: url(&quot;https://hd-beamers.nl/wp-content/uploads/2014/05/Testbeeld-1280x720p_hd-ready.png&quot;); background-position: 50% 0px;"/>
+                            <div class="o_we_bg_filter" style="background-image: linear-gradient(135deg, rgba(21, 25, 116, 0.71) 0%, rgba(226, 51, 255, 0.5) 100%);"/>
+                            <div class="container">
+                                <div class="row s_nb_column_fixed">
+                                    <div class="col-lg-6 jumbotron rounded o_cc o_cc1 pt32 pb32 o_colored_level" data-name="Box">
+                                        <h1><font style="font-size: 62px;" class="o_default_snippet_text">TEST</font><br/></h1>
+                                        <p class="lead o_default_snippet_text">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+                                        <a class="mb-2 btn btn-primary" href="/web/login" data-bs-original-title="" title="">Login</a>
+                                        <br/>
+                                        <br/>
+                                        <a class="mb-2 btn btn-secondary" href="https://www.open2bizz.nl" data-bs-original-title="" title="">Open2Bizz</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </section>
+                    </div>
+                </t>
             </t>
-          </dl>
         </template>
--->
+
     </data>
 </odoo>