Alex Savenko / semena

Commit 26818a4b00eb69962ec78629b1b92548b9f5fe0e

Authored by Alex Savenko
2 parents 5d8185fe e14ff6a3

Merge branch 'master' of gitlab.artweb.com.ua:Alex/semena

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/app/backend/controllers/CustomersController.php
  Show/Hide comments   View file @26818a4
@@ -95,7 +95,7 @@ class CustomersController extends \Phalcon\Mvc\Controller @@ -95,7 +95,7 @@ class CustomersController extends \Phalcon\Mvc\Controller
95 } 95 }
96 else 96 else
97 { 97 {
98 - $this->flash->error('Пользователь с таким эмейлом уже существует'); 98 + $this->flash->error('Пользователь с таким эмейлом не найден');
99 } 99 }
100 } 100 }
101 101
src/lib/models/customers.php
  Show/Hide comments   View file @26818a4
@@ -29,7 +29,8 @@ class customers extends \db @@ -29,7 +29,8 @@ class customers extends \db
29 SELECT * FROM 29 SELECT * FROM
30 public.customers 30 public.customers
31 WHERE 31 WHERE
32 - email LIKE \'%'.$like.'%\'' 32 + email LIKE \'%'.$like.'%\'
  33 + '
33 , 34 ,
34 [ 35 [
35 ], 36 ],
@@ -43,7 +44,8 @@ class customers extends \db @@ -43,7 +44,8 @@ class customers extends \db
43 SELECT * FROM 44 SELECT * FROM
44 public.customers 45 public.customers
45 WHERE 46 WHERE
46 - status = 1' 47 + status = 1
  48 + '
47 , 49 ,
48 [ 50 [
49 ], 51 ],
@@ -72,7 +74,7 @@ class customers extends \db @@ -72,7 +74,7 @@ class customers extends \db
72 SELECT * FROM 74 SELECT * FROM
73 public.customers 75 public.customers
74 ORDER BY 76 ORDER BY
75 - id ASC 77 + id DESC
76 LIMIT 78 LIMIT
77 '.\config::get( 'limits/admin_orders' ).' 79 '.\config::get( 'limits/admin_orders' ).'
78 OFFSET 80 OFFSET