Refactor admin lists and migrate legacy archive/filemanager controllers

This commit is contained in:
2026-02-11 00:03:07 +01:00
parent fe4e98d9bd
commit f9f2ddd3bb
18 changed files with 527 additions and 374 deletions

View File

@@ -0,0 +1,100 @@
<style type="text/css">
.banner-thumb-wrap {
display: inline-block;
}
.banner-thumb-image {
width: 72px;
height: 42px;
object-fit: cover;
border-radius: 4px;
cursor: zoom-in;
}
.banner-thumb-popup {
position: fixed;
top: 0;
left: 0;
width: min(70vw, 760px);
max-height: 80vh;
padding: 6px;
border-radius: 6px;
background: #fff;
box-shadow: 0 14px 30px rgba(0, 0, 0, .35);
z-index: 3000;
opacity: 0;
visibility: hidden;
pointer-events: none;
transition: opacity .1s ease;
}
.banner-thumb-popup.is-visible {
opacity: 1;
visibility: visible;
}
.banner-thumb-popup img {
display: block;
width: 100%;
max-height: calc(80vh - 12px);
object-fit: contain;
border-radius: 4px;
}
</style>
<script type="text/javascript">
(function($) {
if (!$) {
return;
}
$('.banner-thumb-popup').remove();
var $popup = $('<div class="banner-thumb-popup" aria-hidden="true"><img src="" alt=""></div>');
var $popupImage = $popup.find('img');
$('body').append($popup);
function positionPopup(event) {
var offset = 18;
var viewportWidth = $(window).width();
var viewportHeight = $(window).height();
var popupWidth = $popup.outerWidth();
var popupHeight = $popup.outerHeight();
var left = (event.clientX || 0) + offset;
var top = (event.clientY || 0) + offset;
if (left + popupWidth + 12 > viewportWidth) {
left = Math.max(12, (event.clientX || 0) - popupWidth - offset);
}
if (top + popupHeight + 12 > viewportHeight) {
top = Math.max(12, viewportHeight - popupHeight - 12);
}
$popup.css({ left: left + 'px', top: top + 'px' });
}
$(document).off('.bannerThumbPopup');
$(document).on('mouseenter.bannerThumbPopup', '.js-banner-thumb-preview', function(event) {
var src = $(this).data('previewSrc');
if (!src) {
return;
}
$popupImage.attr('src', String(src));
$popup.addClass('is-visible');
positionPopup(event);
});
$(document).on('mousemove.bannerThumbPopup', '.js-banner-thumb-preview', function(event) {
if ($popup.hasClass('is-visible')) {
positionPopup(event);
}
});
$(document).on('mouseleave.bannerThumbPopup', '.js-banner-thumb-preview', function() {
$popup.removeClass('is-visible');
$popupImage.attr('src', '');
});
})(window.jQuery);
</script>

View File

