refactor(shop_category): migrate admin module to Domain+DI with routing and ajax cleanup

This commit is contained in:
2026-02-15 15:32:23 +01:00
parent e17875526d
commit 6c87e4615a
63 changed files with 8998 additions and 625 deletions

View File

@@ -0,0 +1,153 @@
<style type="text/css">
.layout-tree-toggle {
width: 18px;
height: 18px;
display: inline-flex;
align-items: center;
justify-content: center;
border: 0;
background: transparent;
padding: 0;
margin-right: 4px;
margin-top: -2px;
color: #666;
cursor: pointer;
vertical-align: middle;
}
.layout-tree-toggle i.fa.fa-caret-right {
position: relative;
top: -11px;
line-height: 1;
}
.layout-tree-toggle:focus,
.layout-tree-toggle:active,
.layout-tree-toggle:focus-visible {
outline: none;
box-shadow: none;
}
li.sort-expanded > div .layout-tree-toggle i {
transform: rotate(90deg);
}
</style>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$(document).ready(function() {
function refreshTreeDisclosureState() {
$('ol.sortable li').each(function() {
var $li = $(this);
var hasChildren = $li.children('ol').children('li').length > 0;
var $disclose = $li.children('div').children('.disclose');
if (hasChildren) {
$li.removeClass('sort-leaf');
if (!$li.hasClass('sort-collapsed') && !$li.hasClass('sort-expanded'))
$li.addClass('sort-collapsed');
$li.addClass('sort-branch');
$disclose.attr('aria-expanded', $li.hasClass('sort-expanded') ? 'true' : 'false');
$disclose.show();
} else {
$li.removeClass('sort-branch sort-collapsed sort-expanded').addClass('sort-leaf');
$disclose.attr('aria-expanded', 'false');
$disclose.hide();
}
});
}
function saveCategoriesOrder() {
var categories = $('#sortable').nestedSortable('toArray', { startDepthCount: 0 });
$.ajax({
type: 'POST',
cache: false,
url: '/admin/shop_category/save_categories_order/',
data: {
categories: categories
},
beforeSend: function() {
$.prompt('Trwa zapisywanie...', { title: 'Proszę czekać' });
},
success: function(data) {
$('.jqibox').remove();
var response = jQuery.parseJSON(data);
if (response.status === 'error')
create_error(response.msg);
}
});
}
$('body').on('click', '.category-delete', function() {
var category_id = $(this).attr('category-id');
$.prompt('Na pewno chcesz usunąć wybraną kategorię?', {
title: 'Potwierdź?',
buttons: { 'Tak': true, 'Nie': false },
submit: function(e, v) {
if (v === true)
document.location.href = '/admin/shop_category/category_delete/id=' + category_id;
}
});
});
$('ol.sortable').nestedSortable({
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .9,
placeholder: 'placeholder',
revert: 250,
tabSize: 45,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 4,
isTree: true,
expandOnHover: 700,
protectRoot: false,
stop: function() {
saveCategoriesOrder();
}
});
refreshTreeDisclosureState();
$('body').on('click', '.disclose', function() {
var $li = $(this).closest('li');
if (!$li.hasClass('sort-branch')) return;
$li.toggleClass('sort-collapsed').toggleClass('sort-expanded');
$(this).attr('aria-expanded', $li.hasClass('sort-expanded') ? 'true' : 'false');
this.blur();
});
$('.disclose').mousedown(function(e) {
if (e.which === 1) {
var category_id = $(this).parent('div').parent('li').attr('id');
$.ajax({
type: 'POST',
cache: false,
url: '/admin/shop_category/cookie_categories/',
data: {
category_id: category_id
}
});
}
});
<?php
$array = isset($_COOKIE['cookie_categories']) ? @unserialize($_COOKIE['cookie_categories']) : [];
if (is_array($array)):
foreach ($array as $key => $val):
if ($val):
?>
$('#<?= $key; ?>').children('div').children('button.disclose').click();
<?php
endif;
endforeach;
endif;
?>
});
</script>

View File

