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

change compatibility for propel2

Browse Source
This commit is contained in:
Manuel Raynaud
2013-07-05 15:59:41 +02:00
parent 02c9184e53
commit 85bb7594ee
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Action/Customer.php
View File

@@ -55,7 +55,6 @@ class Customer implements EventSubscriberInterface
$data = $form->getData(); $data = $form->getData();
$customer = new CustomerModel(); $customer = new CustomerModel();
try { try {
\Thelia\Log\Tlog::getInstance()->debug($data);
$customer->createOrUpdate( $customer->createOrUpdate(
$data["title"], $data["title"],
$data["firstname"], $data["firstname"],

3
core/lib/Thelia/Form/CustomerCreation.php
View File

@@ -156,7 +156,8 @@ class CustomerCreation extends BaseForm
public function verifyExistingEmail($value, ExecutionContextInterface $context) public function verifyExistingEmail($value, ExecutionContextInterface $context)
{ {
if (CustomerQuery::create()->filterByEmail($value)->exists()) { $customer = CustomerQuery::create()->findOneByEmail($value);
if ($customer) {
$context->addViolation("This email already exists"); $context->addViolation("This email already exists");
} }
} }

3
core/lib/Thelia/Model/Customer.php
View File

@@ -8,6 +8,7 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Thelia\Core\Event\CustomRefEvent; use Thelia\Core\Event\CustomRefEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Propel\Runtime\Connection\ConnectionInterface;
class Customer extends BaseCustomer { class Customer extends BaseCustomer {
/** /**
@@ -61,7 +62,7 @@ class Customer extends BaseCustomer {
} }
public function preInsert(\PropelPDO $con = null) public function preInsert(ConnectionInterface $con = null)
{ {
$customerRef = new CustomRefEvent($this); $customerRef = new CustomRefEvent($this);
if (!is_null($this->dispatcher)) { if (!is_null($this->dispatcher)) {