diff --git a/.gitignore b/.gitignore
index 8de5039ed..2af71adba 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,6 @@ web/cache/*
web/.htaccess
phpdoc*.log
php-cs
-xhprof
+xhprof/
phpunit.phar
.DS_Store
\ No newline at end of file
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 09c95d2ff..8eaeb2547 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -37,6 +37,11 @@
Thelia\Controller\Admin\CustomerController::indexAction
+
+ Thelia\Controller\Admin\CustomerController::viewAction
+ \d+
+
+
diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 21fffd3d9..30d6dd9df 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Router;
use Thelia\Controller\BaseController;
use Symfony\Component\HttpFoundation\Response;
use Thelia\Core\Security\Exception\AuthorizationException;
@@ -226,7 +227,7 @@ class BaseAdminController extends BaseController
*
* @see \Thelia\Controller\BaseController::getRouteFromRouter()
*/
- protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+ protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
{
return $this->getRouteFromRouter(
'router.admin',
diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index c53c2b3d3..ddf4681b9 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerController.php
@@ -35,4 +35,12 @@ class CustomerController extends BaseAdminController
if (null !== $response = $this->checkAuth("admin.customers.view")) return $response;
return $this->render("customers", array("display_customer" => 20));
}
-}
+
+ public function viewAction($customer_id)
+ {
+
+ return $this->render("customer-edit", array(
+ "customer_id" => $customer_id
+ ));
+ }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 36a03529b..c55dd1258 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -235,7 +235,7 @@ class BaseController extends ContainerAware
* @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL
*/
- protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+ protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
{
/** @var Router $router */
$router = $this->container->get($routerName);
diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 958f781b5..e6f77c0de 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -1,7 +1,7 @@
. */
+/* along with this program. If not, see
-
+
- {module_include location='customer_top'}
+ {module_include location='customer_top'}
-
-
-
-
-
- {intl l="Customers list"}
+
+
+
+
+
+ {intl l="Customers list"}
- {module_include location='customer_list_caption'}
+ {module_include location='customer_list_caption'}
- {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
-
-
- {/loop}
-
+ {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
+
+
+ {/loop}
+
- {ifloop rel="customer_list"}
-
-
-
- {intl l="customer ref"}
-
+ {ifloop rel="customer_list"}
+
+
+
+ {intl l="customer ref"}
+
-
- {intl l="company"}
-
+
+ {intl l="company"}
+
- {module_include location='category_list_header'}
+ {module_include location='category_list_header'}
-
- {intl l="firstname & lastname"}
-
+
+ {intl l="firstname & lastname"}
+
-
- {intl l="last order"}
-
+
+ {intl l="last order"}
+
- {intl l='order amount'}
+ {intl l='order amount'}
- {intl l='Actions'}
-
-
+ {intl l='Actions'}
+
+
-
- {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
-
- {$REF}
+
+ {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+
+ {$REF}
-
- {$COMPANY}
-
+
+ {$COMPANY}
+
-
- {$FIRSTNAME} {$LASTNAME}
-
+
+ {$FIRSTNAME} {$LASTNAME}
+
- {module_include location='customer_list_row'}
+ {module_include location='customer_list_row'}
-
- {format_date date=$LASTORDER_DATE}
-
+
+ {format_date date=$LASTORDER_DATE}
+
-
- {format_number number=$LASTORDER_AMOUNT}
-
-
-
+
+ {format_number number=$LASTORDER_AMOUNT}
+
+
+
- {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
-
- {/loop}
- {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-
- {/loop}
- {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-
- {/loop}
-
+ {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+
+ {/loop}
+ {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+
+ {/loop}
+ {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+
+ {/loop}
+
-
- {/loop}
-
- {/ifloop}
-
+
+ {/loop}
+
+ {/ifloop}
+
+
+
-
-
{module_include location='customer_bottom'}
@@ -118,7 +118,8 @@
{pageloop rel="customer_list"}
{if $PAGE != $CURRENT}
-
{$PAGE}
+
{$PAGE}
+
{else}
{$PAGE}
{/if}
@@ -130,10 +131,136 @@
{/if}
{/pageloop}
+
+ {intl l="{$label}"} :
+
+
+ {loop type="title" name="title1"}
+ {$LONG}
+ {/loop}
+
+
+ {/form_field}
+
+ {form_field form=$form field='firstname'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='lastname'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='address1'}
+
+ {intl l="{$label}"} :
+
+
+
+ {form_field form=$form field='address2'}
+
+
+
+ {form_field form=$form field='address3'}
+
+ {/form_field}
+
+ {form_field form=$form field='zipcode'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='city'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='country'}
+
+ {intl l="{$label}"} :
+
+ {loop type="country" name="country1"}
+ {$TITLE}
+ {/loop}
+
+
+ {/form_field}
+
+ {form_field form=$form field='email'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {/capture}
+
+ {include
+ file = "includes/generic-create-dialog.html"
+
+ dialog_id = "add_customer_dialog"
+ dialog_title = {intl l="Create a new customer"}
+ dialog_body = {$smarty.capture.customer_creation_dialog nofilter}
+
+ dialog_ok_label = {intl l="Create this customer"}
+ dialog_cancel_label = {intl l="Cancel"}
+
+ form_action = {url path='/admin/customer/create'}
+ form_enctype = {form_enctype form=$form}
+ form_error_message = $form_error_message
+ }
+ {/form}
+
+ {* Delete confirmation dialog *}
+
+ {capture "delete_customer_dialog"}
+
{intl l="Create New Account"}
- {form name=""}
-