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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
mespeche
2013-09-16 12:56:47 +02:00
parent 5e8749e054 dd2ba89a4c
commit 4929e6f88a
46 changed files with 1423 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/lib/Thelia/Form/CartAdd.php
View File

@@ -29,6 +29,7 @@ use Thelia\Form\Exception\ProductNotFoundException;
use Thelia\Model\ProductSaleElementsQuery;
use Thelia\Model\ConfigQuery;
use Thelia\Model\ProductQuery;
use Thelia\Core\Translation\Translator;
/**
* Class CartAdd
@@ -75,13 +76,15 @@ class CartAdd extends BaseForm
))
->add("product_sale_elements_id", "text", array(
"constraints" => array(
new Constraints\NotBlank(),
new Constraints\Callback(array("methods" => array(
array($this, "checkStockAvailability")
)))
)
),
"required" => true
))
->add("quantity", "text", array(
->add("quantity", "number", array(
"constraints" => array(
new Constraints\NotBlank(),
new Constraints\Callback(array("methods" => array(
@@ -90,6 +93,10 @@ class CartAdd extends BaseForm
new Constraints\GreaterThanOrEqual(array(
"value" => 0
))
),
"label" => Translator::getInstance()->trans("Quantity"),
"label_attr" => array(
"for" => "quantity"
)
))
->add("append", "hidden")
@@ -126,13 +133,17 @@ class CartAdd extends BaseForm
{
$data = $context->getRoot()->getData();
$productSaleElements = ProductSaleElementsQuery::create()
->filterById($data["product_sale_elements_id"])
->filterByProductId($data["product"])
->findOne();
if (null === $data["product_sale_elements_id"]) {
$context->addViolationAt("quantity", Translator::getInstance()->trans("Invalid product_sale_elements"));
} else {
$productSaleElements = ProductSaleElementsQuery::create()
->filterById($data["product_sale_elements_id"])
->filterByProductId($data["product"])
->findOne();
if ($productSaleElements->getQuantity() < $value && ConfigQuery::read("verifyStock", 1) == 1) {
$context->addViolation("quantity value is not valid");
if ($productSaleElements->getQuantity() < $value && ConfigQuery::read("verifyStock", 1) == 1) {
$context->addViolation("quantity value is not valid");
}
}
}