wip #6129 @1:00

diff --git a/app/Http/Controllers/Admin/ProductBaseController.php b/app/Http/Controllers/Admin/ProductBaseController.php
index f933d61c60796325627637ca2426d7b476e81dcf..8fcfb5a55fba997ce95f8ec40a6b09f718344897 100644 (file)
--- a/app/Http/Controllers/Admin/ProductBaseController.php
+++ b/app/Http/Controllers/Admin/ProductBaseController.php
@@ -136,7 +136,7 @@ class ProductBaseController extends CubistMagicController {
                 foreach ($ids as $sheet => $id) {
                     $product = Product::find($id);
                     if ($product) {
-                        $changes = $this->storeAndReturnChanges($data);
+                        //$changes = $this->storeAndReturnChanges($data);
 
                         // Remove empty array from the changes
                         $changes = array_filter($changes);
@@ -145,10 +145,6 @@ class ProductBaseController extends CubistMagicController {
                         $sizeChanges = sizeof($changes);
 
                         $contentMail["details"][$filename][$sheet] = "[OK]";
-
-                        if (!$changes) {
-                            $contentMail["details"][$filename][$sheet] .= " (aucune modification)";
-                        }
                     } else {
                         $errorsMessage[] = "Aucun ID correspond pour le produit: $sheet";
                         if ($id) {
@@ -182,16 +178,20 @@ class ProductBaseController extends CubistMagicController {
 
         if($errorsMessage) {
             foreach ($errorsMessage as $message) {
-                $messages .= "<p>$message</p>";
+                $messages .= "$message";
             }
             $messages .= "\n";
+
+            $this->addBag($message,"error");
         }
 
-        $messages .= $successMessage;
+        //$messages .= $successMessage;
 
         $this->sendEmail($contentMail);
 
-        return $this->redirectToProductWithBag($messages);
+        $this->addBag($successMessage);
+
+        return Redirect::to($this->crud->getRoute() . 'product');
     }
 
     protected function storeAndReturnChanges($datas) {
@@ -207,14 +207,13 @@ class ProductBaseController extends CubistMagicController {
         return $changes;
     }
 
-    private function redirectToProductWithBag($message, $type = "success"): RedirectResponse
+    private function addBag($message, $type = "success")
     {
         if($type === "error") {
             Alert::error($message)->flash();
         } else {
             Alert::success($message)->flash();
         }
-        return Redirect::to($this->crud->getRoute() . 'product');
     }
 
     protected function sendEmail($datas) {

diff --git a/resources/views/partials/address-for-cart.blade.php b/resources/views/partials/address-for-cart.blade.php
new file mode 100644 (file)
index 0000000..cb1766a
--- /dev/null
+++ b/resources/views/partials/address-for-cart.blade.php
@@ -0,0 +1,23 @@
+<h2 class="font-normal">{{ $title }} :</h2>
+<form>
+    <div class="grid grid-cols-2 grid-gap-lg grid-rows-0 mb-3">
+        <div class="bg-white p-3" v-for="address in addresses" :key="address.id">
+            <div class="form-group flex items-start" :data="address.address_billing">
+                <input :id="'{{ $typeAddress }}-'+address.id" name="delivery_address" type="radio" :checked="address.delivery_address === '1' ? true : false"/>
+                <label :for="'delivery_address-'+address.id">
+                    @verbatim
+                        <span class="text-navy">{{ address.name }}</span>
+                        <div class="text-sm leading-5">
+                            {{ address.company }}<br>
+                            {{ address.firstname }}&nbsp;{{ address.lastname }}<br>
+                            {{ address.address }}<br>
+                            {{ address.zipcode }}<br>
+                            {{ address.city }}
+                        </div>
+                    @endverbatim
+                </label>
+            </div>
+        </div>
+    </div>
+    <a href="/mon-compte#address">{{ __('Ajouter une adresse') }}</a>
+</form>