wait #6138 0:25 message de confirmation dynamique et renommage de la ref si présence...

diff --git a/app/Http/Controllers/Admin/ProductBaseController.php b/app/Http/Controllers/Admin/ProductBaseController.php
index 0093da29bf2ca1397afb10117e95ea3da4da8910..037d12658aee80d3009fb92b56a91e9a8bbd15e6 100644 (file)
--- a/app/Http/Controllers/Admin/ProductBaseController.php
+++ b/app/Http/Controllers/Admin/ProductBaseController.php
@@ -199,6 +199,7 @@ class ProductBaseController extends CubistMagicController {
         foreach ($datas as $id => $data) {
             $product = Product::find($id);
             if ($product) {
+                $product->reference = str_replace('|', '/', $product->reference);
                 $product->update($data);
                 $product->save();
                 $changes[$id] = $product->wasChanged();

diff --git a/resources/js/app.js b/resources/js/app.js
index fa15b4ff92357a16c5d0b8172793d60d39375296..52858f132d49b9d64b6094e090f8741106bf5de4 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -84,7 +84,8 @@ const app = new Vue({
         discount: 0,
         //
         nameSaved: {},
-        confirmMessageCart: ''
+        confirmMessage: '',
+        confirmMessageText: "Vos informations ont été mises à jour avec succès !"
     },
 
     beforeMount() {
@@ -425,6 +426,7 @@ const app = new Vue({
             axios.post('/ajax/update', data)
                 .then(function (response) {
                     root.removeErrorsForm()
+                    root.confirmMessage = root.confirmMessageText;
                     root.validateAction = true
                     root.form[id] = response.data
                 })
@@ -442,6 +444,7 @@ const app = new Vue({
             axios.post('/ajax/updateAddress', data)
                 .then(function (response) {
                     root.removeErrorsForm()
+                    root.confirmMessage = root.confirmMessageText;
                     root.validateAction = true
                 })
                 .catch(function (error) {
@@ -512,7 +515,7 @@ const app = new Vue({
             axios.post('/ajax/storecart', data)
                 .then(function (response) {
                     root.validateAction = true
-                    root.confirmMessageCart = response.data;
+                    root.confirmMessage = response.data;
                 })
                 .catch(function (error) {
                     console.log(error)
@@ -583,7 +586,7 @@ const app = new Vue({
             axios.post('/ajax/order', data)
                 .then(function (response) {
                     root.validateAction = true
-                    root.confirmMessageCart = response.data;
+                    root.confirmMessage = response.data;
                     root.items = {}
                 })
                 .catch(function (error) {

diff --git a/resources/styles/components/modal-confirm.styl b/resources/styles/components/modal-confirm.styl
index 917a523bde8ef458326d5aca82085f1d6ab12d43..63c7bcecad10d06c5ed3bb077d62ea1089f2117f 100644 (file)
--- a/resources/styles/components/modal-confirm.styl
+++ b/resources/styles/components/modal-confirm.styl
@@ -9,7 +9,7 @@
   padding: 0 25px
   z-index: 999
   //top: -120px
-  top: -var(--header-height)
+  top: var(--header-height)
   &-text
     width: 100%
     max-width: 744px
@@ -21,6 +21,8 @@
     z-index: 1
     box-shadow: 0 30px 60px rgba(24,47,76,.2)
     font-family: 'Barlow',sans-serif
+    color: theme('colors.navy')
+    font-weight: 400
     .mb-4
       margin-bottom: 1rem !important
   &-close

diff --git a/resources/views/pages/cart.blade.php b/resources/views/pages/cart.blade.php
index 3293823ac00f9c67f5759368531751ea13334a1d..bc1845c6a4b4de30194b2b2b4d24dcf0ca60073c 100644 (file)
--- a/resources/views/pages/cart.blade.php
+++ b/resources/views/pages/cart.blade.php
@@ -113,6 +113,6 @@
 
     </content>
     <modal-confirm>
-        <p>@{{ confirmMessageCart }}</p>
+        <p>@{{ confirmMessage }}</p>
     </modal-confirm>
 @endsection

diff --git a/resources/views/pages/my_account.blade.php b/resources/views/pages/my_account.blade.php
index 4e5fcee48d174e6720fb1194a3228cd37d9dfc56..cad66bcd863df11bf7a597e35869d6862625071a 100644 (file)
--- a/resources/views/pages/my_account.blade.php
+++ b/resources/views/pages/my_account.blade.php
@@ -162,6 +162,6 @@
         </content>
     </full-width>
     <modal-confirm>
-        <p>{{ __('Vos informations ont été mises à jour avec succès !') }}</p>
+        <p>@{{ confirmMessage }}</p>
     </modal-confirm>
 @endsection

diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 2303287a79315fd850487c72420a8513317fb139..f3b04cfc9e10a5e168711e2558fe21e4b903bb74 100644 (file)
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -94,4 +94,7 @@
 
     <portal-target name="nav-search-bar" slim></portal-target>
 
+    <modal-confirm>
+        <p>@{{ confirmMessage }}</p>
+    </modal-confirm>
 </header>