@@ -8,7 +8,9 @@ ob_start();
<? if ( is_array( $this -> categories ) ): foreach ( $this -> categories as $category ):?>
<li id="list_<?= $category['id'];?>" class="category_<?= $category['id'];?>" category="<?= $category['id'];?>">
<div class="context_0 content content_menu">
<span class="disclose"><span></span></span>
<button type="button" class="disclose layout-tree-toggle" aria-expanded="false" title="Rozwin / zwin">
<i class="fa fa-caret-right"></i>
</button>
<? if ( !$category['status'] ) echo '<i class="fa fa-ban fa-lg text-danger" title="Kategoria nieaktywna"></i>';?>
<b><?= $category['languages'][$this -> dlang]['title'];?></b>
<div class="btn-group ml20 pull-right">
@@ -27,7 +29,7 @@ ob_start();
</div>
</div>
<?= \Tpl::view( 'shop-category/subcategories-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category['id'] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category['id'] ),
'level' => $this -> level + 1,
'dlang' => $this -> dlang
] );?>
@@ -56,108 +58,4 @@ $grid -> external_code = $out;
echo $grid -> draw();
?>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$( document ).ready( function()
{
$( 'body' ).on( 'click', '.category-delete', function()
{
var category_id = $( this ).attr( 'category-id' );
$.prompt( "Na pewno chcesz usunąć wybraną kategorię?",
{
title: "Potwierdź?",
buttons: { "Tak": true, "Nie": false },
submit: function( e, v, m, f )
{
if ( v === true )
document.location.href = '/admin/shop_category/category_delete/id=' + category_id;
}
});
});
$( 'ol.sortable' ).nestedSortable(
{
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .9,
placeholder: 'placeholder',
revert: 250,
tabSize: 45,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 4,
isTree: true,
expandOnHover: 700,
protectRoot: false,
stop: function() {
save_categories_order();
}
});
$( '.disclose' ).on( 'click', function()
{
$( this ).closest( 'li' ).toggleClass( 'sort-collapsed' ).toggleClass( 'sort-expanded' );
});
$( '.disclose' ).mousedown( function(e)
{
if ( e.which === 1 )
{
var category_id = $( this ).parent( 'div' ).parent( 'li' ).attr( 'id' );
$.ajax(
{
type: 'POST',
cache: false,
url: '/admin/ajax.php',
data: {
a: 'cookie_categories',
category_id: category_id
}
});
}
});
<?php
$array = unserialize( $_COOKIE[ 'cookie_categories' ] );
if ( is_array( $array ) ): foreach ( $array as $key => $val ):
if ( $val ):
?>$( '#<?= $key;?>' ).children( 'div' ).children( 'span.disclose' ).click();<?
endif;
endforeach; endif;
?>
});
function save_categories_order( )
{
categories = $( '#sortable' ).nestedSortable( 'toArray', { startDepthCount: 0 } );
$.ajax(
{
type: 'POST',
cache: false,
url: '/admin/ajax.php',
data:
{
a: 'save_categories_order',
categories: categories
},
beforeSend: function()
{
$.prompt( 'Trwa zapisywanie...', { title: 'Proszę czekać' } );
},
success: function( data )
{
$( '.jqibox' ).remove();
response = jQuery.parseJSON( data );
if ( response.status === 'error' )
create_error( response.msg );
}
});
}
</script>
<?= \Tpl::view( 'shop-category/categories-list-custom-script' ); ?>

View File

@@ -0,0 +1,106 @@
<style type="text/css">
.layout-tree-toggle {
width: 18px;
height: 18px;
display: inline-flex;
align-items: center;
justify-content: center;
border: 0;
background: transparent;
padding: 0;
margin-right: 4px;
color: #666;
cursor: pointer;
}
.layout-tree-toggle:focus,
.layout-tree-toggle:active,
.layout-tree-toggle:focus-visible {
outline: none;
box-shadow: none;
}
li.sort-expanded > div .layout-tree-toggle i {
transform: rotate(90deg);
}
</style>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$(document).ready(function() {
function refreshTreeDisclosureState() {
$('ol.sortable li').each(function() {
var $li = $(this);
var hasChildren = $li.children('ol').children('li').length > 0;
var $disclose = $li.children('div').children('.disclose');
if (hasChildren) {
$li.removeClass('sort-leaf');
if (!$li.hasClass('sort-collapsed') && !$li.hasClass('sort-expanded'))
$li.addClass('sort-collapsed');
$li.addClass('sort-branch');
$disclose.attr('aria-expanded', $li.hasClass('sort-expanded') ? 'true' : 'false');
$disclose.show();
} else {
$li.removeClass('sort-branch sort-collapsed sort-expanded').addClass('sort-leaf');
$disclose.attr('aria-expanded', 'false');
$disclose.hide();
}
});
}
$('ol.sortable').nestedSortable({
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .9,
placeholder: 'placeholder',
revert: 250,
tabSize: 45,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 4,
isTree: true,
expandOnHover: 700,
protectRoot: false
});
refreshTreeDisclosureState();
$('body').on('click', '.disclose', function() {
var $li = $(this).closest('li');
if (!$li.hasClass('sort-branch')) return;
$li.toggleClass('sort-collapsed').toggleClass('sort-expanded');
$(this).attr('aria-expanded', $li.hasClass('sort-expanded') ? 'true' : 'false');
this.blur();
});
$('.disclose').mousedown(function(e) {
if (e.which === 1) {
var category_id = $(this).parent('div').parent('li').attr('id');
$.ajax({
type: 'POST',
cache: false,
url: '/admin/shop_category/cookie_categories/',
data: {
category_id: category_id
}
});
}
});
<?php
$array = isset($_COOKIE['cookie_categories']) ? @unserialize($_COOKIE['cookie_categories']) : [];
if (is_array($array)):
foreach ($array as $key => $val):
if ($val):
?>
$('#<?= $key; ?>').children('div').children('button.disclose').click();
<?php
endif;
endforeach;
endif;
?>
});
</script>

