Merge branch 'master' into tax

.gitignore

@@ -22,6 +22,6 @@ web/cache/*
 web/.htaccess
 phpdoc*.log
 php-cs
-xhprof
+xhprof/
 phpunit.phar
 .DS_Store

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -37,6 +37,11 @@
         <default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
     </route>
 
+    <route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}">
+        <default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
+        <requirement key="customer_id">\d+</requirement>
+    </route>
+
     <!-- end Customer rule management -->
 
     <!-- Categories management -->

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',

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
+    	));
+    }
 }

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);

core/lib/Thelia/Form/CustomerCreation.php

@@ -1,7 +1,7 @@
 <?php
 /*************************************************************************************/
 /*                                                                                   */
-/*      Thelia	                                                                     */
+/*      Thelia                                                                       */
 /*                                                                                   */
 /*      Copyright (c) OpenStudio                                                     */
 /*      email : info@thelia.net                                                      */
@@ -17,7 +17,7 @@
 /*      GNU General Public License for more details.                                 */
 /*                                                                                   */
 /*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*      along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
 namespace Thelia\Form;

templates/admin/default/assets/less/thelia/scaffolding.less

@@ -7,7 +7,8 @@
 // -------------------------
 
 body {
-  background: url("@{imgDir}/bg.jpg") repeat;
+  background: #FFF url("@{imgDir}/bg.jpg") top left no-repeat;
+  background-size: cover;
 }
 
 

templates/admin/default/customers.html

@@ -10,99 +10,99 @@
 
 
     <div class="catalog">
-    <div id="wrapper" class="container">
+        <div id="wrapper" class="container">
 
 
-    {module_include location='customer_top'}
+            {module_include location='customer_top'}
 
-    <div class="row">
+            <div class="row">
-        <div class="col-md-12">
+                <div class="col-md-12">
-            <div class="general-block-decorator">
+                    <div class="general-block-decorator">
-                <table class="table table-striped table-condensed" id="customer_list">
+                        <table class="table table-striped table-condensed" id="customer_list">
-                    <caption>
+                            <caption>
-                        {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 type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
-                            <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
-                                <span class="glyphicon glyphicon-plus-sign"></span>
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
-                            </a>
+                                    </a>
-                        {/loop}
+                                {/loop}
-                    </caption>
+                            </caption>
 
-                    {ifloop rel="customer_list"}
+                            {ifloop rel="customer_list"}
-                        <thead>
+                                <thead>
-                        <tr>
+                                <tr>
-                            <th class="object-title">
+                                    <th class="object-title">
-                                {intl l="customer ref"}
+                                        {intl l="customer ref"}
-                            </th>
+                                    </th>
 
-                            <th class="object-title">
+                                    <th class="object-title">
-                                {intl l="company"}
+                                        {intl l="company"}
-                            </th>
+                                    </th>
 
-                            {module_include location='category_list_header'}
+                                    {module_include location='category_list_header'}
 
-                            <th>
+                                    <th>
-                                {intl l="firstname & lastname"}
+                                        {intl l="firstname & lastname"}
-                            </th>
+                                    </th>
 
-                            <th>
+                                    <th>
-                                {intl l="last order"}
+                                        {intl l="last order"}
-                            </th>
+                                    </th>
 
-                            <th>{intl l='order amount'}</th>
+                                    <th>{intl l='order amount'}</th>
 
-                            <th>{intl l='Actions'}</th>
+                                    <th>{intl l='Actions'}</th>
-                        </tr>
+                                </tr>
-                        </thead>
+                                </thead>
 
-                        <tbody>
+                                <tbody>
-                        {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+                                {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
-                            <tr>
+                                    <tr>
-                                <td>{$REF}</td>
+                                        <td>{$REF}</td>
 
-                                <td>
+                                        <td>
-                                    {$COMPANY}
+                                            {$COMPANY}
-                                </td>
+                                        </td>
 
-                                <td class="object-title">
+                                        <td class="object-title">
-                                    {$FIRSTNAME} {$LASTNAME}
+                                            {$FIRSTNAME} {$LASTNAME}
-                                </td>
+                                        </td>
 
-                                {module_include location='customer_list_row'}
+                                        {module_include location='customer_list_row'}
 
-                                <td>
+                                        <td>
-                                    {format_date date=$LASTORDER_DATE}
+                                            {format_date date=$LASTORDER_DATE}
-                                </td>
+                                        </td>
 
-                                <td>
+                                        <td>
-                                    {format_number number=$LASTORDER_AMOUNT}
+                                            {format_number number=$LASTORDER_AMOUNT}
-                                </td>
+                                        </td>
-                                <td>
+                                        <td>
-                                    <div class="btn-group">
+                                            <div class="btn-group">
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
-                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
+                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
-                                        {/loop}
+                                                {/loop}
-                                        {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+                                                {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                                    <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
-                                        {/loop}
+                                                {/loop}
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-                                            <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
+                                                {/loop}
-                                    </div>
+                                            </div>
-                                </td>
+                                        </td>
 
-                            </tr>
+                                    </tr>
-                        {/loop}
+                                {/loop}
-                        </tbody>
+                                </tbody>
-                    {/ifloop}
+                            {/ifloop}
-                </table>
+                        </table>
+                    </div>
+                </div>
             </div>
-        </div>
-    </div>
 
 
     {module_include location='customer_bottom'}
@@ -118,7 +118,8 @@
 
             {pageloop rel="customer_list"}
                 {if $PAGE != $CURRENT}
-                    <li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
+                    <li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
+
                 {else}
                     <li class="active"><a href="#">{$PAGE}</a></li>
                 {/if}
@@ -130,10 +131,136 @@
                 {/if}
             {/pageloop}
             </ul>
+
         </div>
     </div>
 
-    </div>
+    {* Adding a new Category *}
-    </div>
+
+
+    {form name="thelia.customer.creation"}
+
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "customer_creation_dialog"}
+
+            {form_hidden_fields form=$form}
+
+            {form_field form=$form field='success_url'}
+               {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+               <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
+            {/form_field}
+            
+
+            {form_field form=$form field='title'}                
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='email'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Email address'}">
+                </div>
+            {/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"}
+        <input type="hidden" name="customer_id" id="customer_delete_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_customer_dialog"
+        dialog_title    = {intl l="Delete customer"}
+        dialog_message  = {intl l="Do you really want to delete this customer ?"}
+
+        form_action         = {url path='/admin/customer/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
 
 {/block}

templates/admin/default/product-attributes-edit.html

@@ -1 +0,0 @@
-test

templates/default/register.html

@@ -17,8 +17,8 @@
         <article class="col-main" role="main" aria-labelledby="main-label">
 
             <h1 id="main-label" class="page-header">{intl l="Create New Account"}</h1>
-            {form name=""}
+            {form name="thelia.customer.creation"}
-            <form id="form-register" class="form-horizontal" action="" method="post" role="form">
+            <form id="form-register" class="form-horizontal" action="{url path="/customer/create"}" method="post" role="form">
 
                 <fieldset id="register-info" class="panel panel">
                     <div class="panel-heading">
@@ -26,48 +26,78 @@
                     </div>
 
                     <div class="panel-body">
-                        <div class="form-group group-firstname has-success">
+                        {form_field form=$form field="firstname"}
-                            <label class="control-label" for="firstname">First Name: <span class="required">*</span></label>
+                        <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="text" name="firstname" id="firstname" class="form-control" placeholder="John" autofocus required>
+                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
-                                <span class="help-block"><span class="icon-ok"></span> Available input!</span>
+                                {if $error }
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                {elseif $value != "" && !$error}
+                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                {/if}
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="lastname"}
+                            <div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="email"}
+                        <div class="form-group group-email {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
 
-                        <div class="form-group group-lastname has-error">
-                            <label class="control-label " for="lastname">Last Name: <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="text" name="lastname" id="lastname" class="form-control" placeholder="Doe" required>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="{$smarty.get.email|default:$value}">
-                                <span class="help-block"><span class="icon-remove"></span> Invalid input!</span>
+                                {if $error }
-                            </div>
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                        </div><!--/.form-group-->
+                                {elseif $value != "" && !$error}
-
+                                    <span class="help-block"><i class="icon-ok"></i></span>
-                        <div class="form-group group-email">
+                                {/if}
-                            <label class="control-label" for="email">Email Address: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="email" name="email" id="email" class="form-control" placeholder="johndoe@domain.com" required>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-phone">
-                            <label class="control-label" for="phone">Telephone: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="tel" name="phone" id="phone" class="form-control" placeholder="(01) 02 03 04 05 " required>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-fax">
-                            <label class="control-label" for="fax">Fax: </label>
-                            <div class="control-input">
-                                <input type="tel" name="fax" id="fax" class="form-control" placeholder="(01) 02 03 04 05 ">
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="phone"}
+                            <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="cellphone"}
+                            <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
                     </div>
                 </fieldset>
 
                 <fieldset id="register-delivery" class="panel">
                     <div class="panel-heading">
-                        2. Delivery Informations
+                        2. {intl l="Delivery Informations"}
                     </div>
 
                     <div class="panel-body">

web/index_dev.php

@@ -34,7 +34,8 @@ require __DIR__ . '/../core/bootstrap.php';
 // List of allowed IP
 $trustedIp = array(
   '::1',
-  '127.0.0.1'
+  '127.0.0.1',
+  '192.168.56.1'
 );
 
 $request = Request::createFromGlobals();