@@ -1,105 +1,5 @@
<?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?> <?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?>
<style type="text/css">
.banner-thumb-wrap {
display: inline-block;
}
.banner-thumb-image {
width: 72px;
height: 42px;
object-fit: cover;
border-radius: 4px;
cursor: zoom-in;
}
.banner-thumb-popup {
position: fixed;
top: 0;
left: 0;
width: min(70vw, 760px);
max-height: 80vh;
padding: 6px;
border-radius: 6px;
background: #fff;
box-shadow: 0 14px 30px rgba(0, 0, 0, .35);
z-index: 3000;
opacity: 0;
visibility: hidden;
pointer-events: none;
transition: opacity .1s ease;
}
.banner-thumb-popup.is-visible {
opacity: 1;
visibility: visible;
}
.banner-thumb-popup img {
display: block;
width: 100%;
max-height: calc(80vh - 12px);
object-fit: contain;
border-radius: 4px;
}
</style>
<script type="text/javascript">
(function($) {
if (!$) {
return;
}
var $popup = $('<div class="banner-thumb-popup" aria-hidden="true"><img src="" alt=""></div>');
var $popupImage = $popup.find('img');
$('body').append($popup);
function positionPopup(event) {
var offset = 18;
var viewportWidth = $(window).width();
var viewportHeight = $(window).height();
var popupWidth = $popup.outerWidth();
var popupHeight = $popup.outerHeight();
var left = (event.clientX || 0) + offset;
var top = (event.clientY || 0) + offset;
if (left + popupWidth + 12 > viewportWidth) {
left = Math.max(12, (event.clientX || 0) - popupWidth - offset);
}
if (top + popupHeight + 12 > viewportHeight) {
top = Math.max(12, viewportHeight - popupHeight - 12);
}
$popup.css({ left: left + 'px', top: top + 'px' });
}
$(document).off('.bannerThumbPopup');
$(document).on('mouseenter.bannerThumbPopup', '.js-banner-thumb-preview', function(event) {
var src = $(this).data('previewSrc');
if (!src) {
return;
}
$popupImage.attr('src', String(src));
$popup.addClass('is-visible');
positionPopup(event);
});
$(document).on('mousemove.bannerThumbPopup', '.js-banner-thumb-preview', function(event) {
if ($popup.hasClass('is-visible')) {
positionPopup(event);
}
});
$(document).on('mouseleave.bannerThumbPopup', '.js-banner-thumb-preview', function() {
$popup.removeClass('is-visible');
$popupImage.attr('src', '');
});
})(window.jQuery);
</script>
<?php if (!empty($this->viewModel->customScriptView)): ?> <?php if (!empty($this->viewModel->customScriptView)): ?>
<?= \Tpl::view($this->viewModel->customScriptView, ['list' => $this->viewModel]); ?> <?= \Tpl::view($this->viewModel->customScriptView, ['list' => $this->viewModel]); ?>
<?php endif; ?> <?php endif; ?>

View File

@@ -1 +1,4 @@
<iframe src="/libraries/filemanager-9.14.2/dialog.php?akey=c3cb2537d25c0efc9e573d059d79c3b8" style="border: 0px; width: 100%; height: 800px; background: #FFF; padding: 5px;"></iframe> <?php
$filemanagerUrl = trim((string)($this->filemanager_url ?? '/libraries/filemanager-9.14.2/dialog.php'));
?>
<iframe src="<?= htmlspecialchars($filemanagerUrl, ENT_QUOTES, 'UTF-8'); ?>" style="border: 0px; width: 100%; height: 800px; background: #FFF; padding: 5px;"></iframe>

View File

@@ -0,0 +1,100 @@
<style type="text/css">
.product-archive-thumb-wrap {
display: inline-block;
}
.product-archive-thumb-image {
width: 72px;
height: 42px;
object-fit: cover;
border-radius: 4px;
cursor: zoom-in;
}
.product-archive-thumb-popup {
position: fixed;
top: 0;
left: 0;
width: min(70vw, 760px);
max-height: 80vh;
padding: 6px;
border-radius: 6px;
background: #fff;
box-shadow: 0 14px 30px rgba(0, 0, 0, .35);
z-index: 3000;
opacity: 0;
visibility: hidden;
pointer-events: none;
transition: opacity .1s ease;
}
.product-archive-thumb-popup.is-visible {
opacity: 1;
visibility: visible;
}
.product-archive-thumb-popup img {
display: block;
width: 100%;
max-height: calc(80vh - 12px);
object-fit: contain;
border-radius: 4px;
}
</style>
<script type="text/javascript">
(function($) {
if (!$) {
return;
}
$('.product-archive-thumb-popup').remove();
var $popup = $('<div class="product-archive-thumb-popup" aria-hidden="true"><img src="" alt=""></div>');
var $popupImage = $popup.find('img');
$('body').append($popup);
function positionPopup(event) {
var offset = 18;
var viewportWidth = $(window).width();
var viewportHeight = $(window).height();
var popupWidth = $popup.outerWidth();
var popupHeight = $popup.outerHeight();
var left = (event.clientX || 0) + offset;
var top = (event.clientY || 0) + offset;
if (left + popupWidth + 12 > viewportWidth) {
left = Math.max(12, (event.clientX || 0) - popupWidth - offset);
}
if (top + popupHeight + 12 > viewportHeight) {
top = Math.max(12, viewportHeight - popupHeight - 12);
}
$popup.css({ left: left + 'px', top: top + 'px' });
}
$(document).off('.productArchiveThumbPopup');
$(document).on('mouseenter.productArchiveThumbPopup', '.js-product-archive-thumb-preview', function(event) {
var src = $(this).data('previewSrc');
if (!src) {
return;
}
$popupImage.attr('src', String(src));
$popup.addClass('is-visible');
positionPopup(event);
});
$(document).on('mousemove.productArchiveThumbPopup', '.js-product-archive-thumb-preview', function(event) {
if ($popup.hasClass('is-visible')) {
positionPopup(event);
}
});
$(document).on('mouseleave.productArchiveThumbPopup', '.js-product-archive-thumb-preview', function() {
$popup.removeClass('is-visible');
$popupImage.attr('src', '');
});
})(window.jQuery);
</script>

