wip #6889 @1

diff --git a/.docker/images/php-fpm/Dockerfile b/.docker/images/php-fpm/Dockerfile
index c87e293585bbd36dd63b7238c943d9bdbbf1877b..d53ce81b0ed04e66cf78a1e8f0ae5bc47a0c1f28 100644 (file)
--- a/.docker/images/php-fpm/Dockerfile
+++ b/.docker/images/php-fpm/Dockerfile
@@ -14,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Add Ondrej PHP repository
 RUN apt update \
-    && apt install -y --no-install-recommends ca-certificates gnupg bash curl \
+    && apt install -y --no-install-recommends ca-certificates gnupg bash curl wget \
     && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C
 
@@ -22,6 +22,9 @@ RUN apt update \
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
+RUN sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+
 RUN apt update
 
 RUN apt -y --no-install-recommends install \
@@ -52,7 +55,7 @@ RUN apt -y --no-install-recommends install \
         php8.3-fpm \
         less nano wget nodejs
 
-RUN apt -y --no-install-recommends install nodejs sudo openssh-server rsyslog cron mariadb-client zip unzip imagemagick
+RUN apt -y --no-install-recommends install google-chrome-stable nodejs sudo openssh-server rsyslog cron mariadb-client zip unzip imagemagick
 
 RUN apt -y --no-install-recommends install locales
 RUN sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen && \
@@ -64,7 +67,7 @@ ENV LC_ALL fr_FR.UTF-8
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 # IF you need some npm globally installed packages
-RUN npm install --unsafe-perm --global yarn
+RUN npm install --unsafe-perm --global yarn puppeteer
 
 CMD ["php", "-a"]
 

diff --git a/app/Http/Controllers/FluidbookController.php b/app/Http/Controllers/FluidbookController.php
index 5dfb3d5ae5cdfdf714db91ecb2800ca75f5f2e0c..3474294e5f87cd706f040e6b3ded4fe14c9a8f20 100644 (file)
--- a/app/Http/Controllers/FluidbookController.php
+++ b/app/Http/Controllers/FluidbookController.php
@@ -69,10 +69,11 @@ class FluidbookController extends Controller
 
     protected function login()
     {
-       return self::_login();
+        return self::_login();
     }
 
-    public static function _login(){
+    public static function _login()
+    {
         $request = request();
         $credentials = $request->validate([
             'email' => ['required', 'email'],
@@ -146,7 +147,7 @@ class FluidbookController extends Controller
         $user->notify(new ResahNotification(ResahNotification::QUOTE_REQUEST_SENT, $order));
         User::withoutGlobalScopes()->find(3)->notify(new ResahNotification(ResahNotification::QUOTE_REQUEST, $order));
 
-        return response()->json(['success' => 'ok', 'order' => $order->id, 'total' => $total])->setStatusCode(200);
+        return response()->json(['success' => 'ok', 'order' => $order->id, 'subTotal' => $total, 'taxes' => $cumul_tva, 'total' => $total + $cumul_tva])->setStatusCode(200);
 
     }
 

diff --git a/app/Http/Controllers/ForgotPassword.php b/app/Http/Controllers/ForgotPassword.php
index 89f8d98728b6cace0a1f9695fda44f5a4131364b..8419994e93ecd18895e8b9b7f1da21987b87cee3 100644 (file)
--- a/app/Http/Controllers/ForgotPassword.php
+++ b/app/Http/Controllers/ForgotPassword.php
@@ -50,7 +50,7 @@ trait ForgotPassword
         ], [
             '*.required' => 'Ce champ est obligatoire',
             'password.min' => 'Le mot de passe trop court (8 caractères minimum)',
-            'password.confirmed' => 'Les mots de passes ne correspondent pas',
+            'password.confirmed' => 'Les mots de passe ne correspondent pas',
         ]);