Inital commit

This commit is contained in:
2020-11-19 15:36:28 +01:00
parent 71f32f83d3
commit 66ce4ee218
18077 changed files with 2166122 additions and 35184 deletions

View File

@@ -24,7 +24,6 @@ use Thelia\Core\Translation\Translator;
* @package Colissimo\Looop
* @author Thelia <info@thelia.net>
*/
class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
{
protected function getArgDefinitions()
@@ -37,24 +36,55 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
$ret = array();
$dir = __DIR__."/../Config/";
if (!is_readable($dir)) {
$ret[] = array("ERRMES"=>Translator::getInstance()->trans("Can't read Config directory", [], Colissimo::MESSAGE_DOMAIN), "ERRFILE"=>"");
$ret[] = array(
"ERRMES"=>Translator::getInstance()->trans(
"Can't read Config directory",
[],
Colissimo::DOMAIN_NAME
),
"ERRFILE"=>""
);
}
if (!is_writable($dir)) {
$ret[] = array("ERRMES"=>Translator::getInstance()->trans("Can't write Config directory", [], Colissimo::MESSAGE_DOMAIN), "ERRFILE"=>"");
$ret[] = array(
"ERRMES"=>Translator::getInstance()->trans(
"Can't write Config directory",
[],
Colissimo::DOMAIN_NAME
),
"ERRFILE"=>""
);
}
if ($handle = opendir($dir)) {
while (false !== ($file = readdir($handle))) {
if (strlen($file) > 5 && substr($file, -5) === ".json") {
if (!is_readable($dir.$file)) {
$ret[] = array("ERRMES"=>Translator::getInstance()->trans("Can't read file", [], Colissimo::MESSAGE_DOMAIN), "ERRFILE"=>"Colissimo/Config/".$file);
$ret[] = array(
"ERRMES"=>Translator::getInstance()->trans(
"Can't read file",
[],
Colissimo::DOMAIN_NAME
),
"ERRFILE"=>"Colissimo/Config/".$file
);
}
if (!is_writable($dir.$file)) {
$ret[] = array("ERRMES"=>Translator::getInstance()->trans("Can't write file", [], Colissimo::MESSAGE_DOMAIN), "ERRFILE"=>"Colissimo/Config/".$file);
$ret[] = array(
"ERRMES"=>Translator::getInstance()->trans(
"Can't write file",
[],
Colissimo::DOMAIN_NAME
),
"ERRFILE"=>"Colissimo/Config/".$file
);
}
}
}
}
return $ret;
}
public function parseResults(LoopResult $loopResult)
@@ -65,7 +95,6 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
->set("ERRFILE", $arr["ERRFILE"]);
$loopResult->addRow($loopResultRow);
}
return $loopResult;
}
}

View File

@@ -12,20 +12,16 @@
namespace Colissimo\Loop;
use Colissimo\Colissimo;
use Colissimo\Model\ColissimoQuery;
use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Order;
use Thelia\Core\Template\Loop\Order;
/**
* Class NotSendLoop
* @package Colissimo\Loop
* @author Manuel Raynaud <mraynaud@openstudio.fr>
* @author Manuel Raynaud <manu@raynaud.io>
*/
class NotSendLoop extends Order
{
@@ -63,7 +59,7 @@ class NotSendLoop extends Order
*/
public function getArgDefinitions()
{
return new ArgumentCollection();
return new ArgumentCollection(Argument::createBooleanTypeArgument('with_prev_next_info', false));
}
/**
@@ -73,8 +69,6 @@ class NotSendLoop extends Order
*/
public function buildModelCriteria()
{
return ColissimoQuery::getOrders();
}
}
}

View File

@@ -17,7 +17,6 @@ use Thelia\Core\Template\Element\ArraySearchLoopInterface;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -48,10 +47,9 @@ class Price extends BaseLoop implements ArraySearchLoopInterface
public function buildArray()
{
$area = $this->getArea();
$prices = Colissimo::getPrices();
if(!isset($prices[$area]) || !isset($prices[$area]["slices"])) {
if (!isset($prices[$area]) || !isset($prices[$area]["slices"])) {
return array();
}
@@ -70,8 +68,6 @@ class Price extends BaseLoop implements ArraySearchLoopInterface
$loopResult->addRow($loopResultRow);
}
return $loopResult;
}
}