View File

@@ -0,0 +1,5 @@
<?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?>
<?php if (!empty($this->viewModel->customScriptView)): ?>
<?= \Tpl::view($this->viewModel->customScriptView, ['list' => $this->viewModel]); ?>
<?php endif; ?>

View File

@@ -1,41 +0,0 @@
<? $i = ( $this -> current_page - 1 ) * 10 + 1;?>
<? foreach ( $this -> products as $product ):?>
<tr>
<td>
<?= $i++;?>
</td>
<td>
<div class="product-image">
<? if ( $product['images'][0]['src'] ):?>
<img src="<?= $product['images'][0]['src'];?>" alt="<?= $product['images'][0]['alt'];?>" class="img-responsive">
<? else:?>
<img src="/admin/layout/images/no-image.png" alt="Brak zdjęcia" class="img-responsive">
<? endif;?>
</div>
<div class="product-name">
<a href="/admin/shop_product/product_edit/id=<?= $product['id'];?>">
<?= $product['languages']['pl']['name'];?>
</a>
</div>
<small class="text-muted"><?= \admin\factory\ShopProduct::product_categories( $product['id'] );?></small>
</td>
<td class="text-center">
<?= $product['price_brutto'];?>
</td>
<td class="text-center">
<?= $product['price_brutto_promo'];?>
</td>
<td class="text-center">
<span class="text-muted"><?= (int)\admin\factory\shopProduct::get_product_quantity_list( $product['id'] );?></span>
</td>
<td>
<a href='/admin/shop_product/product_combination/product_id=<?= $product['id'];?>'>kombinacje (<?= \admin\factory\shopProduct::count_product_combinations( $product['id'] );?>)</a>
</td>
<td class="text-center">
<a href='/admin/shop_product/product_edit/id=<?= $product['id'];?>'>edytuj</a>
</td>
<td class="text-center">
<a href='/admin/product_archive/unarchive/product_id=<?= $product['id'];?>' class="product-unarchive">przywróć</a>
</td>
</tr>
<? endforeach;?>

View File