View File

@@ -7,7 +7,9 @@ ob_start();
<? if ( is_array( $this -> categories ) ): foreach ( $this -> categories as $category ):?>
<li id="list_<?= $category['id'];?>" class="category_<?= $category['id'];?>" category="<?= $category['id'];?>">
<div class="context_0 content content_menu">
<span class="disclose"><span></span></span>
<button type="button" class="disclose layout-tree-toggle" aria-expanded="false" title="Rozwin / zwin">
<i class="fa fa-caret-right"></i>
</button>
<? if ( !$category['status'] ) echo '<i class="fa fa-ban fa-lg text-danger" title="Kategoria nieaktywna"></i>';?>
<b><?= $category['languages'][$this -> dlang]['title'];?></b>
<div class="btn-group ml20 pull-right">
@@ -17,7 +19,7 @@ ob_start();
</div>
</div>
<?= \Tpl::view( 'shop-category/subcategory-browse-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category['id'] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category['id'] ),
'level' => $this -> level + 1,
'dlang' => $this -> dlang
] );?>
@@ -54,53 +56,4 @@ echo $grid -> draw();
float: none;
}
</style>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$( document ).ready( function() {
$( 'ol.sortable' ).nestedSortable({
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .9,
placeholder: 'placeholder',
revert: 250,
tabSize: 45,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 4,
isTree: true,
expandOnHover: 700,
protectRoot: false
});
$( '.disclose' ).on( 'click', function() {
$( this ).closest( 'li' ).toggleClass( 'sort-collapsed' ).toggleClass( 'sort-expanded' );
});
$( '.disclose' ).mousedown( function(e) {
if ( e.which === 1 ) {
var category_id = $( this ).parent( 'div' ).parent( 'li' ).attr( 'id' );
$.ajax({
type: 'POST',
cache: false,
url: '/admin/ajax.php',
data: {
a: 'cookie_categories',
category_id: category_id
}
});
}
});
<?php
$array = unserialize( $_COOKIE[ 'cookie_categories' ] );
if ( is_array( $array ) ): foreach ( $array as $key => $val ):
if ( $val ):
?>$( '#<?= $key;?>' ).children( 'div' ).children( 'span.disclose' ).click();<?
endif;
endforeach; endif;
?>
});
</script>
<?= \Tpl::view( 'shop-category/category-browse-custom-script' ); ?>

View File

@@ -0,0 +1,53 @@
<script type="text/javascript">
$( function() {
disable_menu();
$( '#settings-tabs' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'settings-tabs',
type: 'vertical'
});
$( '#languages-main' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'languages-main'
});
$( '#languages-seo' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'languages-seo'
});
});
function generate_seo_links( lang, title, category_id )
{
if ( title === '' )
return false;
$.ajax({
type: 'POST',
cache: false,
url: '/admin/pages/generateSeoLink/',
data: {
title: title,
category_id: category_id
},
beforeSend: function() {
$( '#overlay' ).show();
},
success: function( data ) {
$( '#overlay' ).hide();
var response = jQuery.parseJSON( data );
if ( response.status === 'ok' )
$( '#seo_link_' + lang ).val( response.seo_link );
else
create_error( response.msg );
}
});
}
</script>

