ClickAndCollect : quasiment terminé

This commit is contained in:
2021-03-12 20:09:57 +01:00
parent 57e69ddd2f
commit 27d98adf28
37 changed files with 771 additions and 226 deletions

View File

@@ -29,6 +29,6 @@ class ListController extends BaseAdminController
$place = PdrPlacesQuery::create()->findOneById(($id));
$place->setActive($place->getActive() ? 0 : 1)->save();
return $this->render("places-list");
return $this->render("cnc-places-list");
}
}

View File

@@ -1,10 +1,10 @@
<?php
namespace PointRetrait\Controller\backOffice;
namespace ClickAndCollect\Controller\backOffice;
use PointRetrait\Model\PdrPlaces;
use ClickAndCollect\ClickAndCollect;
use PointRetrait\Model\PdrPlacesQuery;
use PointRetrait\PointRetrait;
use PointRetrait\Model\PdrPlaces;
use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Propel;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -16,7 +16,7 @@ use Thelia\Tools\URL;
/**
* Class PlaceController
* @package PointRetrait\Controller
* @package ClickAndCollect\Controller
*/
class PlaceController extends BaseAdminController
{
@@ -25,7 +25,7 @@ class PlaceController extends BaseAdminController
{
$selectedPlace = PdrPlacesQuery::create()->findOneById($this->getRequest()->query->get("place_id"));
return $this->render("place-edit", array('module_code' => PointRetrait::getModuleCode(),
return $this->render("cnc-place-edit", array('module_code' => ClickAndCollect::getModuleCode(),
'place_id' => $selectedPlace));
}
@@ -33,14 +33,14 @@ class PlaceController extends BaseAdminController
public function editPlace()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::VIEW))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::VIEW))
return $response;
$con = Propel::getConnection();
$con->beginTransaction();
$error_msg = "";
$changeForm = $this->createForm("pdr.place.view.main", "form");
$changeForm = $this->createForm("cnc.place.view.main", "form");
try {
$form = $this->validateForm($changeForm, "POST");
@@ -48,7 +48,7 @@ class PlaceController extends BaseAdminController
$data = $form->getData();
$place = PdrPlacesQuery::create()->findOneById($data['place_id']);
if ($place === null) {
$error_msg = "Withdrawal place not found by Id";
$error_msg = "Click and Collect place not found by Id";
}
else {
$place->fromArray($data, TableMap::TYPE_FIELDNAME);
@@ -60,23 +60,23 @@ class PlaceController extends BaseAdminController
}
if ($this->getRequest()->get('save_mode') == 'stay')
return $this->render("place-edit");
return $this->render("cnc-place-edit");
return $this->render("places-list");
return $this->render("cnc-places-list");
}
public function createPlace()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::VIEW))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::VIEW))
return $response;
$con = Propel::getConnection();
$con->beginTransaction();
$error_msg = "";
$createForm = $this->createForm("pdr.place.create", "form");
$createForm = $this->createForm("cnc.place.create", "form");
try {
$form = $this->validateForm($createForm, "POST");
@@ -92,7 +92,7 @@ class PlaceController extends BaseAdminController
}
if ($this->getRequest()->request->get("success_url") == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl(PointRetrait::MODULE_URL));
return new RedirectResponse(URL::getInstance()->absoluteUrl(ClickAndCollect::MODULE_URL));
} else {
return new RedirectResponse(URL::getInstance()->absoluteUrl($this->getRequest()->request->get("success_url")));
}
@@ -102,7 +102,7 @@ class PlaceController extends BaseAdminController
public function deletePlace()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::VIEW))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::VIEW))
return $response;
$placeId = $this->getRequest()->get('attr-place-id');
@@ -118,7 +118,7 @@ class PlaceController extends BaseAdminController
}
if ($this->getRequest()->request->get("success_url") == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl(PointRetrait::MODULE_URL));
return new RedirectResponse(URL::getInstance()->absoluteUrl(ClickAndCollect::MODULE_URL));
} else {
return new RedirectResponse(URL::getInstance()->absoluteUrl($this->getRequest()->request->get("success_url")));
}

View File

