Merge branch 'fix/export' into develop

www/modules/advsitereviews/controllers/front/default.php

@@ -12,7 +12,7 @@ class AdvSiteReviewsDefaultModuleFrontController extends ModuleFrontController
 
 	public function __construct()
 	{
-		$this->auth = true;
+		// $this->auth = true;
 		parent::__construct();
 		$this->context = Context::getContext();
 	}
@@ -24,7 +24,6 @@ class AdvSiteReviewsDefaultModuleFrontController extends ModuleFrontController
 	{
 		parent::initContent();
 
-
             $reviews = AdvSiteReview::getReviews();
 
             if (!$reviews) {

www/modules/antadisconfigurator/controllers/front/upload.php

@@ -36,7 +36,7 @@ class AntadisConfiguratorUploadModuleFrontController extends ModuleFrontControll
         if(!file_exists($path)) {
             mkdir($path, 0755, true);
         }
-        $url = _PS_BASE_URL_.'/upload/simu/'.$id_product.'/'.$reference;
+        $url = Tools::getShopDomainSsl(true).'/upload/simu/'.$id_product.'/'.$reference;
         
         $options = array(
             'upload_dir' => $path.'/',

www/modules/antadissimulator/views/templates/hook/productbloc/doublecube-exclusif.tpl

@@ -131,7 +131,7 @@
       <div class="custom-file">
         <input id="DOUBLECUBEIMAGE" class="configurator-opt-file-cube" name="files" data-field="optgroup-exclusif" 
         	data-url="/configurator/upload/{$id_product}/CUBE"
-        	data-dl="{$base_dir}upload/simu/{$id_product}" type="file">
+        	data-dl="{$base_dir_ssl}upload/simu/{$id_product}" type="file">
         <span class="filename">{l s='Aucun fichier' mod='antadissimulator'}</span>
         <span class="action">{l s='Choisir un fichier' mod='antadissimulator'}</span></div>
 	</div>

www/modules/antadissimulator/views/templates/hook/productbloc/pochette-exclusif.tpl

@@ -141,7 +141,7 @@
       <div class="custom-file">
         <input id="DOUBLECUBEIMAGE" class="configurator-opt-file-pochette" name="files" data-field="optgroup-exclusif" 
         	data-url="/configurator/upload/{$id_product}/POCHETTE"
-        	data-dl="{$base_dir}upload/simu/{$id_product}" type="file">
+        	data-dl="{$base_dir_ssl}upload/simu/{$id_product}" type="file">
         <span class="filename">{l s='No file selected' mod='antadissimulator'}</span>
         <span class="action">{l s='Choose File' mod='antadissimulator'}</span></div>
 	</div>

www/modules/antadissimulator/views/templates/hook/productbloc/sachet-exclusif.tpl

@@ -99,7 +99,7 @@
       <div class="custom-file">
         <input id="DOUBLECUBEIMAGE" class="configurator-opt-file-choco" name="files" data-field="optgroup-exclusif" 
         	data-url="/configurator/upload/{$id_product}" 
-        	data-dl="{$base_dir}upload/simu/{$id_product}" type="file">
+        	data-dl="{$base_dir_ssl}upload/simu/{$id_product}" type="file">
         <span class="filename">{l s='No file selected' mod='antadissimulator'}</span>
         <span class="action">{l s='Choose File' mod='antadissimulator'}</span></div></div>
         <span id="response-optgroup-exclusif"></span>

www/modules/antadissimulator/views/templates/hook/productbloc/vrac-exclusif.tpl

@@ -98,7 +98,7 @@
       <div class="custom-file">
         <input id="DOUBLECUBEIMAGE" class="configurator-opt-file-choco" name="files" data-field="optgroup-exclusif" 
         	data-url="/configurator/upload/{$id_product}" 
-        	data-dl="{$base_dir}upload/simu/{$id_product}" type="file">
+        	data-dl="{$base_dir_ssl}upload/simu/{$id_product}" type="file">
         <span class="filename">{l s='No file selected' mod='antadissimulator'}</span>
         <span class="action">{l s='Choose File' mod='antadissimulator'}</span></div></div>
         <span id="response-optgroup-exclusif"></span>

www/modules/antexportorder/classes/Export.php

@@ -55,26 +55,8 @@ class Export
         $result = Db::getInstance()->executeS($sql);
         if (count($result) > 0) {
             foreach($result as $k => $p) {
-                $result[$k]['pelliculage'] = '';
-                $result[$k]['emballage'] = '';
                 $result[$k]['delivery_date'] = '';
                 
-                if ($p['id_configurator'] != 0) {
-                    $configList = ConfiguratorStorage::getOptProductFlatten($p['id_configurator']);
-                    foreach ($configList as $config) {
-                        if ($config['reference'] == 'PELLICULAGE') {
-                            foreach($config['value'] as $v) {
-                                $result[$k]['pelliculage']= $v;
-                            }
-                        }
-                        if ($config['reference'] == 'EMBALLAGE') {
-                            foreach($config['value'] as $v) {
-                                $result[$k]['emballage']= $v;
-                            }
-                        }
-                    }
-                }
-                
                 // customer_thread (id_order), customer_message (id_customer_message) message
                 $sql = "SELECT message FROM ps_customer_message cm, ps_customer_thread ct
                     WHERE ct.id_order=".$p['id_order']." AND ct.id_customer=".$p['id_customer']." AND cm.id_customer_thread=ct.id_customer_thread";
@@ -109,8 +91,6 @@ class Export
             array('label' => 'code_pays_livr', 'col' => 'country',),
             array('label' => 'Date_livraison', 'col' => 'delivery_date'), // Message
             array('label' => 'Date_facturation', 'col' => 'invoice_date'),
-            array('label' => 'type papier', 'col' => 'emballage'),
-            array('label' => 'finition papier', 'col' => 'pelliculage'),
             array('label' => 'Déduction_échantillon', 'col' => ''),
             array('label' => 'mode paiement', 'col' => 'payment'),
             array('label' => 'Reference BC', 'col' => ''),
@@ -163,7 +143,7 @@ class Export
                     foreach ($configList as $config) {
                         if (substr($config['reference'],0,3) == 'NOM') {
                             foreach($config['value'] as $v) {
-                                if (empty( $result[$k]['prenoms'])) {
+                                if (empty($result[$k]['prenoms'])) {
                                     $result[$k]['prenoms'] = $v;
                                 } else {
                                     $result[$k]['prenoms'].= ' '.$v;
@@ -248,6 +228,8 @@ class Export
                 $result[$k]['TXT'] = '';
                 $result[$k]['parfums1'] = '';
                 $result[$k]['parfums2'] = '';
+                $result[$k]['pelliculage'] = '';
+                $result[$k]['emballage'] = '';
                 
                 if ($p['id_configurator'] != 0) {
                     $configList = ConfiguratorStorage::getOptProductFlatten($p['id_configurator']);
@@ -260,7 +242,16 @@ class Export
                                 $parfumCpt++;
                             }
                         }
-                        
+                        if ($config['reference'] == 'PELLICULAGE') {
+                            foreach($config['value'] as $v) {
+                                $result[$k]['pelliculage']= $v;
+                            }
+                        }
+                        if ($config['reference'] == 'EMBALLAGE') {
+                            foreach($config['value'] as $v) {
+                                $result[$k]['emballage']= $v;
+                            }
+                        }
                         // Standard
                         if (!empty($result[$k]['TXT'])) {
                             $result[$k]['TXT'].= "\n";
@@ -276,13 +267,24 @@ class Export
                         }
                     }
                 }
+                
+                // Theme name
+                $result[$k]['theme']= '';
+                $themeName = Db::getInstance()->getValue("SELECT name FROM `"._DB_PREFIX_."simulator_theme` st
+                    LEFT JOIN `"._DB_PREFIX_."product` p ON (p.`id_simulator_theme`=st.`id_simulator_theme`)
+                    WHERE p.`id_product`=".$p['product_id']);
+                if (!empty($themeName)) {
+                    $result[$k]['theme'] = $themeName;
+                }
             }
         }
         
         $header = array(
             array('label' => 'ID_fact', 'col' => 'id_order'),
             array('label' => 'ref_article', 'col' => 'reference'),
-            array('label' => 'Thème', 'col' => 'product_name'),
+            array('label' => 'type papier', 'col' => 'emballage'),
+            array('label' => 'finition papier', 'col' => 'pelliculage'),
+            array('label' => 'Thème', 'col' => 'theme'),
             array('label' => 'Qualité_1', 'col' => 'parfums1'),
             array('label' => 'Qualité_2', 'col' => 'parfums2'),
             array('label' => 'Quantité', 'col' => 'quantity'),

www/modules/antexportorder/controllers/admin/AdminAntExportOrder.php

@@ -197,9 +197,14 @@ class AdminAntExportOrderController extends ModuleAdminController
             $dateLast->add(new DateInterval('P1D'));
         }
 
-        $this->fields_value['date_start'] = $dateLast->format('Y-m-d');
-
         $dateToday = new DateTime();
+        $dateToday->setTime(0, 0);
+        if ($dateLast >= $dateToday) {
+            $this->errors[] = Tools::displayError('You can\'t generate export in the future');
+            return;
+        }
+        
+        $this->fields_value['date_start'] = $dateLast->format('Y-m-d');
         $this->fields_value['date_end'] = $dateToday->sub(new DateInterval('P1D'))->format('Y-m-d');
         
         return parent::renderForm();

www/override/classes/Product.php

@@ -352,15 +352,8 @@ class Product extends ProductCore
         // Prix de l'option
         $flatrate = true;
         $priceImpact = 0;
-        if ($id_configurator != null) {
-            $sql = 'SELECT price FROM `'._DB_PREFIX_.'configurator_storage` WHERE id_configurator = '.(int)$id_configurator.
-                ' AND id_product = '.(int)$id_product;
-            $priceResult = Db::getInstance()->executeS($sql);
-            if (count($priceResult) > 0) {
-                foreach($priceResult as $p) {
-                    $priceImpact += $p['price'];
-                }
-            }
+        if ($id_configurator !== null) {
+            $priceImpact = self::getConfiguratorSelectedPriceTotal($id_product, $id_configurator);
             if ($flatrate === true) {
                 $priceImpact = $priceImpact / $quantity;
             }

www/themes/chocolatdemariage/js/global.js

@@ -163,7 +163,17 @@ $(document).ready(function() {
 });
 
 
-function owlCarousel(elem, nbElem0 = 2, nbElem480 = 3, nbElem767 = 4, nbElem990 = 4, nbElem1299 = 5, nbElem1499 = 6, stagePad = 30, navActivation = false, stagePadBig = 0){
+function owlCarousel(elem, nbElem0, nbElem480, nbElem767, nbElem990, nbElem1299, nbElem1499, stagePad, navActivation, stagePadBig) {
+	nbElem0 = typeof nbElem0 !== 'undefined' ? nbElem0 : 2;
+	nbElem480 = typeof nbElem480 !== 'undefined' ? nbElem480 : 3;
+	nbElem767 = typeof nbElem767 !== 'undefined' ? nbElem767 : 4;
+	nbElem990 = typeof nbElem990 !== 'undefined' ? nbElem990 : 4;
+	nbElem1299 = typeof nbElem1299 !== 'undefined' ? nbElem1299 : 5;
+	nbElem1499 = typeof nbElem1499 !== 'undefined' ? nbElem1499 : 6;
+	stagePad = typeof stagePad !== 'undefined' ? stagePad : 30;
+	stagePadBig = typeof stagePad !== 'undefined' ? stagePad : 30;
+	navActivation = typeof navActivation !== 'undefined' ? navActivation : false;
+
 	/* copy col : owlCarousel(elem, 2, 3, 4, 4, 5, 6, 30, false, 30) */
 	$(elem).on('initialized.owl.carousel changed.owl.carousel refreshed.owl.carousel', function (event) {
 	    if (!event.namespace) return;

www/themes/chocolatdemariage/order-carrier.tpl

@@ -103,7 +103,7 @@
 								<div class="box-content">
 									<div class="row">
 										<div class="sm6 form-group">
-											<input type="text" class="form-control custom-input" value="" required>
+											<input name="howknowus" type="text" class="form-control custom-input" value="" required>
 										</div>
 									</div>
 								</div>