diff --git a/admin/templates/shop-order/view-list.php b/admin/templates/shop-order/view-list.php index 26035de..e568af9 100644 --- a/admin/templates/shop-order/view-list.php +++ b/admin/templates/shop-order/view-list.php @@ -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', diff --git a/autoload/.DS_Store b/autoload/.DS_Store new file mode 100644 index 0000000..3239922 Binary files /dev/null and b/autoload/.DS_Store differ diff --git a/autoload/front/.DS_Store b/autoload/front/.DS_Store new file mode 100644 index 0000000..7285fd1 Binary files /dev/null and b/autoload/front/.DS_Store differ diff --git a/templates/.DS_Store b/templates/.DS_Store new file mode 100644 index 0000000..35bede8 Binary files /dev/null and b/templates/.DS_Store differ