@@ -1,14 +1,10 @@
<?php
namespace PointRetrait\Controller\backOffice;
namespace ClickAndCollect\Controller\backOffice;
use LivraisonParSecteurs\LivraisonParSecteurs;
use LivraisonParSecteurs\Model\LpsAreaSchedule;
use LivraisonParSecteurs\Model\LpsAreaScheduleQuery;
use PointRetrait\Model\PdrPlacesQuery;
use ClickAndCollect\ClickAndCollect;
use PointRetrait\Model\PdrSchedule;
use PointRetrait\Model\PdrScheduleQuery;
use PointRetrait\PointRetrait;
use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Propel;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -20,7 +16,7 @@ use Thelia\Tools\URL;
/**
* Class ScheduleController
* @package PointRetrait\Controller
* @package ClickAndCollect\Controller
*/
class ScheduleController extends BaseAdminController
{
@@ -31,13 +27,13 @@ class ScheduleController extends BaseAdminController
public function deleteSchedule()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::UPDATE))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::UPDATE))
return $response;
$placeScheduleId = $this->getRequest()->get('schedule_id');
$query = PdrScheduleQuery::create()->findById($placeScheduleId);
if ($query === null)
$error_msg = "Delivery area schedule not found by Id";
$error_msg = "Click and Collect schedule not found by Id";
else
{
$con = Propel::getConnection();
@@ -47,7 +43,7 @@ class ScheduleController extends BaseAdminController
}
if ($this->getRequest()->request->get("success_url") == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl(MODULE_URL));
return new RedirectResponse(URL::getInstance()->absoluteUrl(ClickAndCollect::MODULE_URL));
} else {
return new RedirectResponse(URL::getInstance()->absoluteUrl($this->getRequest()->request->get("success_url")));
}
@@ -60,14 +56,14 @@ class ScheduleController extends BaseAdminController
public function updateSchedule()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::UPDATE))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::UPDATE))
return $response;
$con = Propel::getConnection();
$con->beginTransaction();
$error_msg = "";
$changeForm = $this->createForm("pdr.place.update.schedule", "form");
$changeForm = $this->createForm("cnc.place.update.schedule", "form");
try {
$form = $this->validateForm($changeForm, "POST");
$data = $form->getData();
@@ -75,7 +71,7 @@ class ScheduleController extends BaseAdminController
$placeScheduleId = $this->getRequest()->get('schedule_id');
$query = PdrScheduleQuery::create()->findOneById($placeScheduleId);
if ($query === null)
$error_msg = "Withdrawal place schedule not found by Id";
$error_msg = "Click and Collect schedule not found by Id";
else
{
$query->fromArray($data, TableMap::TYPE_FIELDNAME);
@@ -98,7 +94,7 @@ class ScheduleController extends BaseAdminController
}
if ($data['success_url'] == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl(MODULE_URL));
return new RedirectResponse(URL::getInstance()->absoluteUrl(ClickAndCollect::MODULE_URL));
} else {
return $this->generateSuccessRedirect($changeForm);
}
@@ -111,14 +107,14 @@ class ScheduleController extends BaseAdminController
public function createSchedule()
{
// Check current user authorization
if (null !== $response = $this->checkAuth(AdminResources::MODULE, PointRetrait::getModuleCode(), AccessManager::UPDATE))
if (null !== $response = $this->checkAuth(AdminResources::MODULE, ClickAndCollect::getModuleCode(), AccessManager::UPDATE))
return $response;
$con = Propel::getConnection();
$con->beginTransaction();
$error_msg = "";
$changeForm = $this->createForm("pdr.place.create.schedule", "form");
$changeForm = $this->createForm("cnc.place.create.schedule", "form");
try {
$form = $this->validateForm($changeForm, "POST");
$data = $form->getData();
@@ -145,7 +141,7 @@ class ScheduleController extends BaseAdminController
}
if ($data['success_url'] == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl(MODULE_URL));
return new RedirectResponse(URL::getInstance()->absoluteUrl(ClickAndCollect::MODULE_URL));
} else {
return $this->generateSuccessRedirect($changeForm);
}