ver. 0.274 - ShopClients Domain+DI migration

This commit is contained in:
2026-02-15 15:03:24 +01:00
parent 618ba4f446
commit dc7751c9de
19 changed files with 740 additions and 180 deletions

View File

@@ -0,0 +1,250 @@
<?php
namespace Domain\Client;
class ClientRepository
{
private const MAX_PER_PAGE = 100;
private $db;
public function __construct($db)
{
$this->db = $db;
}
/**
* @return array{items: array<int, array<string, mixed>>, total: int}
*/
public function listForAdmin(
array $filters,
string $sortColumn = 'client_surname',
string $sortDir = 'ASC',
int $page = 1,
int $perPage = 15
): array {
$allowedSortColumns = [
'client_name' => 'c.client_name',
'client_surname' => 'c.client_surname',
'client_email' => 'c.client_email',
'client_phone' => 'c.client_phone',
'client_city' => 'c.client_city',
'total_orders' => 'c.total_orders',
'total_spent' => 'c.total_spent',
'client_type' => 'c.is_registered',
];
$sortSql = $allowedSortColumns[$sortColumn] ?? 'c.client_surname';
$sortDir = strtoupper(trim($sortDir)) === 'DESC' ? 'DESC' : 'ASC';
$page = max(1, $page);
$perPage = min(self::MAX_PER_PAGE, max(1, $perPage));
$offset = ($page - 1) * $perPage;
$where = [
'o.client_name IS NOT NULL',
'o.client_surname IS NOT NULL',
'o.client_email IS NOT NULL',
];
$params = [];
$name = $this->normalizeTextFilter($filters['name'] ?? '');
if ($name !== '') {
$where[] = 'o.client_name LIKE :name';
$params[':name'] = '%' . $name . '%';
}
$surname = $this->normalizeTextFilter($filters['surname'] ?? '');
if ($surname !== '') {
$where[] = 'o.client_surname LIKE :surname';
$params[':surname'] = '%' . $surname . '%';
}
$email = $this->normalizeTextFilter($filters['email'] ?? '');
if ($email !== '') {
$where[] = 'o.client_email LIKE :email';
$params[':email'] = '%' . $email . '%';
}
$clientType = trim((string)($filters['client_type'] ?? ''));
if ($clientType === 'registered') {
$where[] = 'o.client_id IS NOT NULL';
} elseif ($clientType === 'guest') {
$where[] = 'o.client_id IS NULL';
}
$whereSql = implode(' AND ', $where);
$aggregatedSql = "
SELECT
MAX(o.client_id) AS client_id,
o.client_name,
o.client_surname,
o.client_email,
MAX(o.client_phone) AS client_phone,
MAX(o.client_city) AS client_city,
COUNT(*) AS total_orders,
COALESCE(SUM(o.summary), 0) AS total_spent,
CASE
WHEN MAX(o.client_id) IS NOT NULL THEN 1
ELSE 0
END AS is_registered
FROM pp_shop_orders AS o
WHERE {$whereSql}
GROUP BY o.client_name, o.client_surname, o.client_email
";
$sqlCount = "
SELECT COUNT(0)
FROM ({$aggregatedSql}) AS c
";
$stmtCount = $this->db->query($sqlCount, $params);
$countRows = $stmtCount ? $stmtCount->fetchAll() : [];
$total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0;
$sql = "
SELECT
c.client_id,
c.client_name,
c.client_surname,
c.client_email,
c.client_phone,
c.client_city,
c.total_orders,
c.total_spent,
c.is_registered
FROM ({$aggregatedSql}) AS c
ORDER BY {$sortSql} {$sortDir}, c.client_surname ASC, c.client_name ASC
LIMIT {$perPage} OFFSET {$offset}
";
$stmt = $this->db->query($sql, $params);
$items = $stmt ? $stmt->fetchAll() : [];
if (!is_array($items)) {
$items = [];
}
foreach ($items as &$item) {
$item['client_id'] = !isset($item['client_id']) ? null : (int)$item['client_id'];
$item['client_name'] = (string)($item['client_name'] ?? '');
$item['client_surname'] = (string)($item['client_surname'] ?? '');
$item['client_email'] = (string)($item['client_email'] ?? '');
$item['client_phone'] = (string)($item['client_phone'] ?? '');
$item['client_city'] = (string)($item['client_city'] ?? '');
$item['total_orders'] = (int)($item['total_orders'] ?? 0);
$item['total_spent'] = (float)($item['total_spent'] ?? 0);
$item['is_registered'] = ((int)($item['is_registered'] ?? 0)) === 1 ? 1 : 0;
}
unset($item);
return [
'items' => $items,
'total' => $total,
];
}
/**
* @return array<int, array<string, mixed>>
*/
public function ordersForClient(string $name, string $surname, string $email): array
{
$name = trim($name);
$surname = trim($surname);
$email = trim($email);
if ($name === '' || $surname === '' || $email === '') {
return [];
}
$sql = "
SELECT
o.id,
o.date_order,
o.summary,
o.payment_method,
o.transport,
o.message
FROM pp_shop_orders AS o
WHERE o.client_name = :name
AND o.client_surname = :surname
AND o.client_email = :email
ORDER BY o.date_order DESC, o.id DESC
";
$stmt = $this->db->query($sql, [
':name' => $name,
':surname' => $surname,
':email' => $email,
]);
$rows = $stmt ? $stmt->fetchAll() : [];
if (!is_array($rows)) {
return [];
}
foreach ($rows as &$row) {
$row['id'] = (int)($row['id'] ?? 0);
$row['date_order'] = (string)($row['date_order'] ?? '');
$row['summary'] = (float)($row['summary'] ?? 0);
$row['payment_method'] = (string)($row['payment_method'] ?? '');
$row['transport'] = (string)($row['transport'] ?? '');
$row['message'] = (string)($row['message'] ?? '');
}
unset($row);
return $rows;
}
/**
* @return array{total_orders: int, total_spent: float}
*/
public function totalsForClient(string $name, string $surname, string $email): array
{
$name = trim($name);
$surname = trim($surname);
$email = trim($email);
if ($name === '' || $surname === '' || $email === '') {
return [
'total_orders' => 0,
'total_spent' => 0.0,
];
}
$sql = "
SELECT
COUNT(*) AS total_orders,
COALESCE(SUM(o.summary), 0) AS total_spent
FROM pp_shop_orders AS o
WHERE o.client_name = :name
AND o.client_surname = :surname
AND o.client_email = :email
";
$stmt = $this->db->query($sql, [
':name' => $name,
':surname' => $surname,
':email' => $email,
]);
$rows = $stmt ? $stmt->fetchAll() : [];
return [
'total_orders' => isset($rows[0]['total_orders']) ? (int)$rows[0]['total_orders'] : 0,
'total_spent' => isset($rows[0]['total_spent']) ? (float)$rows[0]['total_spent'] : 0.0,
];
}
private function normalizeTextFilter($value): string
{
$value = trim((string)$value);
if ($value === '') {
return '';
}
if (strlen($value) > 255) {
return substr($value, 0, 255);
}
return $value;
}
}

