From e191bbaae2e285cb0da95e8db5c666b428b67a42 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Sat, 12 Mar 2022 18:01:41 +0100 Subject: [PATCH] use name datat from Inco --- resources/views/bo/products/edit.blade.php | 20 +++++++++++++++++-- .../views/bo/products/load-inco.blade.php | 5 ++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/resources/views/bo/products/edit.blade.php b/resources/views/bo/products/edit.blade.php index bb760d8a..22e7454a 100644 --- a/resources/views/bo/products/edit.blade.php +++ b/resources/views/bo/products/edit.blade.php @@ -25,6 +25,19 @@
+ @if ($product->product_type == "foodProduct") + @if (!empty($product->foodProduct->xmlInco)) + +
+
+ +
{{ $product->foodProduct->xmlInco->nom }}
+
+
+ @endif + @endif
@@ -273,8 +286,11 @@ } function paste(from,to) { - //document.getElementById(to).value = document.getElementById(from).innerHTML; - window[to+'Editor'].setData(document.getElementById(from).innerHTML); + if(window[to+'Editor']) { + window[to+'Editor'].setData(document.getElementById(from).innerHTML); + } else { + document.getElementById(to).value = document.getElementById(from).innerHTML; + } } var editorConfig = { diff --git a/resources/views/bo/products/load-inco.blade.php b/resources/views/bo/products/load-inco.blade.php index b01c61fd..157bad1d 100644 --- a/resources/views/bo/products/load-inco.blade.php +++ b/resources/views/bo/products/load-inco.blade.php @@ -3,7 +3,9 @@