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

Refactored back-office customer management

Browse Source
This commit is contained in:
Franck Allimant
2013-11-09 18:28:01 +01:00
parent 85ea937570
commit ac74c1d61d
17 changed files with 748 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,9 +83,10 @@ class Customer extends BaseAction implements EventSubscriberInterface
public function delete(CustomerEvent $event)
{
$customer = $event->getCustomer();
if (null !== $customer = $event->getCustomer()) {
$customer->delete();
$customer->delete();
}
}
private function createOrUpdateCustomer(CustomerModel $customer, CustomerCreateOrUpdateEvent $event)

20
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -109,19 +109,17 @@
<!-- Customer rule management -->
<route id="admin.customers" path="/admin/customers">
<default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
<default key="_controller">Thelia\Controller\Admin\CustomerController::defaultAction</default>
</route>
<route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}" methods="get">
<default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
<requirement key="customer_id">\d+</requirement>
</route>
<route id="admin.customer.update.process" path="/admin/customer/update/{customer_id}" methods="post">
<route id="admin.customer.update.view" path="/admin/customer/update">
<default key="_controller">Thelia\Controller\Admin\CustomerController::updateAction</default>
<requirement key="customer_id">\d+</requirement>
</route>
<route id="admin.customer.update.process" path="/admin/customer/save">
<default key="_controller">Thelia\Controller\Admin\CustomerController::processUpdateAction</default>
</route>
<route id="admin.customer.delete" path="/admin/customer/delete">
<default key="_controller">Thelia\Controller\Admin\CustomerController::deleteAction</default>
</route>
@@ -146,14 +144,12 @@
<default key="_controller">Thelia\Controller\Admin\AddressController::createAction</default>
</route>
<route id="admin.address.update.view" path="/admin/address/update/{address_id}">
<route id="admin.address.update.view" path="/admin/address/update">
<default key="_controller">Thelia\Controller\Admin\AddressController::updateAction</default>
<requirement key="address_id">\d+</requirement>
</route>
<route id="admin.address.save" path="/admin/address/save/{address_id}">
<route id="admin.address.save" path="/admin/address/save">
<default key="_controller">Thelia\Controller\Admin\AddressController::processUpdateAction</default>
<requirement key="address_id">\d+</requirement>
</route>
<!-- end address management -->

55
core/lib/Thelia/Controller/Admin/AddressController.php
View File

