wait #6626 @0.5

diff --git a/.docker/images/php-alpha/Dockerfile b/.docker/images/php-alpha/Dockerfile
index 3d4bcaa0a2329fd439a8fa1a6a759848a1fa009a..62d83a1cc4aaa33cafd76313b7b9be508d433148 100644 (file)
--- a/.docker/images/php-alpha/Dockerfile
+++ b/.docker/images/php-alpha/Dockerfile
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Compile NSISbi
 RUN apt update && apt -y --no-install-recommends install build-essential scons mingw-w64 zlib1g-dev curl unzip ca-certificates wget gnupg
-RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
+RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.09.1/nsis-code-7405-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7405-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
 
 # Add additional repositories
 RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -

diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile
index 3d4bcaa0a2329fd439a8fa1a6a759848a1fa009a..62d83a1cc4aaa33cafd76313b7b9be508d433148 100644 (file)
--- a/.docker/images/php-dev/Dockerfile
+++ b/.docker/images/php-dev/Dockerfile
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Compile NSISbi
 RUN apt update && apt -y --no-install-recommends install build-essential scons mingw-w64 zlib1g-dev curl unzip ca-certificates wget gnupg
-RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
+RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.09.1/nsis-code-7405-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7405-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
 
 # Add additional repositories
 RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index f3e7d4162afd0bd3c667b7474cae8a6699ad72c5..bbd30507855c64bbcf92fa8d29af2592ba1280ca 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Compile NSISbi
 RUN apt update && apt -y --no-install-recommends install build-essential scons mingw-w64 zlib1g-dev curl unzip ca-certificates wget gnupg
-RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
+RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.09.1/nsis-code-7405-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7405-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
 
 # Add additional repositories
 RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
index 4a261c04e6e14a16a094b196b8a8bab79522532a..dd63eacdc0f69aad83fd59e29ce13012187e132e 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
@@ -79,6 +79,7 @@ trait CreateFromWebsite
                     $user->locale = $post['lang'];
                     $user->enabled = true;
                     $user->e1_grade = 0;
+                    $user->marketing = true;
                     $user->save();
 
                     $user->assignRole('fluidbook:client');

diff --git a/app/Jobs/MailjetSyncList.php b/app/Jobs/MailjetSyncList.php
index 1b9885cae57a8de67eb0d8104106fff2880056a9..cb105f33a4998ea6ae1df833b2d5953ce3b624c3 100644 (file)
--- a/app/Jobs/MailjetSyncList.php
+++ b/app/Jobs/MailjetSyncList.php
@@ -45,7 +45,7 @@ class MailjetSyncList extends Base
             /** @var Company $company */
             $adminCompany = Permissions::getCompanyByUser($company->admin);
             // Skip companies not directly managed by Cubedesigners
-            if ($adminCompany != 7) {
+            if ($adminCompany != 7 && !$company->marketing_force) {
                 $skippedCompanies[] = $company->id;
                 continue;
             }