Zmieniono nazwę kolumny client_email na order_email w widoku zamówień oraz usunięto pliki .DS_Store.

This commit is contained in:
2025-03-14 21:11:09 +01:00
parent b5c614d792
commit e350f92f68
3 changed files with 5 additions and 5 deletions

View File

@@ -13,7 +13,7 @@ $grid->sql = '
number,
date_order,
CONCAT(client_name, \' \', client_surname) AS client,
client_email,
client_email AS order_email,
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
status,
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
GROUP BY
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
1=1 [where]
ORDER BY
@@ -49,7 +49,7 @@ $grid->sql_count = '
number,
date_order,
CONCAT(client_name, \' \', client_surname) AS client,
client_email,
client_email AS order_email,
CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
status,
client_phone,
@@ -72,7 +72,7 @@ $grid -> search = [
[ 'name' => 'Status', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => \shop\Order::order_statuses() ] ],
[ 'name' => 'Klient', 'db' => 'client', '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' => 'Dostawa', 'db' => 'transport', 'type' => 'text' ],
[ 'name' => 'Płatność', 'db' => 'payment_method', 'type' => 'text' ]
@@ -127,7 +127,7 @@ $grid -> columns_view = [
'db' => 'address',
], [
'name' => 'Email',
'db' => 'client_email',
'db' => 'order_email',
], [
'name' => 'Telefon',
'db' => 'client_phone',

BIN
autoload/.DS_Store vendored

Binary file not shown.

Binary file not shown.