@@ -42,7 +42,7 @@ class AddressController extends AbstractCrudController
public function __construct()
{
parent::__construct(
'address',
'registration_date',
null,
null,
@@ -50,10 +50,7 @@ class AddressController extends AbstractCrudController
TheliaEvents::ADDRESS_CREATE,
TheliaEvents::ADDRESS_UPDATE,
TheliaEvents::ADDRESS_DELETE,
null,
null
TheliaEvents::ADDRESS_DELETE
);
}
@@ -79,7 +76,7 @@ class AddressController extends AbstractCrudController
\Thelia\Log\Tlog::getInstance()->error(sprintf("error during address setting as default with message %s", $e->getMessage()));
}
$this->redirectToRoute('admin.customer.update.view', array(), array('customer_id' => $address->getCustomerId()));
$this->redirectToEditionTemplate();
}
/**
@@ -99,13 +96,14 @@ class AddressController extends AbstractCrudController
}
/**
* Hydrate the update form for this object, before passing it to the update template
* Fills in the form data array
*
* @param \Thelia\Model\Address $object
* @param unknown $object
* @return multitype:NULL
*/
protected function hydrateObjectForm($object)
protected function createFormDataArray($object)
{
$data = array(
return array(
"label" => $object->getLabel(),
"title" => $object->getTitleId(),
"firstname" => $object->getFirstname(),
@@ -120,8 +118,16 @@ class AddressController extends AbstractCrudController
"phone" => $object->getPhone(),
"company" => $object->getCompany()
);
}
return new AddressUpdateForm($this->getRequest(), "form", $data);
/**
* Hydrate the update form for this object, before passing it to the update template
*
* @param \Thelia\Model\Address $object
*/
protected function hydrateObjectForm($object)
{
return new AddressUpdateForm($this->getRequest(), "form", $this->createFormDataArray($object));
}
/**
@@ -240,7 +246,8 @@ class AddressController extends AbstractCrudController
*/
protected function renderListTemplate($currentOrder)
{
// TODO: Implement renderListTemplate() method.
// We render here the customer edit template.
return $this->renderEditionTemplate();
}
/**
@@ -248,9 +255,10 @@ class AddressController extends AbstractCrudController
*/
protected function renderEditionTemplate()
{
return $this->render('ajax/address-update-modal', array(
"address_id" => $this->getRequest()->get('address_id'),
"customer_id" => $this->getExistingObject()->getCustomerId()
return $this->render('customer-edit', array(
"address_id" => $this->getRequest()->get('address_id'),
"page" => $this->getRequest()->get('page'),
"customer_id" => $this->getCustomerId()
));
}
@@ -259,8 +267,11 @@ class AddressController extends AbstractCrudController
*/
protected function redirectToEditionTemplate()
{
$address = $this->getExistingObject();
$this->redirectToRoute('admin.customer.update.view', array(), array('customer_id' => $address->getCustomerId()));
// We display here the custromer edition template
$this->redirectToRoute('admin.customer.update.view', array(
"page" => $this->getRequest()->get('page'),
"customer_id" => $this->getCustomerId()
));
}
/**
@@ -279,8 +290,7 @@ class AddressController extends AbstractCrudController
*/
protected function performAdditionalDeleteAction($deleteEvent)
{
$address = $deleteEvent->getAddress();
$this->redirectToRoute('admin.customer.update.view', array(), array('customer_id' => $address->getCustomerId()));
$this->redirectToEditionTemplate();
}
/**
@@ -298,4 +308,11 @@ class AddressController extends AbstractCrudController
{
$this->redirectToEditionTemplate();
}
protected function getCustomerId() {
if (null !== $address = $this->getExistingObject())
return $address->getCustomerId();
else
return $this->getRequest()->get('customer_id', 0);
}
}

284
core/lib/Thelia/Controller/Admin/CustomerController.php
View File

@@ -35,171 +35,96 @@ use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\CustomerQuery;
use Thelia\Core\Translation\Translator;
use Thelia\Tools\Password;
use Thelia\Model\AddressQuery;
use Thelia\Model\Address;
/**
* Class CustomerController
* @package Thelia\Controller\Admin
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
class CustomerController extends BaseAdminController
class CustomerController extends AbstractCrudController
{
public function indexAction()
public function __construct()
{
if (null !== $response = $this->checkAuth(AdminResources::CUSTOMER, AccessManager::VIEW)) return $response;
return $this->render("customers", array("display_customer" => 20));
parent::__construct(
'customer',
'lastname',
'customer_order',
AdminResources::CUSTOMER,
TheliaEvents::CUSTOMER_CREATEACCOUNT,
TheliaEvents::CUSTOMER_UPDATEACCOUNT,
TheliaEvents::CUSTOMER_DELETEACCOUNT
);
}
public function viewAction($customer_id)
protected function getCreationForm()
{
if (null !== $response = $this->checkAuth(AdminResources::CUSTOMER, AccessManager::VIEW)) return $response;
return $this->render("customer-edit", array(
"customer_id" => $customer_id
));
return new CustomerCreateForm($this->getRequest());
}
/**
* update customer action
*
* @param $customer_id
* @return mixed|\Thelia\Core\HttpFoundation\Response
*/
public function updateAction($customer_id)
protected function getUpdateForm()
{
if (null !== $response = $this->checkAuth(AdminResources::CUSTOMER, AccessManager::UPDATE)) return $response;
$message = false;
$customerUpdateForm = new CustomerUpdateForm($this->getRequest());
try {
$customer = CustomerQuery::create()->findPk($customer_id);
if (null === $customer) {
throw new \InvalidArgumentException(sprintf("%d customer id does not exist", $customer_id));
}
$form = $this->validateForm($customerUpdateForm);
$event = $this->createEventInstance($form->getData());
$event->setCustomer($customer);
$this->dispatch(TheliaEvents::CUSTOMER_UPDATEACCOUNT, $event);
$customerUpdated = $event->getCustomer();
$this->adminLogAppend(AdminResources::CUSTOMER, AccessManager::UPDATE, sprintf("Customer with Ref %s (ID %d) modified", $customerUpdated->getRef() , $customerUpdated->getId()));
if ($this->getRequest()->get("save_mode") == "close") {
$this->redirectToRoute("admin.customers");
} else {
$this->redirectSuccess($customerUpdateForm);
}
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
} catch (PropelException $e) {
$message = $e->getMessage();
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage()." ".$e->getFile());
}
if ($message !== false) {
\Thelia\Log\Tlog::getInstance()->error(sprintf("Error during customer update process : %s.", $message));
$customerUpdateForm->setErrorMessage($message);
$this->getParserContext()
->addForm($customerUpdateForm)
->setGeneralError($message)
;
}
return $this->render("customer-edit", array(
"customer_id" => $customer_id
));
return new CustomerUpdateForm($this->getRequest());
}
public function createAction()
protected function getCreationEvent($formData)
{
if (null !== $response = $this->checkAuth(AdminResources::CUSTOMER, AccessManager::CREATE)) return $response;
$message = null;
$customerCreateForm = new CustomerCreateForm($this->getRequest());
try {
$form = $this->validateForm($customerCreateForm);
$data = $form->getData();
$data["password"] = Password::generateRandom();
$event = $this->createEventInstance($form->getData());
$this->dispatch(TheliaEvents::CUSTOMER_CREATEACCOUNT, $event);
$successUrl = $customerCreateForm->getSuccessUrl();
$successUrl = str_replace('_ID_', $event->getCustomer()->getId(), $successUrl);
$this->redirect($successUrl);
}catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
} catch (PropelException $e) {
$message = $e->getMessage();
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage()." ".$e->getFile());
}
if ($message !== false) {
\Thelia\Log\Tlog::getInstance()->error(sprintf("Error during customer creation process : %s.", $message));
$customerCreateForm->setErrorMessage($message);
$this->getParserContext()
->addForm($customerCreateForm)
->setGeneralError($message)
;
}
return $this->render("customers", array("display_customer" => 20));
return $this->createEventInstance($formData);
}
public function deleteAction()
protected function getUpdateEvent($formData)
{
if (null !== $response = $this->checkAuth(AdminResources::CUSTOMER, AccessManager::DELETE)) return $response;
$event = $this->createEventInstance($formData);
$message = null;
$event->setCustomer($this->getExistingObject());
try {
$customer_id = $this->getRequest()->get("customer_id");
$customer = CustomerQuery::create()->findPk($customer_id);
return $event;
}
if (null === $customer) {
throw new \InvalidArgumentException(Translator::getInstance("The customer you want to delete does not exist"));
}
protected function getDeleteEvent()
{
return new CustomerEvent($this->getExistingObject());
}
$event = new CustomerEvent($customer);
protected function eventContainsObject($event)
{
return $event->hasCustomer();
}
$this->dispatch(TheliaEvents::CUSTOMER_DELETEACCOUNT, $event);
} catch (\Exception $e) {
$message = $e->getMessage();
}
protected function hydrateObjectForm($object)
{
// Get default adress of the customer
$address = $object->getDefaultAddress();
$params = array(
"customer_page" => $this->getRequest()->get("customer_page", 1)
// Prepare the data that will hydrate the form
$data = array(
'id' => $object->getId(),
'firstname' => $object->getFirstname(),
'lastname' => $object->getLastname(),
'email' => $object->getEmail(),
'title' => $object->getTitleId(),
'company' => $address->getCompany(),
'address1' => $address->getAddress1(),
'address2' => $address->getAddress2(),
'address3' => $address->getAddress3(),
'phone' => $address->getPhone(),
'cellphone' => $address->getCellphone(),
'zipcode' => $address->getZipcode(),
'city' => $address->getCity(),
'country' => $address->getCountryId(),
);
if ($message) {
$params["delete_error_message"] = $message;
}
$this->redirectToRoute("admin.customers", $params);
// A loop is used in the template
return new CustomerUpdateForm($this->getRequest(), 'form', $data);
}
protected function getObjectFromEvent($event)
{
return $event->hasCustomer() ? $event->getCustomer() : null;
}
/**
@@ -209,26 +134,75 @@ class CustomerController extends BaseAdminController
private function createEventInstance($data)
{
$customerCreateEvent = new CustomerCreateOrUpdateEvent(
$data["title"],
$data["firstname"],
$data["lastname"],
$data["address1"],
$data["address2"],
$data["address3"],
$data["phone"],
$data["cellphone"],
$data["zipcode"],
$data["city"],
$data["country"],
isset($data["email"])?$data["email"]:null,
isset($data["password"]) ? $data["password"]:null,
$this->getRequest()->getSession()->getLang()->getId(),
isset($data["reseller"])?$data["reseller"]:null,
isset($data["sponsor"])?$data["sponsor"]:null,
isset($data["discount"])?$data["discount"]:null,
isset($data["company"])?$data["company"]:null
$data["title"],
$data["firstname"],
$data["lastname"],
$data["address1"],
$data["address2"],
$data["address3"],
$data["phone"],
$data["cellphone"],
$data["zipcode"],
$data["city"],
$data["country"],
isset($data["email"])?$data["email"]:null,
isset($data["password"]) && ! empty($data["password"]) ? $data["password"]:null,
$this->getRequest()->getSession()->getLang()->getId(),
isset($data["reseller"])?$data["reseller"]:null,
isset($data["sponsor"])?$data["sponsor"]:null,
isset($data["discount"])?$data["discount"]:null,
isset($data["company"])?$data["company"]:null
);
return $customerCreateEvent;
}
}
protected function getExistingObject()
{
return CustomerQuery::create()->findPk($this->getRequest()->get('customer_id', 0));
}
protected function getObjectLabel($object)
{
return $object->getRef() . "(".$object->getLastname()." ".$object->getFirstname().")";
}
protected function getObjectId($object)
{
return $object->getId();
}
protected function getEditionArguments()
{
return array(
'customer_id' => $this->getRequest()->get('customer_id', 0),
'page' => $this->getRequest()->get('page', 1)
);
}
protected function renderListTemplate($currentOrder)
{
return $this->render('customers', array(
'customer_order' => $currentOrder,
'display_customer' => 20,
'page' => $this->getRequest()->get('page', 1)
));
}
protected function redirectToListTemplate()
{
$this->redirectToRoute('admin.customers', array(
'page' => $this->getRequest()->get('page', 1))
);
}
protected function renderEditionTemplate()
{
return $this->render('customer-edit', $this->getEditionArguments());
}
protected function redirectToEditionTemplate()
{
$this->redirectToRoute("admin.customer.update.view", $this->getEditionArguments());
}
}

19
core/lib/Thelia/Controller/NullControllerInterface.php
View File

@@ -1,19 +0,0 @@
<?php
namespace Thelia\Controller;
use Symfony\Component\HttpFoundation\Request;
/**
*
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
interface NullControllerInterface
{
/**
* Nothing to do
*/
public function noAction(Request $request);
}