View File

@@ -0,0 +1,222 @@
<?php
namespace admin\Controllers;
use Domain\Client\ClientRepository;
use admin\ViewModels\Common\PaginatedTableViewModel;
class ShopClientsController
{
private ClientRepository $repository;
public function __construct(ClientRepository $repository)
{
$this->repository = $repository;
}
public function list(): string
{
$sortableColumns = [
'client_name',
'client_surname',
'client_email',
'client_phone',
'client_city',
'total_orders',
'total_spent',
'client_type',
];
$filterDefinitions = [
[
'key' => 'name',
'label' => 'Imie',
'type' => 'text',
],
[
'key' => 'surname',
'label' => 'Nazwisko',
'type' => 'text',
],
[
'key' => 'email',
'label' => 'E-mail',
'type' => 'text',
],
[
'key' => 'client_type',
'label' => 'Typ klienta',
'type' => 'select',
'options' => [
'' => '- typ klienta -',
'registered' => 'Zarejestrowany',
'guest' => 'Gosc',
],
],
];
$listRequest = \admin\Support\TableListRequestFactory::fromRequest(
$filterDefinitions,
$sortableColumns,
'client_surname'
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
$sortDir = 'ASC';
}
$result = $this->repository->listForAdmin(
$listRequest['filters'],
$listRequest['sortColumn'],
$sortDir,
$listRequest['page'],
$listRequest['perPage']
);
$rows = [];
$lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1;
foreach ($result['items'] as $item) {
$name = trim((string)($item['client_name'] ?? ''));
$surname = trim((string)($item['client_surname'] ?? ''));
$email = trim((string)($item['client_email'] ?? ''));
$params = [
'name' => $name,
'surname' => $surname,
'email' => $email,
];
$detailsUrl = '/admin/shop_clients/details/?' . http_build_query($params);
$rows[] = [
'lp' => $lp++ . '.',
'client_type' => ((int)($item['is_registered'] ?? 0) === 1) ? 'Zarejestrowany' : 'Gosc',
'full_name' => htmlspecialchars($surname, ENT_QUOTES, 'UTF-8') . ' ' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8'),
'client_email' => $email,
'client_phone' => (string)($item['client_phone'] ?? ''),
'client_city' => (string)($item['client_city'] ?? ''),
'total_spent' => number_format((float)($item['total_spent'] ?? 0), 2, '.', ' ') . ' zl',
'total_orders' => '<a href="' . htmlspecialchars($detailsUrl, ENT_QUOTES, 'UTF-8') . '">' . (int)($item['total_orders'] ?? 0) . '</a>',
'_actions' => [
[
'label' => 'Zobacz zamowienia',
'url' => $detailsUrl,
'class' => 'btn btn-xs btn-primary',
],
],
];
}
$total = (int)$result['total'];
$totalPages = max(1, (int)ceil($total / $listRequest['perPage']));
$viewModel = new PaginatedTableViewModel(
[
['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
['key' => 'client_type', 'sort_key' => 'client_type', 'label' => 'Typ klienta', 'class' => 'text-center', 'sortable' => true],
['key' => 'full_name', 'label' => 'Nazwisko, imie', 'sortable' => false, 'raw' => true],
['key' => 'client_email', 'sort_key' => 'client_email', 'label' => 'Email', 'sortable' => true],
['key' => 'client_phone', 'sort_key' => 'client_phone', 'label' => 'Telefon', 'sortable' => true],
['key' => 'client_city', 'sort_key' => 'client_city', 'label' => 'Miasto', 'sortable' => true],
['key' => 'total_spent', 'sort_key' => 'total_spent', 'label' => 'Wartosc zamowien', 'class' => 'text-right', 'sortable' => true],
['key' => 'total_orders', 'sort_key' => 'total_orders', 'label' => 'Ilosc zamowien', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
],
$rows,
$listRequest['viewFilters'],
[
'column' => $listRequest['sortColumn'],
'dir' => $sortDir,
],
[
'page' => $listRequest['page'],
'per_page' => $listRequest['perPage'],
'total' => $total,
'total_pages' => $totalPages,
],
array_merge($listRequest['queryFilters'], [
'sort' => $listRequest['sortColumn'],
'dir' => $sortDir,
'per_page' => $listRequest['perPage'],
]),
$listRequest['perPageOptions'],
$sortableColumns,
'/admin/shop_clients/list/',
'Brak danych w tabeli.'
);
return \Tpl::view('shop-clients/view-list', [
'viewModel' => $viewModel,
]);
}
public function view_list(): string
{
return $this->list();
}
public function details(): string
{
$name = (string)\S::get('name');
$surname = (string)\S::get('surname');
$email = (string)\S::get('email');
$ordersInfo = $this->repository->ordersForClient($name, $surname, $email);
$totals = $this->repository->totalsForClient($name, $surname, $email);
$rows = [];
$lp = 1;
foreach ($ordersInfo as $order) {
$rows[] = [
'lp' => $lp++ . '.',
'date_order' => (string)($order['date_order'] ?? ''),
'summary' => number_format((float)($order['summary'] ?? 0), 2, '.', ' ') . ' zl',
'payment_method' => (string)($order['payment_method'] ?? ''),
'transport' => (string)($order['transport'] ?? ''),
'message' => (string)($order['message'] ?? ''),
'_actions' => [],
];
}
$ordersTable = new PaginatedTableViewModel(
[
['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
['key' => 'date_order', 'label' => 'Data zamowienia', 'class' => 'text-center', 'sortable' => false],
['key' => 'summary', 'label' => 'Wartosc', 'class' => 'text-right', 'sortable' => false],
['key' => 'payment_method', 'label' => 'Typ platnosci', 'sortable' => false],
['key' => 'transport', 'label' => 'Rodzaj transportu', 'sortable' => false],
['key' => 'message', 'label' => 'Wiadomosc', 'sortable' => false],
],
$rows,
[],
[],
[
'page' => 1,
'per_page' => max(1, count($rows)),
'total' => count($rows),
'total_pages' => 1,
],
[],
[count($rows) > 0 ? count($rows) : 1],
[],
'/admin/shop_clients/details/?' . http_build_query([
'name' => $name,
'surname' => $surname,
'email' => $email,
]),
'Brak zamowien klienta.'
);
return \Tpl::view('shop-clients/clients-details', [
'name' => $name,
'surname' => $surname,
'email' => $email,
'total_spent' => $totals['total_spent'],
'ordersTable' => $ordersTable,
'total_orders' => $totals['total_orders'],
]);
}
public function clients_details(): string
{
return $this->details();
}
}

View File

@@ -384,6 +384,13 @@ class Site
new \Domain\Product\ProductRepository( $mdb )
);
},
'ShopClients' => function() {
global $mdb;
return new \admin\Controllers\ShopClientsController(
new \Domain\Client\ClientRepository( $mdb )
);
},
];
return self::$newControllers;

View File

@@ -1,28 +0,0 @@
<?php
namespace admin\controls;
class ShopClients
{
public static function view_list()
{
return \Tpl::view(
'shop-clients/view-list'
);
}
public static function clients_details()
{
$query_string = $_SERVER['REDIRECT_QUERY_STRING'];
parse_str($query_string, $query_array);
$orders_info = \admin\factory\ShopClients::get_order_all_info( $query_array['name'], $query_array['surname'], $query_array['email'] );
return \Tpl::view('shop-clients/clients-details', [
'name' => $query_array['name'],
'surname' => $query_array['surname'],
'email' => $query_array['email'],
'total_spent' => $query_array['total_spent'],
'orders_info' => $orders_info
]);
}
}
?>

View File

@@ -1,17 +0,0 @@
<?php
namespace admin\factory;
class ShopClients
{
public static function get_order_all_info($name, $surname, $email)
{
global $mdb;
$results = $mdb->select('pp_shop_orders', '*', [
'client_name' => $name,
'client_surname' => $surname,
'client_email' => $email
]);
return $results;}
}
?>