View File

@@ -1,64 +1,5 @@
<script type="text/javascript" src="/libraries/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="/libraries/ckeditor/adapters/jquery.js"></script>
<script type="text/javascript">
$( function()
{
disable_menu();
$( '#settings-tabs' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'settings-tabs',
type: 'vertical'
});
$( '#languages-main' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'languages-main'
});
$( '#languages-seo' ).easyResponsiveTabs({
width: 'auto',
fit: true,
tabidentify: 'languages-seo'
});
$( '#page_type' ).trigger( 'change' );
});
function generate_seo_links( lang, title, category_id )
{
if ( title === '' )
return false;
$.ajax(
{
type: 'POST',
cache: false,
url: '/admin/pages/generateSeoLink/',
data: {
title: title,
category_id: category_id
},
beforeSend: function()
{
$( '#overlay' ).show();
},
success: function( data )
{
$( '#overlay' ).hide();
response = jQuery.parseJSON( data );
if ( response.status === 'ok' )
$( '#seo_link_' + lang ).val( response.seo_link );
else
create_error( response.msg );
}
});
}
</script>
<?
global $db;
@@ -146,7 +87,7 @@ ob_start();
'label' => 'Sortowanie produktĂłw',
'name' => 'sort_type',
'id' => 'sort_type',
'values' => \admin\factory\ShopCategory::$_sort_types,
'values' => is_array( $this -> sort_types ) ? $this -> sort_types : [],
'value' => $this -> category['sort_type']
]
);?>
@@ -264,3 +205,5 @@ $grid -> id_param = 'id';
echo $grid -> draw();
?>
<?= \Tpl::view( 'shop-category/category-edit-custom-script' ); ?>

View File

@@ -0,0 +1,62 @@
<style type="text/css">
.layout-tree-toggle {
width: 18px;
height: 18px;
display: inline-flex;
align-items: center;
justify-content: center;
border: 0;
background: transparent;
padding: 0;
margin-right: 6px;
color: #666;
cursor: move;
}
</style>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$(document).ready(function() {
function saveProductsOrder() {
var products = $('ol.sortable').nestedSortable('toArray', { startDepthCount: 0 });
$.ajax({
type: 'POST',
cache: false,
url: '/admin/shop_category/save_products_order/',
data: {
category_id: <?= (int)$this->category_id; ?>,
products: products
},
beforeSend: function() {
$.prompt('Trwa zapisywanie...', { title: 'Proszę czekać' });
},
success: function(data) {
$('.jqibox').remove();
var response = jQuery.parseJSON(data);
if (response.status === 'error')
create_error(response.msg);
}
});
}
$('ol.sortable').nestedSortable({
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .6,
placeholder: 'placeholder',
revert: 250,
tabSize: 25,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 1,
isTree: true,
expandOnHover: 700,
stop: function() {
saveProductsOrder();
}
});
});
</script>

View File

@@ -9,7 +9,7 @@ ob_start();
{
?>
<li id="list_<?= $product['product_id'];?>">
<div class="content <? if ( !$product['status'] ) echo 'text-danger';?>"><span class="disclose"><span></span></span> <?= $product['name'];?></div>
<div class="content <? if ( !$product['status'] ) echo 'text-danger';?>"><button type="button" class="disclose layout-tree-toggle" aria-expanded="false" title="Przesuń"><i class="fa fa-arrows"></i></button> <?= $product['name'];?></div>
</li>
<?
}
@@ -34,56 +34,4 @@ $grid -> buttons = [
];
echo $grid -> draw();
?>
<script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
<script type="text/javascript">
$( document ).ready( function()
{
$( 'ol.sortable' ).nestedSortable(
{
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .6,
placeholder: 'placeholder',
revert: 250,
tabSize: 25,
tolerance: 'pointer',
toleranceElement: '> div',
maxLevels: 1,
isTree: true,
expandOnHover: 700,
save_articles_order: true
});
});
function save_articles_order()
{
products = $( 'ol.sortable' ).nestedSortable( 'toArray', { startDepthCount: 0 } );
$.ajax(
{
type: 'POST',
cache: false,
url: '/admin/ajax.php',
data:
{
a: 'save_products_order',
category_id: <?= $this -> category_id;?>,
products: products
},
beforeSend: function()
{
$.prompt( 'Trwa zapisywanie...', { title: 'Proszę czekać' } );
},
success: function( data )
{
$( '.jqibox' ).remove();
response = jQuery.parseJSON( data );
if ( response.status === 'error' )
create_error( response.msg );
}
});
}
</script>
<?= \Tpl::view( 'shop-category/category-products-custom-script', [ 'category_id' => $this -> category_id ] ); ?>

