#wesco : allow kadreo to upload xlsx files

#fluidbook-prod allow http -> https communication for ws

diff --git a/crossdomain.xml b/crossdomain.xml
index 9bc07b9aefb6d2397cdf5ebd87fdde0cbacd797a..ede9ad3484c5626d3449882663d886c64abe9950 100644 (file)
--- a/crossdomain.xml
+++ b/crossdomain.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0"?>\r
-<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd"><cross-domain-policy><allow-access-from domain="*" /></cross-domain-policy>
\ No newline at end of file
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">\r
+<cross-domain-policy>\r
+    <allow-access-from domain="*" secure="false"/>\r
+</cross-domain-policy>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 6caa268924255100025ac362c4f77f874e3a8dc4..a39bfe9202754139582becb9f44e03be0057e116 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -279,7 +279,7 @@ class wsBookParametres extends wsParametres {
                                                                        'Essilor Recap' => 'com.fluidbook.player.basket.custom.essilorrecap.EssilorRecapBasketManager',
                                                                        'Wesco Ventes' => 'com.fluidbook.player.basket.custom.wesco.WescoBasketManager'), 'grade' => 5);
                $this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
-                                                         'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
+                                                         'label' => __('Références produits'), 'grade' =>3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
                $this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
                                                      'label' => __('Images des produits'), 'grade' => 5, 'fileFilter' => $imageFilter, 'hint' => __('Chaque image doit avoir pour nom exact la référence du produit'),
                                                      'multiple' => true, 'dir' => 'commerce');