antadis/chocolatdemariage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: antadis:datecarrier
Branches Tags
antadis:datecarrier
antadis:develop
antadis:fix/export
antadis:master
antadis:fix-price
antadis:fix-js-postcode-pb
antadis:livre_dor
...
pull from: antadis:livre_dor
Branches Tags
antadis:develop
antadis:fix/export
antadis:master
antadis:fix-price
antadis:fix-js-postcode-pb
antadis:livre_dor
antadis:datecarrier

3 Commits
datecarrie ... livre_dor

Author SHA1 Message Date
Nolwenn J
058337cb57 log livre d or 2017-11-14 10:24:02 +01:00
Michael RICOIS
9334efa83e Fix base_dir_ssl 2017-11-13 09:55:49 +01:00
Michael RICOIS
a3e9682715 Fix https 2017-11-13 09:51:17 +01:00
6 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

3
www/modules/advsitereviews/controllers/front/default.php
View File

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

2
www/modules/antadisconfigurator/controllers/front/upload.php
View File

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

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

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

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

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

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

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

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

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