View File

@@ -3,7 +3,9 @@
<? foreach ( $this -> categories as $category ):?>
<li id="list_<?= $category['id'];?>" class="list_<?= $category['id'];?>" category="<?= $category['id'];?>">
<div class="context_0 content content_menu">
<span class="disclose"><span></span></span>
<button type="button" class="disclose layout-tree-toggle" aria-expanded="false" title="Rozwin / zwin">
<i class="fa fa-caret-right"></i>
</button>
<? if ( !$category['status'] ) echo '<i class="fa fa-ban fa-lg text-danger" title="Kategoria nieaktywna"></i>';?>
<b><?= $category['languages'][$this -> dlang]['title'];?></b>
<div class="btn-group ml20 pull-right">
@@ -24,7 +26,7 @@
</div>
</div>
<?= \Tpl::view( 'shop-category/subcategories-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category['id'] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category['id'] ),
'level' => $this -> level + 1,
'dlang' => $this -> dlang
] );?>

View File

@@ -3,7 +3,9 @@
<? foreach ( $this -> categories as $category ):?>
<li id="list_<?= $category['id'];?>" class="list_<?= $category['id'];?>" category="<?= $category['id'];?>">
<div class="context_0 content content_menu">
<span class="disclose"><span></span></span>
<button type="button" class="disclose layout-tree-toggle" aria-expanded="false" title="Rozwin / zwin">
<i class="fa fa-caret-right"></i>
</button>
<? if ( !$category['status'] ) echo '<i class="fa fa-ban fa-lg text-danger" title="Kategoria nieaktywna"></i>';?>
<b><?= $category['languages'][$this -> dlang]['title'];?></b>
<div class="btn-group ml20 pull-right">
@@ -13,7 +15,7 @@
</div>
</div>
<?= \Tpl::view( 'shop-category/subcategory-browse-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category['id'] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category['id'] ),
'level' => $this -> level + 1,
'dlang' => $this -> dlang
] );?>

View File

@@ -97,7 +97,7 @@
<b><?= $category['languages'][$this->dlang]['title']; ?></b>
</div>
<?= \Tpl::view( 'shop-product/subcategories-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category['id'] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category['id'] ),
'level' => ($this->level ?? 0) + 1,
'dlang' => $this->dlang,
'name' => 'mass_categories[]'

View File

@@ -511,7 +511,7 @@ ob_start();
</div>
<?=
\Tpl::view('shop-product/subcategories-list', [
'categories' => \admin\factory\ShopCategory::subcategories($category['id']),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories($category['id']),
'product_categories' => $this->product['categories'],
'dlang' => $this->dlang
]);

View File

@@ -12,7 +12,7 @@
</div>
<?=
\Tpl::view( 'shop-product/subcategories-list', [
'categories' => \admin\factory\ShopCategory::subcategories( $category[ 'id' ] ),
'categories' => ( new \Domain\Category\CategoryRepository( $GLOBALS['mdb'] ) )->subcategories( $category[ 'id' ] ),
'product_categories' => $this -> product_categories,
'dlang' => $this -> dlang,
'name' => $this -> name

View File

@@ -56,7 +56,7 @@
<ul>
<li> <a href="/admin/shop_order/view_list/"><img src="/admin/layout/icon/icon-menu/shopping-cart.svg">Zam&#243;wienia</a></li>
<li> <a href="/admin/shop_clients/list/"><img src="/admin/layout/icon/icon-menu/people-fill.svg">Klienci</a></li>
<li><a href="/admin/shop_category/view_list/"><img src="/admin/layout/icon/icon-menu/bxs-category-alt.svg">Kategorie</a></li>
<li><a href="/admin/shop_category/list/"><img src="/admin/layout/icon/icon-menu/bxs-category-alt.svg">Kategorie</a></li>
<li><a href="/admin/shop_product/view_list/"><img src="/admin/layout/icon/icon-menu/shopping-basket.svg">Produkty</a></li>
<li><a href="/admin/shop_product/mass_edit/"><i class="fa fa-bars"></i>Masowa edycja</a></li>
<li>