diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php
index 81e430d2..8f2858b0 100644
--- a/app/Http/Controllers/Bo/ProductsController.php
+++ b/app/Http/Controllers/Bo/ProductsController.php
@@ -422,18 +422,23 @@ class ProductsController extends Controller
if(!empty($xmlInco)) {
//we have data
$hasInco = __("Des données Inco sont disponibles, souhaitez vous les associer à ce produit ?");
- return view('bo.products.load-inco',compact('hasInco','xmlInco'));
- //return array("data"=>$xmlInco);
+ $preparedImages = $this->prepareIncoImages($xmlInco->picture);
+ return view('bo.products.load-inco',compact('hasInco','xmlInco','preparedImages'));
} else {
return array("data"=> array());
}
}
+ public function getPrepareIncoImages(Request $request) {
+ $picture = $request->picture;
+ $preparedImages = $this->prepareIncoImages($picture);
+ return view('bo.products.inco-images', compact('preparedImages'));
+ }
+
/**
* prepare Inco Images
*/
- public function prepareIncoImages(Request $request) {
- $picture = $request->picture;
+ public function prepareIncoImages($picture) {
$preparedImages = array();
@@ -462,8 +467,7 @@ class ProductsController extends Controller
$preparedImages[] = "inco/images/" . File::name($incoImage) . "_large.png";
}
}
- //return array("data"=> $preparedImages);
- return view('bo.products.inco-images', compact('preparedImages'));
+ return $preparedImages;
}
/**
@@ -573,6 +577,9 @@ class ProductsController extends Controller
$product->picture = $finalImageName;
$product->save();
+
+ //@TODO : envoyer une réponse pour maj de l'interface
+ return $product;
}
/**
diff --git a/resources/views/bo/products/edit.blade.php b/resources/views/bo/products/edit.blade.php
index 749ac37a..70bab594 100644
--- a/resources/views/bo/products/edit.blade.php
+++ b/resources/views/bo/products/edit.blade.php
@@ -59,7 +59,7 @@
@if ($product->picture !== null)
-
+
@endif
@@ -79,7 +79,7 @@
@if ($product->picture_large !== null)
-
+
@endif
@@ -229,16 +229,29 @@
@section('scripts')