@@ -1,152 +0,0 @@
<div class="panel">
<div class="panel-body pn">
<div class="table-responsive">
<table class="table table-bordered table-hover table-striped mbn" id="table-products">
<thead>
<tr>
<th style="width: 10px;">#</th>
<th>Nazwa</th>
<th class="text-center" style="width: 100px;">Cena</th>
<th class="text-center" style="width: 100px;">Cena promocyjna</th>
<th class="text-center" style="width: 75px;">Stan MG</th>
<th class="text-center" style="width: 100px;">Kombinacje</th>
<th class="text-center" style="width: 75px;">Edytuj</th>
<th class="text-center" style="width: 75px;">Przywróć</th>
</tr>
<tr>
<th></th>
<th>
<input type="text" class="form-control table-search" field_name="name|ean|sku" placeholder="szukaj..." value="<?= htmlspecialchars( $this -> query_array['name'] ?? '', ENT_QUOTES, 'UTF-8');?>">
</th>
<th colspan="6"></th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr>
<td colspan="8">
<ul class="pagination" pagination_max="<?= $this -> pagination_max;?>">
<li>
<a href="#" page="1" title="pierwsza strona">
<i class="fa fa-angle-double-left"></i>
</a>
</li>
<li>
<a href="#" class="previous" page="<?= ( $this -> current_page - 1 > 1 ) ? ( $this -> current_page - 1 ) : 1;?>" title="poprzednia strona">
<i class="fa fa-angle-left" title="poprzednia strona"></i>
</a>
</li>
<li>
<div>
Strona <span id="current-page"><?= $this -> current_page;?></span> z <span id="max_page"><?= $this -> pagination_max;?></span>
</div>
</li>
<li>
<a href="#" class="next" page="<?= ( $this -> current_page + 1 < $this -> pagination_max ) ? ( $this -> current_page + 1 ) : $this -> pagination_max;?>" title="następna strona">
<i class="fa fa-angle-right"></i>
</a>
</li>
<li>
<a href="#" class="last" page="<?= $this -> pagination_max;?>" title="ostatnia strona">
<i class="fa fa-angle-double-right"></i>
</a>
</li>
</ul>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<script type="text/javascript">
$( function() {
ajax_load_products( <?= $this -> current_page;?> );
$( 'body' ).on( 'change', '.table-search', function() {
ajax_load_products( 1 );
});
$( 'body' ).on( 'click', '.pagination a', function() {
var current_page = $( this ).attr( 'page' );
ajax_load_products( current_page );
});
$( 'body' ).on( 'click', '.product-unarchive', function(e) {
e.preventDefault();
var href = $( this ).attr( 'href' );
$.alert({
title: 'Pytanie',
content: 'Na pewno chcesz przywrócić wybrany produkt z archiwum?',
type: 'orange',
closeIcon: true,
closeIconClass: 'fa fa-times',
typeAnimated: true,
animation: 'opacity',
columnClass: 'col-12 col-lg-10',
theme: 'supervan',
icon: 'fa fa-question',
buttons: {
cancel: {
text: 'Nie',
btnClass: 'btn-success',
action: function() {}
},
confirm: {
text: 'Tak',
btnClass: 'btn-danger',
keys: ['enter'],
action: function() {
document.location.href = href;
}
}
}
});
return false;
});
});
function ajax_load_products( current_page ) {
var pagination_max = parseInt( $( '.pagination' ).attr( 'pagination_max' ) );
var query = '';
$( '.table-search' ).each(function(){
query += $( this ).attr( 'field_name' ) + '=' + $( this ).val() + '&';
});
current_page = parseInt( current_page );
$.ajax({
type: 'POST',
cache: false,
url: '/admin/shop_product/ajax_load_products_archive/',
data: {
current_page: current_page,
query: query
},
beforeSend: function() {
$( '#overlay' ).show();
},
success: function( response ) {
$( '#overlay' ).hide();
data = jQuery.parseJSON( response );
if ( data.status == 'ok' ) {
$( '#table-products tbody' ).html( data.html );
$( '.pagination .previous' ).attr( 'page', ( current_page - 1 > 1 ) ? ( current_page - 1 ) : 1 );
$( '.pagination .next' ).attr( 'page', ( current_page + 1 < pagination_max ) ? ( current_page + 1 ) : pagination_max );
$( '.pagination span' ).html( current_page );
if ( data.pagination_max ) {
$( '.pagination' ).attr( 'pagination_max', data.pagination_max );
$( '.pagination #max_page' ).html( data.pagination_max );
$( '.pagination .last' ).attr( 'page', data.pagination_max );
}
}
}
});
}
</script>

View File

