Options Price

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/controllers/admin/AdminAntExportOrder.php

@@ -188,7 +188,7 @@ class AdminAntExportOrderController extends ModuleAdminController
         
         $last = Db::getInstance()->getRow('SELECT DATE_FORMAT(`date_start`, "%Y-%m-%d") AS date_start, DATE_FORMAT(`date_end`, "%Y-%m-%d") AS date_end
             FROM `'._DB_PREFIX_.$this->table.'` ORDER BY `date_end` DESC');
-        
+                
         if ($last == null) {
             $dateLast = new DateTime();
             $dateLast->sub(new DateInterval('P1D'));
@@ -196,10 +196,15 @@ class AdminAntExportOrderController extends ModuleAdminController
             $dateLast = new DateTime($last['date_end']);
             $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/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>