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:fix-js-postcode-pb
Branches Tags
antadis:develop
antadis:fix/export
antadis:master
antadis:fix-price
antadis:fix-js-postcode-pb
antadis:livre_dor
antadis:datecarrier

7 Commits
datecarrie ... fix-js-pos

Author SHA1 Message Date
Nolwenn J
3e27400e11 fix pb postcode 2017-11-28 16:37:05 +01:00
Michael RICOIS
7d07439047 Fix name howknowus 2017-11-14 10:56:01 +01:00
Michael RICOIS
caf254cc00 Merge remote-tracking branch 'origin/livre_dor' 2017-11-14 10:34:52 +01:00
Michael RICOIS
2dcfda48fb Fix date in future 2017-11-14 10:33:45 +01:00
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
9 changed files with 26 additions and 12 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()
{
$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) {

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

@ -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.'/',

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

11
www/modules/antexportorder/controllers/admin/AdminAntExportOrder.php
View File

@ -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();

12
www/themes/chocolatdemariage/js/global.js
View File

@ -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;

2
www/themes/chocolatdemariage/order-carrier.tpl
View File

@ -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>