@@ -9,6 +9,8 @@ namespace Domain\Product;
*/ */
class ProductRepository class ProductRepository
{ {
private const MAX_PER_PAGE = 100;
/** /**
* @var \medoo Instancja Medoo ORM * @var \medoo Instancja Medoo ORM
*/ */
@@ -50,6 +52,118 @@ class ProductRepository
return $product ?: null; return $product ?: null;
} }
/**
* Zwraca liste produktow z archiwum do panelu admin.
*
* @return array{items: array<int, array<string, mixed>>, total: int}
*/
public function listArchivedForAdmin(
array $filters,
string $sortColumn = 'id',
string $sortDir = 'DESC',
int $page = 1,
int $perPage = 10
): array {
$allowedSortColumns = [
'id' => 'psp.id',
'name' => 'name',
'price_brutto' => 'psp.price_brutto',
'price_brutto_promo' => 'psp.price_brutto_promo',
'quantity' => 'psp.quantity',
'combinations' => 'combinations',
];
$sortSql = $allowedSortColumns[$sortColumn] ?? 'psp.id';
$sortDir = strtoupper(trim($sortDir)) === 'ASC' ? 'ASC' : 'DESC';
$page = max(1, $page);
$perPage = min(self::MAX_PER_PAGE, max(1, $perPage));
$offset = ($page - 1) * $perPage;
$where = ['psp.archive = 1', 'psp.parent_id IS NULL'];
$params = [];
$phrase = trim((string)($filters['phrase'] ?? ''));
if (strlen($phrase) > 255) {
$phrase = substr($phrase, 0, 255);
}
if ($phrase !== '') {
$where[] = '(
psp.ean LIKE :phrase
OR psp.sku LIKE :phrase
OR EXISTS (
SELECT 1
FROM pp_shop_products_langs AS pspl2
WHERE pspl2.product_id = psp.id
AND pspl2.name LIKE :phrase
)
)';
$params[':phrase'] = '%' . $phrase . '%';
}
$whereSql = implode(' AND ', $where);
$sqlCount = "
SELECT COUNT(0)
FROM pp_shop_products AS psp
WHERE {$whereSql}
";
$stmtCount = $this->db->query($sqlCount, $params);
$countRows = $stmtCount ? $stmtCount->fetchAll() : [];
$total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0;
$sql = "
SELECT
psp.id,
psp.price_brutto,
psp.price_brutto_promo,
psp.quantity,
psp.sku,
psp.ean,
(
SELECT pspl.name
FROM pp_shop_products_langs AS pspl
INNER JOIN pp_langs AS pl ON pl.id = pspl.lang_id
WHERE pspl.product_id = psp.id
AND pspl.name <> ''
ORDER BY pl.o ASC
LIMIT 1
) AS name,
(
SELECT pspi.src
FROM pp_shop_products_images AS pspi
WHERE pspi.product_id = psp.id
ORDER BY pspi.o ASC, pspi.id ASC
LIMIT 1
) AS image_src,
(
SELECT pspi.alt
FROM pp_shop_products_images AS pspi
WHERE pspi.product_id = psp.id
ORDER BY pspi.o ASC, pspi.id ASC
LIMIT 1
) AS image_alt,
(
SELECT COUNT(0)
FROM pp_shop_products AS pspc
WHERE pspc.parent_id = psp.id
) AS combinations
FROM pp_shop_products AS psp
WHERE {$whereSql}
ORDER BY {$sortSql} {$sortDir}, psp.id {$sortDir}
LIMIT {$perPage} OFFSET {$offset}
";
$stmt = $this->db->query($sql, $params);
$items = $stmt ? $stmt->fetchAll() : [];
return [
'items' => is_array($items) ? $items : [],
'total' => $total,
];
}
/** /**
* Pobiera cenę produktu (promocyjną jeśli jest niższa, w przeciwnym razie regularną) * Pobiera cenę produktu (promocyjną jeśli jest niższa, w przeciwnym razie regularną)
* *

View File

@@ -147,7 +147,8 @@ class BannerController
'/admin/banners/view_list/', '/admin/banners/view_list/',
'Brak danych w tabeli.', 'Brak danych w tabeli.',
'/admin/banners/banner_edit/', '/admin/banners/banner_edit/',
'Dodaj baner' 'Dodaj baner',
'banners/banners-list-custom-script'
); );
return \Tpl::view('banners/banners-list', [ return \Tpl::view('banners/banners-list', [

View File

@@ -0,0 +1,46 @@
<?php
namespace admin\Controllers;
class FilemanagerController
{
private const RFM_KEY_TTL = 1200; // 20 min
private const FILEMANAGER_DIALOG_PATH = '/libraries/filemanager-9.14.2/dialog.php';
public function draw(): string
{
$akey = $this->ensureFilemanagerAccessKey();
$filemanagerUrl = $this->buildFilemanagerUrl($akey);
return \Tpl::view('filemanager/filemanager', [
'filemanager_url' => $filemanagerUrl,
]);
}
private function ensureFilemanagerAccessKey(): string
{
$expiresAt = (int)($_SESSION['rfm_akey_expires'] ?? 0);
$existingKey = trim((string)($_SESSION['rfm_akey'] ?? ''));
if ($existingKey !== '' && $expiresAt >= time()) {
$_SESSION['rfm_akey_expires'] = time() + self::RFM_KEY_TTL;
return $existingKey;
}
try {
$newKey = bin2hex(random_bytes(16));
} catch (\Throwable $e) {
$newKey = sha1(uniqid('rfm', true));
}
$_SESSION['rfm_akey'] = $newKey;
$_SESSION['rfm_akey_expires'] = time() + self::RFM_KEY_TTL;
return $newKey;
}
private function buildFilemanagerUrl(string $akey): string
{
return self::FILEMANAGER_DIALOG_PATH . '?akey=' . rawurlencode($akey);
}
}

View File

@@ -14,24 +14,142 @@ class ProductArchiveController
public function list(): string public function list(): string
{ {
$current_page = \S::get_session( 'archive_products_list_current_page' ); $sortableColumns = ['id', 'name', 'price_brutto', 'price_brutto_promo', 'quantity'];
if ( !$current_page ) { $filterDefinitions = [
$current_page = 1; [
\S::set_session( 'archive_products_list_current_page', $current_page ); 'key' => 'phrase',
'label' => 'Nazwa / EAN / SKU',
'type' => 'text',
],
];
$listRequest = \admin\Support\TableListRequestFactory::fromRequest(
$filterDefinitions,
$sortableColumns,
'id',
[10, 15, 25, 50, 100],
10
);
$result = $this->productRepository->listArchivedForAdmin(
$listRequest['filters'],
$listRequest['sortColumn'],
$listRequest['sortDir'],
$listRequest['page'],
$listRequest['perPage']
);
$rows = [];
$lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1;
foreach ($result['items'] as $item) {
$id = (int)($item['id'] ?? 0);
$name = trim((string)($item['name'] ?? ''));
$sku = trim((string)($item['sku'] ?? ''));
$ean = trim((string)($item['ean'] ?? ''));
$imageSrc = trim((string)($item['image_src'] ?? ''));
$imageAlt = trim((string)($item['image_alt'] ?? ''));
$priceBrutto = (string)($item['price_brutto'] ?? '');
$priceBruttoPromo = (string)($item['price_brutto_promo'] ?? '');
$quantity = (int)($item['quantity'] ?? 0);
$combinations = (int)($item['combinations'] ?? 0);
if ($imageSrc === '') {
$imageSrc = '/admin/layout/images/no-image.png';
} elseif (!preg_match('#^(https?:)?//#i', $imageSrc) && strpos($imageSrc, '/') !== 0) {
$imageSrc = '/' . ltrim($imageSrc, '/');
}
$categories = trim((string)\admin\factory\ShopProduct::product_categories($id));
$categoriesHtml = '';
if ($categories !== '') {
$categoriesHtml = '<small class="text-muted product-categories">'
. htmlspecialchars($categories, ENT_QUOTES, 'UTF-8')
. '</small>';
}
$skuEanParts = [];
if ($sku !== '') {
$skuEanParts[] = 'SKU: ' . htmlspecialchars($sku, ENT_QUOTES, 'UTF-8');
}
if ($ean !== '') {
$skuEanParts[] = 'EAN: ' . htmlspecialchars($ean, ENT_QUOTES, 'UTF-8');
}
$skuEanHtml = '';
if (!empty($skuEanParts)) {
$skuEanHtml = '<small class="text-muted product-categories">' . implode(', ', $skuEanParts) . '</small>';
}
$productCell = '<div class="product-image product-archive-thumb-wrap">'
. '<img src="' . htmlspecialchars($imageSrc, ENT_QUOTES, 'UTF-8') . '" alt="' . htmlspecialchars($imageAlt, ENT_QUOTES, 'UTF-8') . '" '
. 'data-preview-src="' . htmlspecialchars($imageSrc, ENT_QUOTES, 'UTF-8') . '" '
. 'class="img-responsive product-archive-thumb-image js-product-archive-thumb-preview" loading="lazy">'
. '</div>'
. '<div class="product-name">'
. '<a href="/admin/shop_product/product_edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>'
. '</div>'
. $categoriesHtml
. $skuEanHtml;
$rows[] = [
'lp' => $lp++ . '.',
'product' => $productCell,
'price_brutto' => $priceBrutto !== '' ? $priceBrutto : '-',
'price_brutto_promo' => $priceBruttoPromo !== '' ? $priceBruttoPromo : '-',
'quantity' => (string)$quantity,
'_actions' => [
[
'label' => 'Przywroc',
'url' => '/admin/product_archive/unarchive/product_id=' . $id,
'class' => 'btn btn-xs btn-success',
'confirm' => 'Na pewno chcesz przywrocic wybrany produkt z archiwum?',
'confirm_ok' => 'Przywroc',
'confirm_cancel' => 'Anuluj',
],
],
];
} }
$query = \S::get_session( 'archive_products_list_query' ); $total = (int)$result['total'];
$query_array = []; $totalPages = max(1, (int)ceil($total / $listRequest['perPage']));
if ( $query ) {
parse_str( $query, $query_array );
}
return \Tpl::view( 'product_archive/products-list', [ $viewModel = new \admin\ViewModels\Common\PaginatedTableViewModel(
'current_page' => $current_page, [
'query_array' => $query_array, ['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
'pagination_max' => ceil( \admin\factory\ShopProduct::count_product( [ 'archive' => 1 ] ) / 10 ) ['key' => 'product', 'sort_key' => 'name', 'label' => 'Nazwa', 'sortable' => true, 'raw' => true],
] ); ['key' => 'price_brutto', 'sort_key' => 'price_brutto', 'label' => 'Cena', 'class' => 'text-center', 'sortable' => true],
['key' => 'price_brutto_promo', 'sort_key' => 'price_brutto_promo', 'label' => 'Cena promocyjna', 'class' => 'text-center', 'sortable' => true],
['key' => 'quantity', 'sort_key' => 'quantity', 'label' => 'Stan MG', 'class' => 'text-center', 'sortable' => true]
],
$rows,
$listRequest['viewFilters'],
[
'column' => $listRequest['sortColumn'],
'dir' => $listRequest['sortDir'],
],
[
'page' => $listRequest['page'],
'per_page' => $listRequest['perPage'],
'total' => $total,
'total_pages' => $totalPages,
],
array_merge($listRequest['queryFilters'], [
'sort' => $listRequest['sortColumn'],
'dir' => $listRequest['sortDir'],
'per_page' => $listRequest['perPage'],
]),
$listRequest['perPageOptions'],
$sortableColumns,
'/admin/product_archive/products_list/',
'Brak danych w tabeli.',
null,
null,
'product-archive/products-list-custom-script'
);
return \Tpl::view('product-archive/products-list', [
'viewModel' => $viewModel,
]);
} }
public function unarchive(): void public function unarchive(): void

View File

@@ -227,6 +227,14 @@ class Site
new \Domain\Product\ProductRepository( $mdb ) new \Domain\Product\ProductRepository( $mdb )
); );
}, },
// Alias dla starego modułu /admin/archive/products_list/
'Archive' => function() {
global $mdb;
return new \admin\Controllers\ProductArchiveController(
new \Domain\Product\ProductRepository( $mdb )
);
},
'Dictionaries' => function() { 'Dictionaries' => function() {
global $mdb; global $mdb;
@@ -234,6 +242,9 @@ class Site
new \Domain\Dictionaries\DictionariesRepository( $mdb ) new \Domain\Dictionaries\DictionariesRepository( $mdb )
); );
}, },
'Filemanager' => function() {
return new \admin\Controllers\FilemanagerController();
},
]; ];
return self::$newControllers; return self::$newControllers;

View File

@@ -1,30 +0,0 @@
<?
namespace admin\controls;
/**
* @deprecated Użyj \admin\Controllers\ProductArchiveController
* Klasa zachowana jako fallback dla starego URL /admin/archive/products_list/
*/
class Archive {
static public function products_list() {
$current_page = \S::get_session( 'archive_products_list_current_page' );
if ( !$current_page ) {
$current_page = 1;
\S::set_session( 'archive_products_list_current_page', $current_page );
}
$query = \S::get_session( 'archive_products_list_query' );
if ( $query ) {
$query_array = [];
parse_str( $query, $query_array );
}
return \Tpl::view( 'product_archive/products-list', [
'current_page' => $current_page,
'query_array' => $query_array,
'pagination_max' => ceil( \admin\factory\ShopProduct::count_product() / 10 )
] );
}
}

