TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using now BaseAction methods in Cartp.php

Browse Source
This commit is contained in:
franck
2013-08-08 11:43:27 +02:00
parent 2bb98352be
commit 81a5664653
2 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Action/BaseAction.php
View File

@@ -31,7 +31,7 @@ use Thelia\Core\Event\ActionEvent;
abstract class BaseAction
{
protected function validateForm(BaseForm $aBaseForm, $expectedMethod = 'POST')
protected function validateForm(BaseForm $aBaseForm, $expectedMethod = null)
{
$form = $aBaseForm->getForm();

69
core/lib/Thelia/Action/Cart.php
View File

@@ -72,55 +72,50 @@ class Cart extends BaseAction implements EventSubscriberInterface
*/
public function addArticle(ActionEvent $event)
{
$request = $event->getRequest();
$request = $event->getRequest();
$cartAdd = $this->getAddCartForm($request);
$form = $cartAdd->getForm();
try {
$cartAdd = $this->getAddCartForm($request);
$form->bind($request);
$form = $this->validateForm($cartAdd);
if($form->isValid()) {
try {
$cart = $this->getCart($request);
$newness = $form->get("newness")->getData();
$append = $form->get("append")->getData();
$quantity = $form->get("quantity")->getData();
$cart = $this->getCart($request);
$newness = $form->get("newness")->getData();
$append = $form->get("append")->getData();
$quantity = $form->get("quantity")->getData();
$productSaleElementsId = $form->get("product_sale_elements_id")->getData();
$productId = $form->get("product")->getData();
$productSaleElementsId = $form->get("product_sale_elements_id")->getData();
$productId = $form->get("product")->getData();
$cartItem = $this->findItem($cart->getId(), $productId, $productSaleElementsId);
$cartItem = $this->findItem($cart->getId(), $productId, $productSaleElementsId);
if($cartItem === null || $newness)
{
$productPrice = ProductPriceQuery::create()
->filterByProductSaleElementsId($productSaleElementsId)
->findOne()
;
if($cartItem === null || $newness)
{
$productPrice = ProductPriceQuery::create()
->filterByProductSaleElementsId($productSaleElementsId)
->findOne()
;
$this->addItem($cart, $productId, $productSaleElementsId, $quantity, $productPrice);
}
if($append && $cartItem !== null) {
$this->updateQuantity($cartItem, $quantity);
}
$this->redirect($cartAdd->getSuccessUrl($request->getUriAddingParameters(array("addCart" => 1))));
} catch (PropelException $e) {
\Thelia\Log\Tlog::getInstance()->error(sptinf("error on adding item to cart with message : %s", $e->getMessage()));
$message = "Impossible to add this article to your cart, please try again";
$this->addItem($cart, $productId, $productSaleElementsId, $quantity, $productPrice);
}
} else {
if($append && $cartItem !== null) {
$this->updateQuantity($cartItem, $quantity);
}
$message = "Missing or invalid data";
$this->redirect($cartAdd->getSuccessUrl($request->getUriAddingParameters(array("addCart" => 1))));
} catch (PropelException $e) {
\Thelia\Log\Tlog::getInstance()->error(sprintf("Failed to add item to cart with message : %s", $e->getMessage()));
$message = "Failed to add this article to your cart, please try again";
}
catch(FormValidationException $e) {
$message = $e->getMessage();
}
$cartAdd->setError(true);
$cartAdd->setErrorMessage($message);
$event->setErrorForm($cartAdd);
// The form has errors, propagate it.
$this->propagateFormError($cartAdd, $message, $event);
}
protected function updateQuantity(CartItem $cartItem, $quantity)