Zmiana nazwy pola email w zamówieniach na order_email oraz usunięcie pliku .DS_Store
This commit is contained in:
@@ -13,7 +13,7 @@ $grid->sql = '
|
|||||||
number,
|
number,
|
||||||
date_order,
|
date_order,
|
||||||
CONCAT(client_name, \' \', client_surname) AS client,
|
CONCAT(client_name, \' \', client_surname) AS client,
|
||||||
client_email,
|
client_email AS order_email,
|
||||||
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
|
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
|
||||||
status,
|
status,
|
||||||
client_phone,
|
client_phone,
|
||||||
@@ -34,7 +34,7 @@ $grid->sql = '
|
|||||||
client_name IS NOT NULL AND client_surname IS NOT NULL AND client_email IS NOT NULL
|
client_name IS NOT NULL AND client_surname IS NOT NULL AND client_email IS NOT NULL
|
||||||
GROUP BY
|
GROUP BY
|
||||||
client_email
|
client_email
|
||||||
) AS shop_order ON q1.client_email = shop_order.client_email
|
) AS shop_order ON q1.order_email = shop_order.client_email
|
||||||
WHERE
|
WHERE
|
||||||
1=1 [where]
|
1=1 [where]
|
||||||
ORDER BY
|
ORDER BY
|
||||||
@@ -49,7 +49,7 @@ $grid->sql_count = '
|
|||||||
number,
|
number,
|
||||||
date_order,
|
date_order,
|
||||||
CONCAT(client_name, \' \', client_surname) AS client,
|
CONCAT(client_name, \' \', client_surname) AS client,
|
||||||
client_email,
|
client_email AS order_email,
|
||||||
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
|
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
|
||||||
status,
|
status,
|
||||||
client_phone,
|
client_phone,
|
||||||
@@ -72,7 +72,7 @@ $grid -> search = [
|
|||||||
[ 'name' => 'Status', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => \shop\Order::order_statuses() ] ],
|
[ 'name' => 'Status', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => \shop\Order::order_statuses() ] ],
|
||||||
[ 'name' => 'Klient', 'db' => 'client', 'type' => 'text' ],
|
[ 'name' => 'Klient', 'db' => 'client', 'type' => 'text' ],
|
||||||
[ 'name' => 'Adres', 'db' => 'address', 'type' => 'text' ],
|
[ 'name' => 'Adres', 'db' => 'address', 'type' => 'text' ],
|
||||||
// [ 'name' => 'Email', 'db' => 'client_email', 'type' => 'text' ],
|
[ 'name' => 'Email', 'db' => 'order_email', 'type' => 'text' ],
|
||||||
[ 'name' => 'Telefon', 'db' => 'client_phone', 'type' => 'text' ],
|
[ 'name' => 'Telefon', 'db' => 'client_phone', 'type' => 'text' ],
|
||||||
[ 'name' => 'Dostawa', 'db' => 'transport', 'type' => 'text' ],
|
[ 'name' => 'Dostawa', 'db' => 'transport', 'type' => 'text' ],
|
||||||
[ 'name' => 'Płatność', 'db' => 'payment_method', 'type' => 'text' ]
|
[ 'name' => 'Płatność', 'db' => 'payment_method', 'type' => 'text' ]
|
||||||
@@ -127,7 +127,7 @@ $grid -> columns_view = [
|
|||||||
'db' => 'address',
|
'db' => 'address',
|
||||||
], [
|
], [
|
||||||
'name' => 'Email',
|
'name' => 'Email',
|
||||||
'db' => 'client_email',
|
'db' => 'order_email',
|
||||||
], [
|
], [
|
||||||
'name' => 'Telefon',
|
'name' => 'Telefon',
|
||||||
'db' => 'client_phone',
|
'db' => 'client_phone',
|
||||||
|
|||||||
BIN
autoload/.DS_Store
vendored
Normal file
BIN
autoload/.DS_Store
vendored
Normal file
Binary file not shown.
BIN
autoload/front/.DS_Store
vendored
Normal file
BIN
autoload/front/.DS_Store
vendored
Normal file
Binary file not shown.
BIN
templates/.DS_Store
vendored
Normal file
BIN
templates/.DS_Store
vendored
Normal file
Binary file not shown.
Reference in New Issue
Block a user