View File

@@ -1,11 +0,0 @@
<?php
namespace admin\controls;
class Filemanager
{
static public function draw()
{
return \Tpl::view( 'filemanager/filemanager' );
}
}
?>

View File

@@ -257,23 +257,11 @@ class ShopProduct
// ajax_load_products ARCHIVE // ajax_load_products ARCHIVE
static public function ajax_load_products_archive() static public function ajax_load_products_archive()
{ {
$response = [ 'status' => 'error', 'msg' => 'Podczas ładowania produktów wystąpił błąd. Proszę spróbować ponownie.' ]; echo json_encode( [
'status' => 'deprecated',
\S::set_session( 'products_list_current_page', \S::get( 'current_page' ) ); 'msg' => 'Endpoint nie jest juz wspierany. Uzyj /admin/product_archive/products_list/.',
\S::set_session( 'products_list_query', \S::get( 'query' ) ); 'redirect_url' => '/admin/product_archive/products_list/'
] );
if ( $products = \admin\factory\ShopProduct::ajax_products_list_archive( \S::get_session( 'products_list_current_page' ), \S::get_session( 'products_list_query' ) ) ) {
$response = [
'status' => 'ok',
'pagination_max' => ceil( $products['products_count'] / 10 ),
'html' => \Tpl::view( 'product_archive/products-list-table', [
'products' => $products['products'],
'current_page' => \S::get( 'current_page' ),
] )
];
}
echo json_encode( $response );
exit; exit;
} }

View File

@@ -1,7 +0,0 @@
<?php
namespace admin\view;
class FileManager
{
}
?>

BIN
updates/0.10/ver_0.200.zip Normal file

Binary file not shown.

View File

@@ -0,0 +1,8 @@
# Deleted files for update ver_0.200
# Generated: 2026-02-11 00:02:27
admin/templates/product_archive/products-list-table.php
admin/templates/product_archive/products-list.php
autoload/admin/controls/class.Archive.php
autoload/admin/controls/class.Filemanager.php
autoload/admin/view/class.FileManager.php