24
core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php
View File

@@ -31,7 +31,7 @@ use Thelia\Model\Customer;
* @package Thelia\Core\Event
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
class CustomerCreateOrUpdateEvent extends ActionEvent
class CustomerCreateOrUpdateEvent extends CustomerEvent
{
//base parameters for creating new customer
protected $title;
@@ -53,11 +53,6 @@ class CustomerCreateOrUpdateEvent extends ActionEvent
protected $discount;
protected $company;
/**
* @var \Thelia\Model\Customer
*/
protected $customer;
/**
* @param int $title the title customer id
* @param string $firstname
@@ -242,21 +237,4 @@ class CustomerCreateOrUpdateEvent extends ActionEvent
{
return $this->sponsor;
}
/**
* @param Customer $customer
*/
public function setCustomer(Customer $customer)
{
$this->customer = $customer;
}
/**
* @return Customer
*/
public function getCustomer()
{
return $this->customer;
}
}

22
core/lib/Thelia/Core/Event/Customer/CustomerEvent.php
View File

@@ -28,13 +28,23 @@ use Thelia\Core\Event\ActionEvent;
class CustomerEvent extends ActionEvent
{
public $customer;
public $customer = null;
public function __construct(Customer $customer)
public function __construct(Customer $customer = null)
{
$this->customer = $customer;
}
/**
* @param Customer $customer
*/
public function setCustomer(Customer $customer)
{
$this->customer = $customer;
return $this;
}
/**
* @return \Thelia\Model\Customer
*/
@@ -43,4 +53,12 @@ class CustomerEvent extends ActionEvent
return $this->customer;
}
/**
* @return bool
*/
public function hasCustomer()
{
return $this->customer != null;
}
}

