From 0aa90abe4b35d27b8e3be2e7f8d6b6f06d75932d Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 17 Jan 2024 16:10:45 +0100 Subject: [PATCH] wait #6626 @0.5 --- .docker/images/php-alpha/Dockerfile | 2 +- .docker/images/php-dev/Dockerfile | 2 +- .docker/images/php/Dockerfile | 2 +- .../Admin/Operations/FluidbookQuote/CreateFromWebsite.php | 1 + app/Jobs/MailjetSyncList.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.docker/images/php-alpha/Dockerfile b/.docker/images/php-alpha/Dockerfile index 3d4bcaa0a..62d83a1cc 100644 --- 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 3d4bcaa0a..62d83a1cc 100644 --- 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 f3e7d4162..bbd305078 100644 --- 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 4a261c04e..dd63eacdc 100644 --- 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 1b9885cae..cb105f33a 100644 --- 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; } -- 2.39.5