Merge pull request #110 from s-ohnishi/master

src/Controllers/InvoicesController.php

@@ -62,8 +62,6 @@ public function profileAction(): void
             $data = $this->request->getPost();
 
             if ($form->isValid($data, $user)) {
-                $user->assign($data);
-
                 if (!$user->save()) {
                     foreach ($user->getMessages() as $message) {
                         $this->flash->error((string) $message);

src/Controllers/ProductsController.php

@@ -55,7 +55,8 @@ public function searchAction(): void
                 $this->request->getPost()
             );
 
-            $this->persistent->searchParams = $query->getParams();
+            //$this->persistent->searchParams = $query->getParams();
+            $this->persistent->searchParams = array('di'=>null) + $query->getParams();
         }
 
         $parameters = [];
@@ -77,7 +78,7 @@ public function searchAction(): void
 
         $paginator = new Paginator([
             'model' => Products::class,
-            'data'  => $products,
+            "parameters" => $parameters,
             'limit' => 10,
             'page'  => $this->request->getQuery('page', 'int', 1),
         ]);

src/Controllers/RegisterController.php

@@ -42,29 +42,13 @@ public function indexAction(): void
         $form = new RegisterForm();
 
         if ($this->request->isPost()) {
-            if ($form->isValid($this->request->getPost(), new Users())) {
-                $password       = $this->request->getPost('password');
-                $repeatPassword = $this->request->getPost('repeatPassword');
+            $newUser = new Users();
+            if ($form->isValid($this->request->getPost(), $newUser)) {
+                $newUser->password = sha1($form->getFilteredValue('password'));
+                $newUser->created_at = new RawValue('now()');
+                $newUser->active     = Status::ACTIVE;
 
-                if ($password !== $repeatPassword) {
-                    $this->flash->error('Passwords are different');
-
-                    return;
-                }
-
-                $user             = new Users();
-                $user->username   = $this->request->getPost('username', 'alphanum');
-                $user->password   = sha1($password);
-                $user->name       = $this->request->getPost('name', ['string', 'striptags']);
-                $user->email      = $this->request->getPost('email', 'email');
-                $user->created_at = new RawValue('now()');
-                $user->active     = Status::ACTIVE;
-
-                if (!$user->save()) {
-                    foreach ($user->getMessages() as $message) {
-                        $this->flash->error((string) $message);
-                    }
-                } else {
+                if ($newUser->save()) {
                     $this->flash->success(
                         'Thanks for sign-up, please log-in to start generating invoices'
                     );

src/Forms/RegisterForm.php

@@ -16,6 +16,8 @@
 use Phalcon\Filter\Validation\Validator\Email;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
 use Phalcon\Filter\Validation\Validator\Uniqueness as UniquenessValidator;
+use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Filter\Validation\Validator\StringLength\Min;
 use Phalcon\Forms\Element\Password;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Form;
@@ -45,7 +47,7 @@ public function initialize($entity = null, $options = null)
          */
         $name = new Text('username');
         $name->setLabel('Username');
-        $name->setFilters(['alphanum']);
+        $name->setFilters(['alnum']);
         $name->addValidators([
             new PresenceOf(['message' => 'Please enter your desired user name']),
             new UniquenessValidator(
@@ -82,6 +84,7 @@ public function initialize($entity = null, $options = null)
         $password->setLabel('Password');
         $password->addValidators([
             new PresenceOf(['message' => 'Password is required']),
+            new Min(['min' => 8, 'message' => 'Password must be at least 8 characters']),
         ]);
 
         $this->add($password);
@@ -93,6 +96,7 @@ public function initialize($entity = null, $options = null)
         $repeatPassword->setLabel('Repeat Password');
         $repeatPassword->addValidators([
             new PresenceOf(['message' => 'Confirmation password is required']),
+            new Confirmation(["message" => "Passwords are different", "with" => "password",]),
         ]);
 
         $this->add($repeatPassword);

src/Models/Products.php

@@ -58,7 +58,7 @@ public function initialize()
             'id',
             [
                 'reusable' => true,
-                'alias' => 'productType'
+                'alias' => 'productTypes',
             ]
         );
     }

themes/invo/companies/index.volt

@@ -7,7 +7,7 @@
     </div>
 </div>
 
-<form action="/companies/search" role="form" method="get">
+<form action="/companies/search" role="form" method="post">
     {% for element in form %}
         {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %}
             {{ element }}

themes/invo/products/index.volt

@@ -7,7 +7,7 @@
     </div>
 </div>
 
-<form action="/products/search" role="form" method="get">
+<form action="/products/search" role="form" method="post">
     {% for element in form %}
         {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %}
             {{ element }}

themes/invo/products/search.volt

@@ -23,7 +23,7 @@
     {% endif %}
     <tr>
         <td>{{ product.id }}</td>
-        <td>{{ product.productType.name }}</td>
+        <td>{{ product.productTypes.name }}</td>
         <td>{{ product.name }}</td>
         <td>${{ "%.2f"|format(product.price) }}</td>
         <td>{{ product.getActiveDetail() }}</td>

themes/invo/producttypes/index.volt

@@ -7,7 +7,7 @@
     </div>
 </div>
 
-<form action="/producttypes/search" role="form" method="get">
+<form action="/producttypes/search" role="form" method="post">
     <div class="form-group">
         <label for="id">Id</label>
         {{ numeric_field("id", "size": 10, "maxlength": 10, "class": "form-control") }}