14
core/lib/Thelia/Core/Event/Customer/CustomerLoginEvent.php
View File

@@ -26,17 +26,7 @@ namespace Thelia\Core\Event\Customer;
use Thelia\Core\Event\ActionEvent;
use Thelia\Model\Customer;
class CustomerLoginEvent extends ActionEvent
class CustomerLoginEvent extends CustomerEvent
{
protected $customer;
public function __construct(Customer $customer)
{
$this->customer = $customer;
}
public function getCustomer()
{
return $this->customer;
}
// Nothing specific :)
}

120
core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
View File

@@ -22,7 +22,6 @@
/*************************************************************************************/
namespace Thelia\Core\Template\Assets;
use Assetic\AssetManager;
use Assetic\FilterManager;
use Assetic\Filter;
@@ -59,7 +58,7 @@ class AsseticHelper
$am = new AssetManager();
$fm = new FilterManager();
if (! empty($filters)) {
if (!empty($filters)) {
$filter_list = explode(',', $filters);
foreach ($filter_list as $filter_name) {
@@ -67,36 +66,37 @@ class AsseticHelper
$filter_name = trim($filter_name);
switch ($filter_name) {
case 'less' :
$fm->set('less', new Filter\LessphpFilter());
break;
case 'less':
$fm->set('less', new Filter\LessphpFilter());
break;
case 'sass' :
$fm->set('sass', new Filter\Sass\SassFilter());
break;
case 'sass':
$fm->set('sass', new Filter\Sass\SassFilter());
break;
case 'cssembed' :
$fm->set('cssembed', new Filter\PhpCssEmbedFilter());
break;
case 'cssembed':
$fm->set('cssembed', new Filter\PhpCssEmbedFilter());
break;
case 'cssrewrite':
$fm->set('cssrewrite', new Filter\CssRewriteFilter());
break;
case 'cssrewrite':
$fm->set('cssrewrite', new Filter\CssRewriteFilter());
break;
case 'cssimport':
$fm->set('cssimport', new Filter\CssImportFilter());
break;
case 'cssimport':
$fm->set('cssimport', new Filter\CssImportFilter());
break;
case 'compass':
$fm->set('compass', new Filter\CompassFilter());
break;
case 'compass':
$fm->set('compass', new Filter\CompassFilter());
break;
default :
throw new \InvalidArgumentException("Unsupported Assetic filter: '$filter_name'");
break;
default:
throw new \InvalidArgumentException("Unsupported Assetic filter: '$filter_name'");
break;
}
}
} else {
}
else {
$filter_list = array();
}
@@ -106,7 +106,7 @@ class AsseticHelper
$factory->setAssetManager($am);
$factory->setFilterManager($fm);
$factory->setDefaultOutput('*'.(! empty($asset_type) ? '.' : '').$asset_type);
$factory->setDefaultOutput('*' . (!empty($asset_type) ? '.' : '') . $asset_type);
$factory->setDebug($debug);
@@ -129,7 +129,7 @@ class AsseticHelper
//
// before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files.
//
if ($dev_mode == true || ! file_exists($target_file)) {
if ($dev_mode == true || !file_exists($target_file)) {
if (ConfigQuery::read('process_assets', true)) {
@@ -144,7 +144,8 @@ class AsseticHelper
foreach ($filter_list as $filter) {
if ('?' != $filter[0]) {
$asset->ensureFilter($fm->get($filter));
} elseif (!$debug) {
}
elseif (!$debug) {
$asset->ensureFilter($fm->get(substr($filter, 1)));
}
}
@@ -155,6 +156,67 @@ class AsseticHelper
}
}
return rtrim($output_url, '/').'/'.$asset_target_path;
return rtrim($output_url, '/') . '/' . $asset_target_path;
}
}
// Create a hash of the current assets directory
public function getStamp($directory)
{
$stamp = '';
foreach (new \DirectoryIterator($directory) as $fileInfo) {
if ($fileInfo->isDot()) continue;
if ($fileInfo->isDir()) {
$stamp .= $this->getStamp($fileInfo->getPathName());
}
if ($fileInfo->isFile()) {
$stamp .= $fileInfo->getMTime();
}
}
return $stamp;
}
public function copyAssets($from_directory, $to_directory)
{
echo "copy $from_directory to $to_directory\n";
$iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($from_directory, \RecursiveDirectoryIterator::SKIP_DOTS),
\RecursiveIteratorIterator::SELF_FIRST);
foreach ($iterator as $item) {
if ($item->isDir()) {
$dest_dir = $to_directory . DIRECTORY_SEPARATOR . $iterator->getSubPathName();
if (!is_dir($dest_dir)) {
if (file_exists($dest_dir)) {
@unlink($dest_dir);
}
if (!mkdir($dest_dir, 0777, true)) {
throw new \RuntimeException(
"Failed to create directory $dest_dir. Please check that your web server has the proper access rights");
}
}
}
else {
$dest_file = $to_directory . DIRECTORY_SEPARATOR . $iterator->getSubPathName();
if (file_exists($dest_file)) {
@unlink($dest_file);
}
if (!copy($item, $dest_file)) {
throw new \RuntimeException(
"Failed to copy $source_file to $dest_file. Please check that your web server has the proper access rights");
}
}
}
}
}

89
core/lib/Thelia/Core/Template/Loop/Customer.php
View File

@@ -36,6 +36,9 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\CustomerQuery;
use Thelia\Type\TypeCollection;
use Thelia\Type;
use Thelia\Model\OrderQuery;
use Thelia\Model\Map\OrderAddressTableMap;
use Thelia\Model\Map\OrderTableMap;
/**
*
@@ -65,7 +68,22 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
)
),
Argument::createBooleanTypeArgument('reseller'),
Argument::createIntTypeArgument('sponsor')
Argument::createIntTypeArgument('sponsor'),
new Argument(
'order',
new TypeCollection(
new Type\EnumListType(array(
'id', 'id_reverse',
'reference', 'reference_reverse',
'firstname', 'firstname_reverse',
'lastname', 'lastname_reverse',
'last_order', 'last_order_reverse',
'order_amount', 'order_amount_reverse',
'registration_date', 'registration_date_reverse'
))
),
'lastname'
)
);
}
@@ -151,6 +169,49 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
$search->filterBySponsor($sponsor, Criteria::EQUAL);
}
$orders = $this->getOrder();
foreach ($orders as $order) {
switch ($order) {
case 'id':
$search->orderById(Criteria::ASC);
break;
case 'id_reverse':
$search->orderById(Criteria::DESC);
break;
case 'reference':
$search->orderByRef(Criteria::ASC);
break;
case 'reference_reverse':
$search->orderByRef(Criteria::DESC);
break;
case 'lastname':
$search->orderByLastname(Criteria::ASC);
break;
case 'lastname_reverse':
$search->orderByLastname(Criteria::DESC);
break;
case 'firstname':
$search->orderByFirstname(Criteria::ASC);
break;
case 'firstname_reverse':
$search->orderByFirstname(Criteria::DESC);
break;
case 'registration_date':
$search->orderByCreatedAt(Criteria::ASC);
break;
case 'registration_date_reverse':
$search->orderByCreatedAt(Criteria::DESC);
break;
}
}
return $search;
}
@@ -158,16 +219,24 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
public function parseResults(LoopResult $loopResult)
{
foreach ($loopResult->getResultDataCollection() as $customer) {
$loopResultRow = new LoopResultRow($customer);
$loopResultRow->set("ID", $customer->getId());
$loopResultRow->set("REF", $customer->getRef());
$loopResultRow->set("TITLE", $customer->getTitleId());
$loopResultRow->set("FIRSTNAME", $customer->getFirstname());
$loopResultRow->set("LASTNAME", $customer->getLastname());
$loopResultRow->set("EMAIL", $customer->getEmail());
$loopResultRow->set("RESELLER", $customer->getReseller());
$loopResultRow->set("SPONSOR", $customer->getSponsor());
$loopResultRow->set("DISCOUNT", $customer->getDiscount());
$loopResultRow
->set("ID" , $customer->getId())
->set("REF" , $customer->getRef())
->set("TITLE" , $customer->getTitleId())
->set("FIRSTNAME" , $customer->getFirstname())
->set("LASTNAME" , $customer->getLastname())
->set("EMAIL" , $customer->getEmail())
->set("RESELLER" , $customer->getReseller())
->set("SPONSOR" , $customer->getSponsor())
->set("DISCOUNT" , $customer->getDiscount())
->set("LAST_ORDER_DATE" , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
->set("LAST_ORDER_AMOUNT" , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
->set("LAST_ORDER_CURRENCY" , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
;
$loopResult->addRow($loopResultRow);
}

17
core/lib/Thelia/Form/CustomerUpdateForm.php
View File

@@ -82,6 +82,21 @@ class CustomerUpdateForm extends BaseForm
"for" => "lastname"
)
))
->add("email", "email", array(
"constraints" => array(
new Constraints\NotBlank()
),
"label" => Translator::getInstance()->trans("Email address"),
"label_attr" => array(
"for" => "email"
)
))
->add("password", "text", array(
"label" => Translator::getInstance()->trans("Password"),
"label_attr" => array(
"for" => "email"
)
))
->add("address1", "text", array(
"constraints" => array(
new Constraints\NotBlank()
@@ -89,7 +104,7 @@ class CustomerUpdateForm extends BaseForm
"label_attr" => array(
"for" => "address"
),
"label" => Translator::getInstance()->trans("Street Address")
"label" => Translator::getInstance()->trans("Street Address ")
))
->add("address2", "text", array(
"label" => Translator::getInstance()->trans("Address Line 2"),