refactor newsletter module and disable prepare/user templates
This commit is contained in:
@@ -249,3 +249,41 @@ Przypisanie layoutow do kategorii sklepu.
|
||||
**Uzywane w:** `Domain\\Layouts\\LayoutsRepository`, `front\\factory\\Layouts`
|
||||
|
||||
**Aktualizacja 2026-02-12 (ver. 0.256):** modul `/admin/layouts` korzysta z `Domain\\Layouts\\LayoutsRepository` (DI kontroler + fasada legacy).
|
||||
|
||||
## pp_newsletter
|
||||
Adresy e-mail zapisane do newslettera.
|
||||
|
||||
| Kolumna | Opis |
|
||||
|---------|------|
|
||||
| id | PK |
|
||||
| email | Adres e-mail subskrybenta |
|
||||
| hash | Hash potwierdzenia/wypisu |
|
||||
| status | 1 = potwierdzony, 0 = oczekujacy |
|
||||
|
||||
**Uzywane w:** `Domain\\Newsletter\\NewsletterRepository`, `front\\factory\\Newsletter`
|
||||
|
||||
## pp_newsletter_send
|
||||
Kolejka wysylki newslettera.
|
||||
|
||||
| Kolumna | Opis |
|
||||
|---------|------|
|
||||
| id | PK |
|
||||
| email | Adres docelowy |
|
||||
| dates | Zakres dat artykulow (tekst) |
|
||||
| id_template | FK do `pp_newsletter_templates` (NULL gdy brak szablonu) |
|
||||
|
||||
**Uzywane w:** `Domain\\Newsletter\\NewsletterRepository`, `front\\factory\\Newsletter::newsletter_send()`
|
||||
|
||||
## pp_newsletter_templates
|
||||
Szablony tresci e-maili (uzytkownik + administracyjne/systemowe).
|
||||
|
||||
| Kolumna | Opis |
|
||||
|---------|------|
|
||||
| id | PK |
|
||||
| name | Nazwa/klucz szablonu |
|
||||
| text | Tresc HTML szablonu |
|
||||
| is_admin | 1 = szablon administracyjny/systemowy, 0 = szablon uzytkownika |
|
||||
|
||||
**Uzywane w:** `Domain\\Newsletter\\NewsletterRepository`, `admin\\Controllers\\NewsletterController`, `front\\factory\\Newsletter`
|
||||
|
||||
**Aktualizacja 2026-02-12 (ver. 0.257):** modul `/admin/newsletter` korzysta z `Domain\\Newsletter\\NewsletterRepository` (DI kontroler + fasada legacy).
|
||||
|
||||
@@ -419,3 +419,21 @@ Aktualnie w suite są też testy modułów `Dictionaries`, `Articles` i `Users`
|
||||
- CLEANUP: usuniete legacy klasy `autoload/admin/controls/class.Layouts.php`, `autoload/admin/view/class.Layouts.php`; `admin/factory/class.Layouts.php` dziala jako fasada do `Domain\\Layouts\\LayoutsRepository`.
|
||||
- UPDATE: `admin\\Controllers\\ArticlesController` pobiera layouty przez `Domain\\Layouts\\LayoutsRepository` (DI).
|
||||
- Testy: 141 tests, 336 assertions
|
||||
|
||||
## Aktualizacja 2026-02-12 (ver. 0.257)
|
||||
- NOWE: `Domain\\Newsletter\\NewsletterRepository` (subskrybenci, szablony, ustawienia, kolejka wysylki).
|
||||
- NOWE: `Domain\\Newsletter\\NewsletterPreviewRenderer` (render podgladu newslettera).
|
||||
- NOWE: `admin\\Controllers\\NewsletterController` (DI) dla akcji `emails_list`, `prepare`, `send`, `preview`, `settings*`, `email_template*`.
|
||||
- UPDATE: `/admin/newsletter/*` przepiete z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit`.
|
||||
- UPDATE: nowy endpoint podgladu `/admin/newsletter/preview/` (bez `admin/ajax.php`).
|
||||
- UPDATE: `admin\\Site` ma fabryke DI dla modulu `Newsletter`.
|
||||
- UPDATE: `admin\\factory\\Newsletter` dziala jako fasada do `Domain\\Newsletter\\NewsletterRepository`.
|
||||
- UPDATE: `front\\factory\\Newsletter` nie korzysta z `admin\\view\\Newsletter`.
|
||||
- CLEANUP: usuniete legacy klasy `autoload/admin/controls/class.Newsletter.php`, `autoload/admin/view/class.Newsletter.php`.
|
||||
- Testy: 150 tests, 372 assertions
|
||||
|
||||
## Aktualizacja 2026-02-12 (ver. 0.258)
|
||||
- UPDATE: modul `/admin/newsletter/` - tymczasowo wylaczono akcje `prepare/send/preview` (Wysylka - przygotowanie).
|
||||
- UPDATE: modul `/admin/newsletter/` - tymczasowo wylaczono liste `email_templates_user` (Szablony uzytkownika).
|
||||
- UPDATE: lista i edycja szablonow newslettera w panelu ograniczona do szablonow administracyjnych (`is_admin = 1`).
|
||||
- CLEANUP: usuniete nieuzywane widoki: `admin/templates/newsletter/prepare.php`, `admin/templates/newsletter/preview.php`, `admin/templates/newsletter/email-templates-user.php`.
|
||||
|
||||
@@ -614,3 +614,23 @@ Gdy `persist = true`:
|
||||
- UPDATE: `admin\\Controllers\\ArticlesController` korzysta z `Domain\\Layouts\\LayoutsRepository` (DI) dla listy layoutow
|
||||
|
||||
- Testy po zmianie: **141 tests, 336 assertions**
|
||||
|
||||
## Aktualizacja 2026-02-12 (ver. 0.257)
|
||||
- **Newsletter** - **ZMIGROWANE** (2026-02-12)
|
||||
- NOWE: `Domain\\Newsletter\\NewsletterRepository` (listy admin, szablony, ustawienia, kolejka wysylki)
|
||||
- NOWE: `Domain\\Newsletter\\NewsletterPreviewRenderer` (wspolny render podgladu)
|
||||
- NOWE: `admin\\Controllers\\NewsletterController` (DI)
|
||||
- UPDATE: routing DI (`admin\\Site`) rozszerzony o modul `Newsletter`
|
||||
- UPDATE: widoki `/admin/newsletter/*` migrowane na `components/table-list` i `components/form-edit`
|
||||
- UPDATE: `admin\\factory\\Newsletter` jako fasada do repozytorium
|
||||
- UPDATE: `front\\factory\\Newsletter` bez zaleznosci od `admin\\view\\Newsletter`
|
||||
- CLEANUP: usuniete `autoload/admin/controls/class.Newsletter.php`, `autoload/admin/view/class.Newsletter.php`
|
||||
|
||||
- Testy po zmianie: **150 tests, 372 assertions**
|
||||
|
||||
## Aktualizacja 2026-02-12 (ver. 0.258)
|
||||
- **Newsletter**
|
||||
- UPDATE: tymczasowo wylaczono flow `prepare/send/preview` (wymaga przebudowy).
|
||||
- UPDATE: tymczasowo wylaczono modul `Szablony uzytkownika`.
|
||||
- UPDATE: aktywna obsluga tylko szablonow administracyjnych (`is_admin = 1`).
|
||||
- CLEANUP: usuniete nieuzywane widoki `prepare.php`, `preview.php`, `email-templates-user.php`.
|
||||
|
||||
18
TESTING.md
18
TESTING.md
@@ -206,3 +206,21 @@ Nowe testy dodane 2026-02-12:
|
||||
Zaktualizowane testy 2026-02-12:
|
||||
- `tests/Unit/Domain/Languages/LanguagesRepositoryTest.php` (defaultLanguageId)
|
||||
- `tests/Unit/admin/Controllers/ArticlesControllerTest.php` (konstruktor + LayoutsRepository)
|
||||
|
||||
## Aktualizacja suite (release 0.257)
|
||||
Ostatnio zweryfikowano: 2026-02-12
|
||||
|
||||
```text
|
||||
OK (150 tests, 372 assertions)
|
||||
```
|
||||
|
||||
Nowe testy dodane 2026-02-12:
|
||||
- `tests/Unit/Domain/Newsletter/NewsletterRepositoryTest.php`
|
||||
- `tests/Unit/admin/Controllers/NewsletterControllerTest.php`
|
||||
|
||||
## Aktualizacja suite (release 0.258)
|
||||
Ostatnio zweryfikowano: 2026-02-12
|
||||
|
||||
```text
|
||||
OK (150 tests, 372 assertions)
|
||||
```
|
||||
|
||||
@@ -1,67 +1 @@
|
||||
<script type="text/javascript" src="/libraries/ckeditor/ckeditor.js"></script>
|
||||
<script type="text/javascript" src="/libraries/ckeditor/adapters/jquery.js"></script>
|
||||
<?
|
||||
global $db;
|
||||
ob_start();
|
||||
?>
|
||||
<?= \Html::input(
|
||||
array(
|
||||
'label' => 'Nazwa',
|
||||
'name' => 'name',
|
||||
'id' => 'name',
|
||||
'value' => $this -> email_template['name'],
|
||||
'inline' => true,
|
||||
'readonly' => $this -> email_template['is_admin'] ? true : false
|
||||
)
|
||||
);?>
|
||||
<?= \Html::textarea(
|
||||
array(
|
||||
'label' => 'Treść',
|
||||
'name' => 'text',
|
||||
'id' => 'text',
|
||||
'value' => $this ->email_template['text'],
|
||||
'inline' => true
|
||||
)
|
||||
);?>
|
||||
|
||||
<?
|
||||
$out = ob_get_clean();
|
||||
$grid = new \gridEdit;
|
||||
$grid -> id = 'email-templates-edit';
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> include_plugins = true;
|
||||
$grid -> title = 'Edycja szablonu newslettera';
|
||||
$grid -> fields = [
|
||||
[
|
||||
'db' => 'id',
|
||||
'type' => 'hidden',
|
||||
'value' => $this -> email_template['id']
|
||||
]
|
||||
];
|
||||
$grid -> external_code = $out;
|
||||
$grid -> actions = [
|
||||
'save' => [
|
||||
'url' => '/admin/newsletter/template_save/',
|
||||
'back_url' => $this -> email_template['is_admin'] ? '/admin/newsletter/email_templates_admin/' : '/admin/newsletter/email_templates_user/'
|
||||
],
|
||||
'cancel' => [
|
||||
'url' => $this -> email_template['is_admin'] ? '/admin/newsletter/email_templates_admin/' : '/admin/newsletter/email_templates_user/'
|
||||
]
|
||||
];
|
||||
$grid -> persist_edit = true;
|
||||
$grid -> id_param = 'id';
|
||||
|
||||
echo $grid -> draw();
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
$( function()
|
||||
{
|
||||
disable_menu();
|
||||
|
||||
$( '#text' ).ckeditor(
|
||||
{
|
||||
toolbar : 'MyTool',
|
||||
height:'350'
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<?= \Tpl::view('components/form-edit', ['form' => $this->form]); ?>
|
||||
@@ -1,28 +1 @@
|
||||
<?php
|
||||
global $gdb;
|
||||
|
||||
$grid = new \grid( 'pp_newsletter_templates' );
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> order = [ 'column' => 'name', 'type' => 'ASC' ];
|
||||
$grid -> where = [ 'is_admin' => 1 ];
|
||||
$grid -> columns_view = [
|
||||
[
|
||||
'name' => 'Lp.',
|
||||
'th' => [ 'class' => 'g-lp' ],
|
||||
'td' => [ 'class' => 'g-center' ],
|
||||
'autoincrement' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Nazwa',
|
||||
'db' => 'name',
|
||||
'php' => 'echo "<a href=\'/admin/newsletter/email_template_edit/id=[id]\'>[name]</a>";',
|
||||
'sort' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Edytuj',
|
||||
'action' => [ 'type' => 'edit', 'url' => '/admin/newsletter/email_template_edit/id=[id]' ],
|
||||
'th' => [ 'class' => 'g-center', 'style' => 'width: 70px;' ],
|
||||
'td' => [ 'class' => 'g-center' ]
|
||||
]
|
||||
];
|
||||
echo $grid -> draw();
|
||||
<?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?>
|
||||
@@ -1,42 +0,0 @@
|
||||
<?php
|
||||
global $gdb;
|
||||
|
||||
$grid = new \grid( 'pp_newsletter_templates' );
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> order = [ 'column' => 'name', 'type' => 'ASC' ];
|
||||
$grid -> where = [ 'is_admin' => 0 ];
|
||||
$grid -> columns_view = [
|
||||
[
|
||||
'name' => 'Lp.',
|
||||
'th' => [ 'class' => 'g-lp' ],
|
||||
'td' => [ 'class' => 'g-center' ],
|
||||
'autoincrement' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Nazwa',
|
||||
'db' => 'name',
|
||||
'php' => 'echo "<a href=\'/admin/newsletter/email_template_edit/id=[id]\'>[name]</a>";',
|
||||
'sort' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Edytuj',
|
||||
'action' => [ 'type' => 'edit', 'url' => '/admin/newsletter/email_template_edit/id=[id]' ],
|
||||
'th' => [ 'class' => 'g-center', 'style' => 'width: 70px;' ],
|
||||
'td' => [ 'class' => 'g-center' ]
|
||||
],
|
||||
[
|
||||
'name' => 'Usuń',
|
||||
'action' => [ 'type' => 'delete', 'url' => '/admin/newsletter/email_template_delete/id=[id]' ],
|
||||
'th' => [ 'class' => 'g-center', 'style' => 'width: 70px;' ],
|
||||
'td' => [ 'class' => 'g-center' ]
|
||||
]
|
||||
];
|
||||
$grid -> buttons = [
|
||||
[
|
||||
'label' => 'Dodaj szablon',
|
||||
'url' => '/admin/newsletter/email_template_edit/',
|
||||
'icon' => 'fa-plus-circle',
|
||||
'class' => 'btn-success'
|
||||
]
|
||||
];
|
||||
echo $grid -> draw();
|
||||
@@ -1,30 +1 @@
|
||||
<?php
|
||||
global $gdb;
|
||||
|
||||
$grid = new \grid( 'pp_newsletter' );
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> order = [ 'column' => 'email', 'type' => 'ASC' ];
|
||||
$grid -> search = [
|
||||
[ 'name' => 'Email', 'db' => 'email', 'type' => 'text' ]
|
||||
];
|
||||
$grid -> columns_view = [
|
||||
[
|
||||
'name' => 'Lp.',
|
||||
'th' => [ 'class' => 'g-lp' ],
|
||||
'td' => [ 'class' => 'g-center' ],
|
||||
'autoincrement' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Email',
|
||||
'db' => 'email',
|
||||
'sort' => true
|
||||
],
|
||||
[
|
||||
'name' => 'Potwierdzony',
|
||||
'db' => 'status',
|
||||
'sort' => true,
|
||||
'replace' => [ 'array' => [ 0 => '<span style="color: #FF0000;">nie</span>', 1 => 'tak' ] ]
|
||||
]
|
||||
];
|
||||
$grid -> actions = [ 'delete' => true ];
|
||||
echo $grid -> draw();
|
||||
<?= \Tpl::view('components/table-list', ['list' => $this->viewModel]); ?>
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
<?
|
||||
global $db;
|
||||
|
||||
ob_start();
|
||||
?>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-4 control-label">Zakres dat:</label>
|
||||
<div class="col-lg-8">
|
||||
<div class="input-group">
|
||||
<input type="text" id="dates" name="dates" data="search-column:date_add;search-type:date_range" class="form-control date-range require" value="">
|
||||
<span class="input-group-addon cursor date-range-icon">
|
||||
<i class="fa fa-calendar"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label class="col-12 control-label">lub / i</label>
|
||||
</div>
|
||||
<?
|
||||
$templates[''] = '---- szablon ----';
|
||||
if ( is_array( $this -> templates ) ): foreach ( $this -> templates as $template ):
|
||||
$templates[ $template['id'] ] = $template['name'];
|
||||
endforeach; endif;
|
||||
?>
|
||||
<?= \Html::select(
|
||||
array(
|
||||
'label' => 'Szablon',
|
||||
'name' => 'template',
|
||||
'id' => 'template',
|
||||
'values' => $templates,
|
||||
'value' => $this -> templates['id']
|
||||
));?>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-12 control-label">Podgląd:</label>
|
||||
<div class="col-12">
|
||||
<div id="newsletter-preview"></div>
|
||||
</div>
|
||||
</div>
|
||||
<?
|
||||
$out = ob_get_clean();
|
||||
|
||||
$grid = new \gridEdit;
|
||||
$grid -> id = 'newsletter-prepare';
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> include_plugins = true;
|
||||
$grid -> title = 'Wysyłka newslettera - przygotowanie';
|
||||
$grid -> default_buttons = false;
|
||||
$grid -> external_code = $out;
|
||||
$grid -> buttons = [
|
||||
[
|
||||
'label' => 'Wyślij newsletter',
|
||||
'class' => 'btn-success',
|
||||
'icon' => 'fa-send',
|
||||
'js' => 'send_newsletter();'
|
||||
]
|
||||
];
|
||||
echo $grid -> draw();
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
function send_newsletter()
|
||||
{
|
||||
var dates = $( '#dates' ).val();
|
||||
var template = $('#template').val();
|
||||
|
||||
if ( !dates && !template )
|
||||
$.prompt( 'Proszę wybrać zakres dat lub szablon.', { title: 'Błąd' } );
|
||||
|
||||
$( '#fg-newsletter-prepare' ).submit();
|
||||
return false;
|
||||
}
|
||||
|
||||
$( function()
|
||||
{
|
||||
$( '#fg-newsletter-prepare' ).attr( 'action', '/admin/newsletter/send/' );
|
||||
|
||||
$( 'body' ).on( 'change', '#dates', function()
|
||||
{
|
||||
var dates = $( this ).val();
|
||||
var template = $('#template').val();
|
||||
$.ajax(
|
||||
{
|
||||
type: 'POST',
|
||||
cache: false,
|
||||
url: '/admin/ajax.php',
|
||||
data: {
|
||||
a: 'newsletter-preview',
|
||||
dates: dates,
|
||||
template: template
|
||||
},
|
||||
beforeSend: function()
|
||||
{
|
||||
$( '#overlay' ).show();
|
||||
},
|
||||
success: function( response )
|
||||
{
|
||||
$( '#overlay' ).hide();
|
||||
$( '#newsletter-preview' ).html( response );
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$( 'body' ).on( 'change', '#template', function()
|
||||
{
|
||||
var dates = $( '#dates' ).val();
|
||||
var template = $( this ).val();
|
||||
|
||||
$.ajax(
|
||||
{
|
||||
type: 'POST',
|
||||
cache: false,
|
||||
url: '/admin/ajax.php',
|
||||
data: {
|
||||
a: 'newsletter-preview',
|
||||
template: template,
|
||||
dates: dates
|
||||
},
|
||||
beforeSend: function()
|
||||
{
|
||||
$( '#overlay' ).show();
|
||||
},
|
||||
success: function( response )
|
||||
{
|
||||
$( '#overlay' ).hide();
|
||||
$( '#newsletter-preview' ).html( response );
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@@ -1,41 +0,0 @@
|
||||
<div style="border-bottom: 1px solid #ccc;">
|
||||
<?= $this -> settings['newsletter_header'] ? $this -> settings['newsletter_header'] : '<p style="text-align: center;">--- brak zdefiniowanego nagłówka ---</p>';?>
|
||||
</div>
|
||||
<div style="border-bottom: 1px solid #ccc; padding: 10px 0 0 0;">
|
||||
<? if ( is_array( $this -> template ) ):?>
|
||||
<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px">
|
||||
<?=$this -> template['text']?>
|
||||
</div>
|
||||
<? endif;?>
|
||||
<? if ( is_array( $this -> articles ) ):?>
|
||||
<? foreach ( $this -> articles as $article ):?>
|
||||
<? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );?>
|
||||
<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px">
|
||||
<?
|
||||
$article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );
|
||||
?>
|
||||
<a href="http://<?= $_SERVER['SERVER_NAME'];?>/<?= $url;?>" title="<?= $article['language']['title'];?>" style="margin-bottom: 10px; display: block; font-size: 14px; color: #5b7fb1; font-weight: 600;">
|
||||
<?= $article['language']['title'];?>
|
||||
</a>
|
||||
<div>
|
||||
<?
|
||||
if ( $article['language']['entry'] )
|
||||
echo $article['language']['entry'];
|
||||
else
|
||||
echo $article['language']['text'];
|
||||
?>
|
||||
</div>
|
||||
<div style="clear: both;"></div>
|
||||
</div>
|
||||
<? endforeach;?>
|
||||
<? else:?>
|
||||
<? if ( $this -> dates ):?>
|
||||
<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px; text-align: center;">
|
||||
--- brak artykułów w danym okresie ---
|
||||
</div>
|
||||
<? endif;?>
|
||||
<? endif;?>
|
||||
</div>
|
||||
<div style="border-bottom: 1px solid #ccc; padding: 10px 0 0 0;">
|
||||
<?= $this -> settings['newsletter_footer'] ? $this -> settings['newsletter_footer'] : '<p style="text-align: center;">--- brak zdefiniowanej stopki ---</p>';?>
|
||||
</div>
|
||||
@@ -1,51 +1 @@
|
||||
<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()
|
||||
{
|
||||
$( 'textarea' ).ckeditor(
|
||||
{
|
||||
toolbar : 'MyTool',
|
||||
height: '150'
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<?
|
||||
global $db;
|
||||
|
||||
ob_start();
|
||||
|
||||
echo \Html::textarea(
|
||||
array(
|
||||
'label' => 'Nagłówek',
|
||||
'name' => 'newsletter_header',
|
||||
'id' => 'newsletter_header',
|
||||
'value' => $this -> settings['newsletter_header'],
|
||||
'inline' => true
|
||||
)
|
||||
);
|
||||
echo \Html::textarea(
|
||||
array(
|
||||
'label' => 'Stopka',
|
||||
'name' => 'newsletter_footer',
|
||||
'id' => 'newsletter_footer',
|
||||
'value' => $this -> settings['newsletter_footer'],
|
||||
'inline' => true
|
||||
)
|
||||
);
|
||||
|
||||
$out = ob_get_clean();
|
||||
|
||||
$grid = new \gridEdit;
|
||||
$grid -> id = 'settings-edit';
|
||||
$grid -> gdb_opt = $gdb;
|
||||
$grid -> include_plugins = true;
|
||||
$grid -> title = 'Edycja ustawień';
|
||||
$grid -> actions = [
|
||||
'save' => [ 'url' => '/admin/newsletter/settings_save/', 'back_url' => '/admin/newsletter/settings/' ],
|
||||
];
|
||||
$grid -> external_code = $out;
|
||||
echo $grid -> draw();
|
||||
?>
|
||||
<script>CKEDITOR.dtd.$removeEmpty['span'] = false;</script>
|
||||
<style type="text/css">#g-edit-cancel { display: none; }</style>
|
||||
<?= \Tpl::view('components/form-edit', ['form' => $this->form]); ?>
|
||||
@@ -89,9 +89,7 @@
|
||||
Newsletter
|
||||
</div>
|
||||
<ul>
|
||||
<li><a href="/admin/newsletter/prepare/"><img src="/admin/layout/icon/icon-menu/package(1).svg">Wysyłka - przygotowanie</a></li>
|
||||
<li><a href="/admin/newsletter/emails_list/"><img src="/admin/layout/icon/icon-menu/bx-at.svg">Baza emaili</a></li>
|
||||
<li><a href="/admin/newsletter/email_templates_user/"><img src="/admin/layout/icon/icon-menu/template(1).svg">Szablony użytkownika</a></li>
|
||||
<li><a href="/admin/newsletter/email_templates_admin/"><img src="/admin/layout/icon/icon-menu/template.svg">Szablony administracyjne</a></li>
|
||||
<li><a href="/admin/newsletter/settings/"><img src="/admin/layout/icon/icon-menu/baseline-settings.svg">Ustawienia</a></li>
|
||||
</ul>
|
||||
@@ -274,4 +272,4 @@
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
59
autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
Normal file
59
autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
Normal file
@@ -0,0 +1,59 @@
|
||||
<?php
|
||||
namespace Domain\Newsletter;
|
||||
|
||||
class NewsletterPreviewRenderer
|
||||
{
|
||||
public function render(array $articles, array $settings, ?array $template, string $dates = ''): string
|
||||
{
|
||||
$out = '<div style="border-bottom: 1px solid #ccc;">';
|
||||
$out .= !empty($settings['newsletter_header'])
|
||||
? (string)$settings['newsletter_header']
|
||||
: '<p style="text-align: center;">--- brak zdefiniowanego naglowka ---</p>';
|
||||
$out .= '</div>';
|
||||
|
||||
$out .= '<div style="border-bottom: 1px solid #ccc; padding: 10px 0 0 0;">';
|
||||
|
||||
if (is_array($template) && !empty($template)) {
|
||||
$out .= '<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px">';
|
||||
$out .= (string)($template['text'] ?? '');
|
||||
$out .= '</div>';
|
||||
}
|
||||
|
||||
if (is_array($articles) && !empty($articles)) {
|
||||
foreach ($articles as $article) {
|
||||
$articleId = (int)($article['id'] ?? 0);
|
||||
$title = (string)($article['language']['title'] ?? '');
|
||||
$seoLink = trim((string)($article['language']['seo_link'] ?? ''));
|
||||
$url = $seoLink !== '' ? $seoLink : ('a-' . $articleId . '-' . \S::seo($title));
|
||||
$entry = !empty($article['language']['entry'])
|
||||
? (string)$article['language']['entry']
|
||||
: (string)($article['language']['text'] ?? '');
|
||||
|
||||
$out .= '<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px">';
|
||||
$out .= '<a href="http://' . htmlspecialchars((string)($_SERVER['SERVER_NAME'] ?? ''), ENT_QUOTES, 'UTF-8') . '/'
|
||||
. htmlspecialchars($url, ENT_QUOTES, 'UTF-8')
|
||||
. '" title="' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8')
|
||||
. '" style="margin-bottom: 10px; display: block; font-size: 14px; color: #5b7fb1; font-weight: 600;">'
|
||||
. htmlspecialchars($title, ENT_QUOTES, 'UTF-8')
|
||||
. '</a>';
|
||||
$out .= '<div>' . $entry . '</div>';
|
||||
$out .= '<div style="clear: both;"></div>';
|
||||
$out .= '</div>';
|
||||
}
|
||||
} elseif (trim($dates) !== '') {
|
||||
$out .= '<div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px; text-align: center;">';
|
||||
$out .= '--- brak artykulow w danym okresie ---';
|
||||
$out .= '</div>';
|
||||
}
|
||||
|
||||
$out .= '</div>';
|
||||
|
||||
$out .= '<div style="border-bottom: 1px solid #ccc; padding: 10px 0 0 0;">';
|
||||
$out .= !empty($settings['newsletter_footer'])
|
||||
? (string)$settings['newsletter_footer']
|
||||
: '<p style="text-align: center;">--- brak zdefiniowanej stopki ---</p>';
|
||||
$out .= '</div>';
|
||||
|
||||
return $out;
|
||||
}
|
||||
}
|
||||
292
autoload/Domain/Newsletter/NewsletterRepository.php
Normal file
292
autoload/Domain/Newsletter/NewsletterRepository.php
Normal file
@@ -0,0 +1,292 @@
|
||||
<?php
|
||||
namespace Domain\Newsletter;
|
||||
|
||||
use Domain\Settings\SettingsRepository;
|
||||
|
||||
class NewsletterRepository
|
||||
{
|
||||
private const MAX_PER_PAGE = 100;
|
||||
|
||||
private $db;
|
||||
private SettingsRepository $settingsRepository;
|
||||
|
||||
public function __construct($db, ?SettingsRepository $settingsRepository = null)
|
||||
{
|
||||
$this->db = $db;
|
||||
$this->settingsRepository = $settingsRepository ?? new SettingsRepository($db);
|
||||
}
|
||||
|
||||
public function getSettings(): array
|
||||
{
|
||||
return $this->settingsRepository->getSettings();
|
||||
}
|
||||
|
||||
public function saveSettings(array $values): bool
|
||||
{
|
||||
$this->settingsRepository->updateSetting('newsletter_footer', (string)($values['newsletter_footer'] ?? ''));
|
||||
$this->settingsRepository->updateSetting('newsletter_header', (string)($values['newsletter_header'] ?? ''));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function queueSend(string $dates = '', int $templateId = 0): bool
|
||||
{
|
||||
$subscribers = $this->db->select('pp_newsletter', 'email', ['status' => 1]);
|
||||
if (!is_array($subscribers) || empty($subscribers)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$cleanDates = trim($dates);
|
||||
$templateId = $templateId > 0 ? $templateId : 0;
|
||||
|
||||
foreach ($subscribers as $subscriber) {
|
||||
$email = is_array($subscriber) ? (string)($subscriber['email'] ?? '') : (string)$subscriber;
|
||||
if ($email === '') {
|
||||
continue;
|
||||
}
|
||||
|
||||
$this->db->insert('pp_newsletter_send', [
|
||||
'email' => $email,
|
||||
'dates' => $cleanDates,
|
||||
'id_template' => $templateId > 0 ? $templateId : null,
|
||||
]);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function templateByName(string $templateName): string
|
||||
{
|
||||
return (string)$this->db->get('pp_newsletter_templates', 'text', ['name' => $templateName]);
|
||||
}
|
||||
|
||||
public function templateDetails(int $templateId): ?array
|
||||
{
|
||||
if ($templateId <= 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$row = $this->db->get('pp_newsletter_templates', '*', ['id' => $templateId]);
|
||||
if (!is_array($row)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $row;
|
||||
}
|
||||
|
||||
public function isAdminTemplate(int $templateId): bool
|
||||
{
|
||||
$isAdmin = $this->db->get('pp_newsletter_templates', 'is_admin', ['id' => $templateId]);
|
||||
return (int)$isAdmin === 1;
|
||||
}
|
||||
|
||||
public function deleteTemplate(int $templateId): bool
|
||||
{
|
||||
if ($templateId <= 0 || $this->isAdminTemplate($templateId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (bool)$this->db->delete('pp_newsletter_templates', ['id' => $templateId]);
|
||||
}
|
||||
|
||||
public function saveTemplate(int $templateId, string $name, string $text): ?int
|
||||
{
|
||||
$templateId = max(0, $templateId);
|
||||
$name = trim($name);
|
||||
|
||||
if ($templateId <= 0) {
|
||||
if ($name === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
$ok = $this->db->insert('pp_newsletter_templates', [
|
||||
'name' => $name,
|
||||
'text' => $text,
|
||||
'is_admin' => 0,
|
||||
]);
|
||||
if (!$ok) {
|
||||
return null;
|
||||
}
|
||||
|
||||
\S::delete_dir('../temp/');
|
||||
return (int)$this->db->id();
|
||||
}
|
||||
|
||||
$current = $this->templateDetails($templateId);
|
||||
if (!is_array($current)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ((int)($current['is_admin'] ?? 0) === 1) {
|
||||
$name = (string)($current['name'] ?? '');
|
||||
}
|
||||
|
||||
$this->db->update('pp_newsletter_templates', [
|
||||
'name' => $name,
|
||||
'text' => $text,
|
||||
], [
|
||||
'id' => $templateId,
|
||||
]);
|
||||
|
||||
\S::delete_dir('../temp/');
|
||||
return $templateId;
|
||||
}
|
||||
|
||||
public function listTemplatesSimple(bool $adminTemplates = false): array
|
||||
{
|
||||
$rows = $this->db->select('pp_newsletter_templates', '*', [
|
||||
'is_admin' => $adminTemplates ? 1 : 0,
|
||||
'ORDER' => ['name' => 'ASC'],
|
||||
]);
|
||||
|
||||
return is_array($rows) ? $rows : [];
|
||||
}
|
||||
|
||||
public function deleteSubscriber(int $subscriberId): bool
|
||||
{
|
||||
if ($subscriberId <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (bool)$this->db->delete('pp_newsletter', ['id' => $subscriberId]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{items: array<int, array<string, mixed>>, total: int}
|
||||
*/
|
||||
public function listSubscribersForAdmin(
|
||||
array $filters,
|
||||
string $sortColumn = 'email',
|
||||
string $sortDir = 'ASC',
|
||||
int $page = 1,
|
||||
int $perPage = 15
|
||||
): array {
|
||||
$allowedSortColumns = [
|
||||
'id' => 'pn.id',
|
||||
'email' => 'pn.email',
|
||||
'status' => 'pn.status',
|
||||
];
|
||||
|
||||
$sortSql = $allowedSortColumns[$sortColumn] ?? 'pn.email';
|
||||
$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 = ['1 = 1'];
|
||||
$params = [];
|
||||
|
||||
$email = trim((string)($filters['email'] ?? ''));
|
||||
if ($email !== '') {
|
||||
if (strlen($email) > 255) {
|
||||
$email = substr($email, 0, 255);
|
||||
}
|
||||
$where[] = 'pn.email LIKE :email';
|
||||
$params[':email'] = '%' . $email . '%';
|
||||
}
|
||||
|
||||
$status = trim((string)($filters['status'] ?? ''));
|
||||
if ($status === '0' || $status === '1') {
|
||||
$where[] = 'pn.status = :status';
|
||||
$params[':status'] = (int)$status;
|
||||
}
|
||||
|
||||
$whereSql = implode(' AND ', $where);
|
||||
|
||||
$sqlCount = "
|
||||
SELECT COUNT(0)
|
||||
FROM pp_newsletter AS pn
|
||||
WHERE {$whereSql}
|
||||
";
|
||||
|
||||
$stmtCount = $this->db->query($sqlCount, $params);
|
||||
$countRows = $stmtCount ? $stmtCount->fetchAll() : [];
|
||||
$total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0;
|
||||
|
||||
$sql = "
|
||||
SELECT
|
||||
pn.id,
|
||||
pn.email,
|
||||
pn.status
|
||||
FROM pp_newsletter AS pn
|
||||
WHERE {$whereSql}
|
||||
ORDER BY {$sortSql} {$sortDir}, pn.id ASC
|
||||
LIMIT {$perPage} OFFSET {$offset}
|
||||
";
|
||||
|
||||
$stmt = $this->db->query($sql, $params);
|
||||
$items = $stmt ? $stmt->fetchAll() : [];
|
||||
|
||||
return [
|
||||
'items' => is_array($items) ? $items : [],
|
||||
'total' => $total,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{items: array<int, array<string, mixed>>, total: int}
|
||||
*/
|
||||
public function listTemplatesForAdmin(
|
||||
bool $adminTemplates,
|
||||
array $filters,
|
||||
string $sortColumn = 'name',
|
||||
string $sortDir = 'ASC',
|
||||
int $page = 1,
|
||||
int $perPage = 15
|
||||
): array {
|
||||
$allowedSortColumns = [
|
||||
'id' => 'pnt.id',
|
||||
'name' => 'pnt.name',
|
||||
];
|
||||
|
||||
$sortSql = $allowedSortColumns[$sortColumn] ?? 'pnt.name';
|
||||
$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 = ['pnt.is_admin = :is_admin'];
|
||||
$params = [':is_admin' => $adminTemplates ? 1 : 0];
|
||||
|
||||
$name = trim((string)($filters['name'] ?? ''));
|
||||
if ($name !== '') {
|
||||
if (strlen($name) > 255) {
|
||||
$name = substr($name, 0, 255);
|
||||
}
|
||||
$where[] = 'pnt.name LIKE :name';
|
||||
$params[':name'] = '%' . $name . '%';
|
||||
}
|
||||
|
||||
$whereSql = implode(' AND ', $where);
|
||||
|
||||
$sqlCount = "
|
||||
SELECT COUNT(0)
|
||||
FROM pp_newsletter_templates AS pnt
|
||||
WHERE {$whereSql}
|
||||
";
|
||||
|
||||
$stmtCount = $this->db->query($sqlCount, $params);
|
||||
$countRows = $stmtCount ? $stmtCount->fetchAll() : [];
|
||||
$total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0;
|
||||
|
||||
$sql = "
|
||||
SELECT
|
||||
pnt.id,
|
||||
pnt.name,
|
||||
pnt.is_admin
|
||||
FROM pp_newsletter_templates AS pnt
|
||||
WHERE {$whereSql}
|
||||
ORDER BY {$sortSql} {$sortDir}, pnt.id ASC
|
||||
LIMIT {$perPage} OFFSET {$offset}
|
||||
";
|
||||
|
||||
$stmt = $this->db->query($sql, $params);
|
||||
$items = $stmt ? $stmt->fetchAll() : [];
|
||||
|
||||
return [
|
||||
'items' => is_array($items) ? $items : [],
|
||||
'total' => $total,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
514
autoload/admin/Controllers/NewsletterController.php
Normal file
514
autoload/admin/Controllers/NewsletterController.php
Normal file
@@ -0,0 +1,514 @@
|
||||
<?php
|
||||
namespace admin\Controllers;
|
||||
|
||||
use Domain\Newsletter\NewsletterRepository;
|
||||
use Domain\Newsletter\NewsletterPreviewRenderer;
|
||||
use admin\ViewModels\Common\PaginatedTableViewModel;
|
||||
use admin\ViewModels\Forms\FormAction;
|
||||
use admin\ViewModels\Forms\FormEditViewModel;
|
||||
use admin\ViewModels\Forms\FormField;
|
||||
use admin\Support\Forms\FormRequestHandler;
|
||||
|
||||
class NewsletterController
|
||||
{
|
||||
private NewsletterRepository $repository;
|
||||
private NewsletterPreviewRenderer $previewRenderer;
|
||||
private FormRequestHandler $formHandler;
|
||||
|
||||
public function __construct(NewsletterRepository $repository, NewsletterPreviewRenderer $previewRenderer)
|
||||
{
|
||||
$this->repository = $repository;
|
||||
$this->previewRenderer = $previewRenderer;
|
||||
$this->formHandler = new FormRequestHandler();
|
||||
}
|
||||
|
||||
public function list(): string
|
||||
{
|
||||
return $this->emails_list();
|
||||
}
|
||||
|
||||
public function view_list(): string
|
||||
{
|
||||
return $this->list();
|
||||
}
|
||||
|
||||
public function emails_list(): string
|
||||
{
|
||||
$sortableColumns = ['email', 'status'];
|
||||
$filterDefinitions = [
|
||||
[
|
||||
'key' => 'email',
|
||||
'label' => 'Email',
|
||||
'type' => 'text',
|
||||
],
|
||||
[
|
||||
'key' => 'status',
|
||||
'label' => 'Potwierdzony',
|
||||
'type' => 'select',
|
||||
'options' => [
|
||||
'' => '- potwierdzony -',
|
||||
'1' => 'tak',
|
||||
'0' => 'nie',
|
||||
],
|
||||
],
|
||||
];
|
||||
|
||||
$listRequest = \admin\Support\TableListRequestFactory::fromRequest(
|
||||
$filterDefinitions,
|
||||
$sortableColumns,
|
||||
'email'
|
||||
);
|
||||
|
||||
$sortDir = $listRequest['sortDir'];
|
||||
if (trim((string)\S::get('sort')) === '') {
|
||||
$sortDir = 'ASC';
|
||||
}
|
||||
|
||||
$result = $this->repository->listSubscribersForAdmin(
|
||||
$listRequest['filters'],
|
||||
$listRequest['sortColumn'],
|
||||
$sortDir,
|
||||
$listRequest['page'],
|
||||
$listRequest['perPage']
|
||||
);
|
||||
|
||||
$rows = [];
|
||||
$lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1;
|
||||
foreach ($result['items'] as $item) {
|
||||
$id = (int)($item['id'] ?? 0);
|
||||
$email = trim((string)($item['email'] ?? ''));
|
||||
$status = (int)($item['status'] ?? 0);
|
||||
|
||||
$rows[] = [
|
||||
'lp' => $lp++ . '.',
|
||||
'email' => htmlspecialchars($email, ENT_QUOTES, 'UTF-8'),
|
||||
'status' => $status === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
|
||||
'_actions' => [
|
||||
[
|
||||
'label' => 'Usun',
|
||||
'url' => '/admin/newsletter/email_delete/id=' . $id,
|
||||
'class' => 'btn btn-xs btn-danger',
|
||||
'confirm' => 'Na pewno chcesz usunac wybrany adres email?',
|
||||
],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
$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' => 'email', 'sort_key' => 'email', 'label' => 'Email', 'sortable' => true],
|
||||
['key' => 'status', 'sort_key' => 'status', 'label' => 'Potwierdzony', '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/newsletter/emails_list/',
|
||||
'Brak danych w tabeli.'
|
||||
);
|
||||
|
||||
return \Tpl::view('newsletter/emails-list', [
|
||||
'viewModel' => $viewModel,
|
||||
]);
|
||||
}
|
||||
|
||||
public function email_delete(): void
|
||||
{
|
||||
if ($this->repository->deleteSubscriber((int)\S::get('id'))) {
|
||||
\S::alert('Adres email zostal usuniety.');
|
||||
}
|
||||
|
||||
header('Location: /admin/newsletter/emails_list/');
|
||||
exit;
|
||||
}
|
||||
|
||||
public function delete(): void
|
||||
{
|
||||
$this->email_delete();
|
||||
}
|
||||
|
||||
public function prepare(): string
|
||||
{
|
||||
\S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
|
||||
header('Location: /admin/newsletter/emails_list/');
|
||||
exit;
|
||||
}
|
||||
|
||||
public function preview(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function send(): void
|
||||
{
|
||||
\S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
|
||||
header('Location: /admin/newsletter/emails_list/');
|
||||
exit;
|
||||
}
|
||||
|
||||
public function settings(): string
|
||||
{
|
||||
$settings = $this->repository->getSettings();
|
||||
$validationErrors = $_SESSION['form_errors'][$this->settingsFormId()] ?? null;
|
||||
if ($validationErrors) {
|
||||
unset($_SESSION['form_errors'][$this->settingsFormId()]);
|
||||
}
|
||||
|
||||
return \Tpl::view('newsletter/settings', [
|
||||
'form' => $this->buildSettingsFormViewModel($settings, $validationErrors),
|
||||
]);
|
||||
}
|
||||
|
||||
public function settings_save(): void
|
||||
{
|
||||
$legacyValues = \S::get('values');
|
||||
if ($legacyValues) {
|
||||
$values = json_decode((string)$legacyValues, true);
|
||||
if (!is_array($values)) {
|
||||
echo json_encode(['status' => 'error', 'msg' => 'Nieprawidlowe dane formularza.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$this->repository->saveSettings($values);
|
||||
\S::alert('Ustawienia zostaly zapisane.');
|
||||
|
||||
echo json_encode(['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$viewModel = $this->buildSettingsFormViewModel($this->repository->getSettings());
|
||||
$result = $this->formHandler->handleSubmit($viewModel, $_POST);
|
||||
if (!$result['success']) {
|
||||
$_SESSION['form_errors'][$this->settingsFormId()] = $result['errors'];
|
||||
echo json_encode(['success' => false, 'errors' => $result['errors']]);
|
||||
exit;
|
||||
}
|
||||
|
||||
$this->repository->saveSettings($result['data']);
|
||||
\S::alert('Ustawienia zostaly zapisane.');
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'message' => 'Ustawienia zostaly zapisane.',
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
public function email_templates_user(): string
|
||||
{
|
||||
\S::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
|
||||
header('Location: /admin/newsletter/email_templates_admin/');
|
||||
exit;
|
||||
}
|
||||
|
||||
public function email_templates_admin(): string
|
||||
{
|
||||
$viewModel = $this->templatesListViewModel();
|
||||
return \Tpl::view('newsletter/email-templates-admin', [
|
||||
'viewModel' => $viewModel,
|
||||
]);
|
||||
}
|
||||
|
||||
public function email_template_edit(): string
|
||||
{
|
||||
$template = $this->repository->templateDetails((int)\S::get('id'));
|
||||
if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
|
||||
\S::alert('Dostepne sa tylko szablony administracyjne.');
|
||||
header('Location: /admin/newsletter/email_templates_admin/');
|
||||
exit;
|
||||
}
|
||||
|
||||
$formId = $this->templateFormId((int)$template['id']);
|
||||
$validationErrors = $_SESSION['form_errors'][$formId] ?? null;
|
||||
if ($validationErrors) {
|
||||
unset($_SESSION['form_errors'][$formId]);
|
||||
}
|
||||
|
||||
return \Tpl::view('newsletter/email-template-edit', [
|
||||
'form' => $this->buildTemplateFormViewModel($template, $validationErrors),
|
||||
]);
|
||||
}
|
||||
|
||||
public function template_save(): void
|
||||
{
|
||||
$legacyValues = \S::get('values');
|
||||
if ($legacyValues) {
|
||||
$values = json_decode((string)$legacyValues, true);
|
||||
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania wystapil blad.'];
|
||||
|
||||
if (is_array($values)) {
|
||||
$templateId = (int)($values['id'] ?? 0);
|
||||
$template = $this->repository->templateDetails($templateId);
|
||||
|
||||
if (is_array($template) && (int)($template['is_admin'] ?? 0) === 1) {
|
||||
$id = $this->repository->saveTemplate(
|
||||
$templateId,
|
||||
(string)($values['name'] ?? ''),
|
||||
(string)($values['text'] ?? '')
|
||||
);
|
||||
if ($id) {
|
||||
$response = ['status' => 'ok', 'msg' => 'Zmiany zostaly zapisane.', 'id' => $id];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
echo json_encode($response);
|
||||
exit;
|
||||
}
|
||||
|
||||
$template = $this->repository->templateDetails((int)\S::get('id'));
|
||||
if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
|
||||
echo json_encode([
|
||||
'success' => false,
|
||||
'errors' => ['general' => 'Dostepne sa tylko szablony administracyjne.'],
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
$form = $this->buildTemplateFormViewModel($template);
|
||||
$result = $this->formHandler->handleSubmit($form, $_POST);
|
||||
if (!$result['success']) {
|
||||
$_SESSION['form_errors'][$this->templateFormId((int)$template['id'])] = $result['errors'];
|
||||
echo json_encode(['success' => false, 'errors' => $result['errors']]);
|
||||
exit;
|
||||
}
|
||||
|
||||
$data = $result['data'];
|
||||
$id = $this->repository->saveTemplate(
|
||||
(int)($template['id'] ?? 0),
|
||||
(string)($data['name'] ?? ''),
|
||||
(string)($data['text'] ?? '')
|
||||
);
|
||||
|
||||
if ($id) {
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'id' => $id,
|
||||
'message' => 'Zmiany zostaly zapisane.',
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'success' => false,
|
||||
'errors' => ['general' => 'Podczas zapisywania wystapil blad.'],
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
public function email_template_delete(): void
|
||||
{
|
||||
\S::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
|
||||
header('Location: /admin/newsletter/email_templates_admin/');
|
||||
exit;
|
||||
}
|
||||
|
||||
private function buildSettingsFormViewModel(array $settings, ?array $errors = null): FormEditViewModel
|
||||
{
|
||||
$data = [
|
||||
'newsletter_header' => (string)($settings['newsletter_header'] ?? ''),
|
||||
'newsletter_footer' => (string)($settings['newsletter_footer'] ?? ''),
|
||||
];
|
||||
|
||||
$fields = [
|
||||
FormField::editor('newsletter_header', [
|
||||
'label' => 'Naglowek',
|
||||
'height' => 150,
|
||||
]),
|
||||
FormField::editor('newsletter_footer', [
|
||||
'label' => 'Stopka',
|
||||
'height' => 150,
|
||||
]),
|
||||
];
|
||||
|
||||
$actionUrl = '/admin/newsletter/settings_save/';
|
||||
$actions = [
|
||||
FormAction::save($actionUrl, '/admin/newsletter/settings/'),
|
||||
];
|
||||
|
||||
return new FormEditViewModel(
|
||||
$this->settingsFormId(),
|
||||
'Edycja ustawien newslettera',
|
||||
$data,
|
||||
$fields,
|
||||
[],
|
||||
$actions,
|
||||
'POST',
|
||||
$actionUrl,
|
||||
'/admin/newsletter/settings/',
|
||||
true,
|
||||
[],
|
||||
null,
|
||||
$errors
|
||||
);
|
||||
}
|
||||
|
||||
private function buildTemplateFormViewModel(array $template, ?array $errors = null): FormEditViewModel
|
||||
{
|
||||
$templateId = (int)($template['id'] ?? 0);
|
||||
$isAdminTemplate = (int)($template['is_admin'] ?? 0) === 1;
|
||||
$isNew = $templateId <= 0;
|
||||
|
||||
$data = [
|
||||
'id' => $templateId,
|
||||
'name' => (string)($template['name'] ?? ''),
|
||||
'text' => (string)($template['text'] ?? ''),
|
||||
];
|
||||
|
||||
$nameAttrs = [];
|
||||
if ($isAdminTemplate) {
|
||||
$nameAttrs['readonly'] = 'readonly';
|
||||
}
|
||||
|
||||
$fields = [
|
||||
FormField::text('name', [
|
||||
'label' => 'Nazwa',
|
||||
'required' => true,
|
||||
'attributes' => $nameAttrs,
|
||||
]),
|
||||
FormField::editor('text', [
|
||||
'label' => 'Tresc',
|
||||
'required' => true,
|
||||
'height' => 350,
|
||||
]),
|
||||
];
|
||||
|
||||
$backUrl = '/admin/newsletter/email_templates_admin/';
|
||||
$actionUrl = '/admin/newsletter/template_save/' . ($isNew ? '' : ('id=' . $templateId));
|
||||
$actions = [
|
||||
FormAction::save($actionUrl, $backUrl),
|
||||
FormAction::cancel($backUrl),
|
||||
];
|
||||
|
||||
return new FormEditViewModel(
|
||||
$this->templateFormId($templateId),
|
||||
'Edycja szablonu newslettera',
|
||||
$data,
|
||||
$fields,
|
||||
[],
|
||||
$actions,
|
||||
'POST',
|
||||
$actionUrl,
|
||||
$backUrl,
|
||||
true,
|
||||
['id' => $templateId],
|
||||
null,
|
||||
$errors
|
||||
);
|
||||
}
|
||||
|
||||
private function templatesListViewModel(): PaginatedTableViewModel
|
||||
{
|
||||
$sortableColumns = ['name'];
|
||||
$filterDefinitions = [
|
||||
[
|
||||
'key' => 'name',
|
||||
'label' => 'Nazwa',
|
||||
'type' => 'text',
|
||||
],
|
||||
];
|
||||
|
||||
$basePath = '/admin/newsletter/email_templates_admin/';
|
||||
|
||||
$listRequest = \admin\Support\TableListRequestFactory::fromRequest(
|
||||
$filterDefinitions,
|
||||
$sortableColumns,
|
||||
'name'
|
||||
);
|
||||
|
||||
$sortDir = $listRequest['sortDir'];
|
||||
if (trim((string)\S::get('sort')) === '') {
|
||||
$sortDir = 'ASC';
|
||||
}
|
||||
|
||||
$result = $this->repository->listTemplatesForAdmin(
|
||||
true,
|
||||
$listRequest['filters'],
|
||||
$listRequest['sortColumn'],
|
||||
$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'] ?? ''));
|
||||
|
||||
$actions = [
|
||||
[
|
||||
'label' => 'Edytuj',
|
||||
'url' => '/admin/newsletter/email_template_edit/id=' . $id,
|
||||
'class' => 'btn btn-xs btn-primary',
|
||||
],
|
||||
];
|
||||
|
||||
$rows[] = [
|
||||
'lp' => $lp++ . '.',
|
||||
'name' => '<a href="/admin/newsletter/email_template_edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
|
||||
'_actions' => $actions,
|
||||
];
|
||||
}
|
||||
|
||||
$total = (int)$result['total'];
|
||||
$totalPages = max(1, (int)ceil($total / $listRequest['perPage']));
|
||||
|
||||
return new PaginatedTableViewModel(
|
||||
[
|
||||
['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
|
||||
['key' => 'name', 'sort_key' => 'name', 'label' => 'Nazwa', '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,
|
||||
$basePath,
|
||||
'Brak danych w tabeli.'
|
||||
);
|
||||
}
|
||||
|
||||
private function settingsFormId(): string
|
||||
{
|
||||
return 'newsletter-settings-edit';
|
||||
}
|
||||
|
||||
private function templateFormId(int $templateId): string
|
||||
{
|
||||
return 'newsletter-template-edit-' . $templateId;
|
||||
}
|
||||
}
|
||||
@@ -275,6 +275,17 @@ class Site
|
||||
new \Domain\Languages\LanguagesRepository( $mdb )
|
||||
);
|
||||
},
|
||||
'Newsletter' => function() {
|
||||
global $mdb;
|
||||
|
||||
return new \admin\Controllers\NewsletterController(
|
||||
new \Domain\Newsletter\NewsletterRepository(
|
||||
$mdb,
|
||||
new \Domain\Settings\SettingsRepository( $mdb )
|
||||
),
|
||||
new \Domain\Newsletter\NewsletterPreviewRenderer()
|
||||
);
|
||||
},
|
||||
];
|
||||
|
||||
return self::$newControllers;
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
<?php
|
||||
namespace admin\controls;
|
||||
|
||||
class Newsletter
|
||||
{
|
||||
public static function emails_list()
|
||||
{
|
||||
return \admin\view\Newsletter::emails_list();
|
||||
}
|
||||
|
||||
public static function send()
|
||||
{
|
||||
if ( \admin\factory\Newsletter::send( \S::get( 'dates' ), \S::get( 'template' ) ) )
|
||||
\S::alert( 'Newsletter został dodany do kolejki wysyłania.' );
|
||||
|
||||
header( 'Location: /admin/newsletter/prepare/' );
|
||||
exit;
|
||||
}
|
||||
|
||||
public static function prepare()
|
||||
{
|
||||
return \admin\view\Newsletter::prepare(
|
||||
\admin\factory\Newsletter::templates_list()
|
||||
);
|
||||
}
|
||||
|
||||
public static function settings_save()
|
||||
{
|
||||
$values = json_decode( \S::get( 'values' ), true );
|
||||
$settingsRepository = new \Domain\Settings\SettingsRepository();
|
||||
|
||||
$settingsRepository -> updateSetting( 'newsletter_footer', $values['newsletter_footer'] ?? '' );
|
||||
$settingsRepository -> updateSetting( 'newsletter_header', $values['newsletter_header'] ?? '' );
|
||||
|
||||
\S::alert( 'Ustawienia zostały zapisane.' );
|
||||
|
||||
echo json_encode( [ 'status' => 'ok', 'msg' => 'Ustawienia zostały zapisane.' ] );
|
||||
exit;
|
||||
}
|
||||
|
||||
public static function settings()
|
||||
{
|
||||
$settingsRepository = new \Domain\Settings\SettingsRepository();
|
||||
|
||||
return \admin\view\Newsletter::settings(
|
||||
$settingsRepository -> getSettings()
|
||||
);
|
||||
}
|
||||
|
||||
public static function email_templates_user()
|
||||
{
|
||||
return \admin\view\Newsletter::email_templates_user();
|
||||
}
|
||||
|
||||
public static function email_templates_admin()
|
||||
{
|
||||
return \admin\view\Newsletter::email_templates_admin();
|
||||
}
|
||||
|
||||
public static function email_template_delete()
|
||||
{
|
||||
$is_admin = \admin\factory\Newsletter::is_admin_template( \S::get( 'id' ) );
|
||||
|
||||
if ( !$is_admin and \admin\factory\Newsletter::newsletter_template_delete( \S::get( 'id' ) ) )
|
||||
\S::alert( 'Szablon newslettera został usunięty.' );
|
||||
|
||||
if ( $is_admin )
|
||||
header( 'Location: /admin/newsletter/email_templates_admin/' );
|
||||
else
|
||||
header( 'Location: /admin/newsletter/email_templates_user/' );
|
||||
exit;
|
||||
}
|
||||
|
||||
public static function email_template_edit()
|
||||
{
|
||||
return \admin\view\Newsletter::email_template_edit(
|
||||
\admin\factory\Newsletter::email_template_detalis(
|
||||
\S::get( 'id' )
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public static function template_save()
|
||||
{
|
||||
$response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania wystąpił błąd. Proszę spróbować ponownie.' ];
|
||||
$values = json_decode( \S::get( 'values' ), true );
|
||||
|
||||
if ( $id = \admin\factory\Newsletter::template_save( $values['id'], $values['name'], $values['text'] ) )
|
||||
$response = [ 'status' => 'ok', 'msg' => 'Zmiany zostały zapisane.', 'id' => $id ];
|
||||
|
||||
echo json_encode( $response );
|
||||
exit;
|
||||
}
|
||||
}
|
||||
@@ -1,76 +1,48 @@
|
||||
<?php
|
||||
namespace admin\factory;
|
||||
|
||||
use Domain\Newsletter\NewsletterRepository;
|
||||
use Domain\Settings\SettingsRepository;
|
||||
|
||||
class Newsletter
|
||||
{
|
||||
public static function is_admin_template( $template_id )
|
||||
{
|
||||
global $mdb;
|
||||
return $mdb -> get( 'pp_newsletter_templates', 'is_admin', [ 'id' => (int)$template_id ] );
|
||||
return self::repository() -> isAdminTemplate( (int)$template_id );
|
||||
}
|
||||
|
||||
|
||||
public static function newsletter_template_delete( $template_id )
|
||||
{
|
||||
global $mdb;
|
||||
return $mdb -> delete( 'pp_newsletter_templates', [ 'id' => (int)$template_id ] );
|
||||
return self::repository() -> deleteTemplate( (int)$template_id );
|
||||
}
|
||||
|
||||
|
||||
public static function send( $dates, $template )
|
||||
{
|
||||
global $mdb;
|
||||
|
||||
$results = $mdb -> select( 'pp_newsletter', 'email', [ 'status' => 1 ] );
|
||||
if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row )
|
||||
{
|
||||
$mdb -> insert( 'pp_newsletter_send', [
|
||||
'email' => $row,
|
||||
'dates' => $dates,
|
||||
'id_template' => $template ? $template : null
|
||||
] );
|
||||
}
|
||||
return true;
|
||||
return self::repository() -> queueSend( (string)$dates, (int)$template );
|
||||
}
|
||||
|
||||
public static function email_template_detalis ($id_template)
|
||||
|
||||
public static function email_template_detalis( $id_template )
|
||||
{
|
||||
global $mdb;
|
||||
|
||||
$result = $mdb -> get ('pp_newsletter_templates', '*', [ 'id' => (int)$id_template ] );
|
||||
return $result;
|
||||
return self::repository() -> templateDetails( (int)$id_template );
|
||||
}
|
||||
|
||||
|
||||
public static function template_save( $id, $name, $text )
|
||||
{
|
||||
global $mdb;
|
||||
|
||||
if ( !$id )
|
||||
{
|
||||
if ( $mdb -> insert( 'pp_newsletter_templates', [
|
||||
'name' => $name,
|
||||
'text' => $text
|
||||
] ) )
|
||||
{
|
||||
\S::delete_dir( '../temp/' );
|
||||
return $mdb -> id();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$mdb -> update( 'pp_newsletter_templates', [
|
||||
'name' => $name,
|
||||
'text' => $text
|
||||
], [
|
||||
'id' => (int)$id
|
||||
] );
|
||||
|
||||
\S::delete_dir( '../temp/' );
|
||||
return $id;
|
||||
}
|
||||
return self::repository() -> saveTemplate( (int)$id, (string)$name, (string)$text );
|
||||
}
|
||||
|
||||
|
||||
public static function templates_list()
|
||||
{
|
||||
global $mdb;
|
||||
return $mdb -> select( 'pp_newsletter_templates', '*', [ 'is_admin' => 0, 'ORDER' => [ 'name' => 'ASC' ] ] );
|
||||
return self::repository() -> listTemplatesSimple( false );
|
||||
}
|
||||
}
|
||||
|
||||
private static function repository(): NewsletterRepository
|
||||
{
|
||||
global $mdb;
|
||||
|
||||
return new NewsletterRepository(
|
||||
$mdb,
|
||||
new SettingsRepository($mdb)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
<?php
|
||||
namespace admin\view;
|
||||
|
||||
class Newsletter
|
||||
{
|
||||
public static function emails_list()
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
return $tpl -> render( 'newsletter/emails-list' );
|
||||
}
|
||||
|
||||
public static function preview( $articles, $settings, $template, $dates = '' )
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
$tpl -> articles = $articles;
|
||||
$tpl -> settings = $settings;
|
||||
$tpl -> template = $template;
|
||||
$tpl -> dates = $dates;
|
||||
return $tpl -> render( 'newsletter/preview' );
|
||||
}
|
||||
|
||||
public static function prepare( $templates )
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
$tpl -> templates = $templates;
|
||||
return $tpl -> render( 'newsletter/prepare' );
|
||||
}
|
||||
|
||||
public static function settings( $settings )
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
$tpl -> settings = $settings;
|
||||
return $tpl -> render( 'newsletter/settings' );
|
||||
}
|
||||
|
||||
public static function email_templates_user()
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
return $tpl -> render( 'newsletter/email-templates-user' );
|
||||
}
|
||||
|
||||
public static function email_templates_admin()
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
return $tpl -> render( 'newsletter/email-templates-admin' );
|
||||
}
|
||||
|
||||
public static function email_template_edit($template)
|
||||
{
|
||||
$tpl = new \Tpl;
|
||||
$tpl -> email_template = $template;
|
||||
return $tpl -> render( 'newsletter/email-template-edit' );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,8 @@ class Newsletter
|
||||
{
|
||||
global $mdb, $settings, $lang;
|
||||
$settingsRepository = new \Domain\Settings\SettingsRepository( $mdb );
|
||||
$newsletterRepository = new \Domain\Newsletter\NewsletterRepository( $mdb, $settingsRepository );
|
||||
$previewRenderer = new \Domain\Newsletter\NewsletterPreviewRenderer();
|
||||
$settingsDetails = $settingsRepository -> getSettings();
|
||||
|
||||
$results = $mdb -> query( 'SELECT * FROM pp_newsletter_send ORDER BY id ASC LIMIT ' . $limit ) -> fetchAll();
|
||||
@@ -36,10 +38,15 @@ class Newsletter
|
||||
{
|
||||
$dates = explode( ' - ', $row['dates'] );
|
||||
|
||||
$text = \admin\view\Newsletter::preview(
|
||||
\admin\factory\Articles::articles_by_date_add( $dates[0], $dates[1] ),
|
||||
$articles = [];
|
||||
if ( isset( $dates[0], $dates[1] ) )
|
||||
$articles = \admin\factory\Articles::articles_by_date_add( $dates[0], $dates[1] );
|
||||
|
||||
$text = $previewRenderer -> render(
|
||||
is_array( $articles ) ? $articles : [],
|
||||
$settingsDetails,
|
||||
\admin\factory\Newsletter::email_template_detalis($row['id_template'])
|
||||
$newsletterRepository -> templateDetails( (int)$row['id_template'] ),
|
||||
(string)$row['dates']
|
||||
);
|
||||
|
||||
if ( $settings['ssl'] ) $base = 'https'; else $base = 'http';
|
||||
@@ -110,7 +117,8 @@ class Newsletter
|
||||
public static function get_template( $template_name )
|
||||
{
|
||||
global $mdb;
|
||||
return $mdb -> get( 'pp_newsletter_templates', 'text', [ 'name' => $template_name ] );
|
||||
$repository = new \Domain\Newsletter\NewsletterRepository( $mdb );
|
||||
return $repository -> templateByName( (string)$template_name );
|
||||
}
|
||||
|
||||
public static function newsletter_signout( $email )
|
||||
|
||||
78
tests/Unit/Domain/Newsletter/NewsletterRepositoryTest.php
Normal file
78
tests/Unit/Domain/Newsletter/NewsletterRepositoryTest.php
Normal file
@@ -0,0 +1,78 @@
|
||||
<?php
|
||||
namespace Tests\Unit\Domain\Newsletter;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Domain\Newsletter\NewsletterRepository;
|
||||
use Domain\Settings\SettingsRepository;
|
||||
|
||||
class NewsletterRepositoryTest extends TestCase
|
||||
{
|
||||
public function testTemplateDetailsReturnsNullForInvalidId(): void
|
||||
{
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$repository = new NewsletterRepository($mockDb, $this->createMock(SettingsRepository::class));
|
||||
|
||||
$this->assertNull($repository->templateDetails(0));
|
||||
}
|
||||
|
||||
public function testTemplateDetailsReturnsArray(): void
|
||||
{
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$mockDb->expects($this->once())
|
||||
->method('get')
|
||||
->with('pp_newsletter_templates', '*', ['id' => 7])
|
||||
->willReturn(['id' => 7, 'name' => 'Tpl']);
|
||||
|
||||
$repository = new NewsletterRepository($mockDb, $this->createMock(SettingsRepository::class));
|
||||
$details = $repository->templateDetails(7);
|
||||
|
||||
$this->assertIsArray($details);
|
||||
$this->assertSame(7, $details['id']);
|
||||
}
|
||||
|
||||
public function testSaveSettingsUpdatesHeaderAndFooter(): void
|
||||
{
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$settingsRepository = $this->createMock(SettingsRepository::class);
|
||||
|
||||
$settingsRepository->expects($this->exactly(2))
|
||||
->method('updateSetting')
|
||||
->withConsecutive(
|
||||
['newsletter_footer', 'Footer'],
|
||||
['newsletter_header', 'Header']
|
||||
);
|
||||
|
||||
$repository = new NewsletterRepository($mockDb, $settingsRepository);
|
||||
|
||||
$this->assertTrue($repository->saveSettings([
|
||||
'newsletter_header' => 'Header',
|
||||
'newsletter_footer' => 'Footer',
|
||||
]));
|
||||
}
|
||||
|
||||
public function testDeleteTemplateReturnsFalseForAdminTemplate(): void
|
||||
{
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$mockDb->expects($this->once())
|
||||
->method('get')
|
||||
->with('pp_newsletter_templates', 'is_admin', ['id' => 5])
|
||||
->willReturn(1);
|
||||
|
||||
$repository = new NewsletterRepository($mockDb, $this->createMock(SettingsRepository::class));
|
||||
|
||||
$this->assertFalse($repository->deleteTemplate(5));
|
||||
}
|
||||
|
||||
public function testTemplateByNameReturnsText(): void
|
||||
{
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$mockDb->expects($this->once())
|
||||
->method('get')
|
||||
->with('pp_newsletter_templates', 'text', ['name' => '#abc'])
|
||||
->willReturn('Template text');
|
||||
|
||||
$repository = new NewsletterRepository($mockDb, $this->createMock(SettingsRepository::class));
|
||||
|
||||
$this->assertSame('Template text', $repository->templateByName('#abc'));
|
||||
}
|
||||
}
|
||||
70
tests/Unit/admin/Controllers/NewsletterControllerTest.php
Normal file
70
tests/Unit/admin/Controllers/NewsletterControllerTest.php
Normal file
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
namespace Tests\Unit\admin\Controllers;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use admin\Controllers\NewsletterController;
|
||||
use Domain\Newsletter\NewsletterRepository;
|
||||
use Domain\Newsletter\NewsletterPreviewRenderer;
|
||||
|
||||
class NewsletterControllerTest extends TestCase
|
||||
{
|
||||
private $repository;
|
||||
private $previewRenderer;
|
||||
private $controller;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->repository = $this->createMock(NewsletterRepository::class);
|
||||
$this->previewRenderer = $this->createMock(NewsletterPreviewRenderer::class);
|
||||
$this->controller = new NewsletterController($this->repository, $this->previewRenderer);
|
||||
}
|
||||
|
||||
public function testConstructorAcceptsDependencies(): void
|
||||
{
|
||||
$controller = new NewsletterController($this->repository, $this->previewRenderer);
|
||||
$this->assertInstanceOf(NewsletterController::class, $controller);
|
||||
}
|
||||
|
||||
public function testHasMainActionMethods(): void
|
||||
{
|
||||
$this->assertTrue(method_exists($this->controller, 'emails_list'));
|
||||
$this->assertTrue(method_exists($this->controller, 'prepare'));
|
||||
$this->assertTrue(method_exists($this->controller, 'send'));
|
||||
$this->assertTrue(method_exists($this->controller, 'preview'));
|
||||
$this->assertTrue(method_exists($this->controller, 'settings'));
|
||||
$this->assertTrue(method_exists($this->controller, 'settings_save'));
|
||||
$this->assertTrue(method_exists($this->controller, 'email_templates_user'));
|
||||
$this->assertTrue(method_exists($this->controller, 'email_templates_admin'));
|
||||
$this->assertTrue(method_exists($this->controller, 'email_template_edit'));
|
||||
$this->assertTrue(method_exists($this->controller, 'template_save'));
|
||||
$this->assertTrue(method_exists($this->controller, 'email_template_delete'));
|
||||
}
|
||||
|
||||
public function testActionMethodReturnTypes(): void
|
||||
{
|
||||
$reflection = new \ReflectionClass($this->controller);
|
||||
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('emails_list')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('prepare')->getReturnType());
|
||||
$this->assertEquals('void', (string)$reflection->getMethod('send')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('preview')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('settings')->getReturnType());
|
||||
$this->assertEquals('void', (string)$reflection->getMethod('settings_save')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('email_templates_user')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('email_templates_admin')->getReturnType());
|
||||
$this->assertEquals('string', (string)$reflection->getMethod('email_template_edit')->getReturnType());
|
||||
$this->assertEquals('void', (string)$reflection->getMethod('template_save')->getReturnType());
|
||||
$this->assertEquals('void', (string)$reflection->getMethod('email_template_delete')->getReturnType());
|
||||
}
|
||||
|
||||
public function testConstructorRequiresRepositoryAndRenderer(): void
|
||||
{
|
||||
$reflection = new \ReflectionClass(NewsletterController::class);
|
||||
$constructor = $reflection->getConstructor();
|
||||
$params = $constructor->getParameters();
|
||||
|
||||
$this->assertCount(2, $params);
|
||||
$this->assertEquals('Domain\Newsletter\NewsletterRepository', $params[0]->getType()->getName());
|
||||
$this->assertEquals('Domain\Newsletter\NewsletterPreviewRenderer', $params[1]->getType()->getName());
|
||||
}
|
||||
}
|
||||
BIN
updates/0.20/ver_0.258.zip
Normal file
BIN
updates/0.20/ver_0.258.zip
Normal file
Binary file not shown.
5
updates/0.20/ver_0.258_files.txt
Normal file
5
updates/0.20/ver_0.258_files.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
F: ../autoload/admin/controls/class.Newsletter.php
|
||||
F: ../autoload/admin/view/class.Newsletter.php
|
||||
F: ../admin/templates/newsletter/prepare.php
|
||||
F: ../admin/templates/newsletter/preview.php
|
||||
F: ../admin/templates/newsletter/email-templates-user.php
|
||||
@@ -1,4 +1,18 @@
|
||||
<b>ver. 0.256 - 12.02.2026</b><br />
|
||||
<b>ver. 0.258 - 12.02.2026</b><br />
|
||||
- UPDATE - modul `Newsletter`: funkcjonalnosc `Wysylka - przygotowanie` zostala tymczasowo wylaczona (menu + akcje `prepare/send/preview`)
|
||||
- UPDATE - modul `Newsletter`: lista `Szablony uzytkownika` zostala tymczasowo wylaczona (menu + akcja `email_templates_user`)
|
||||
- UPDATE - `NewsletterController`: lista szablonow ograniczona do szablonow administracyjnych (`is_admin = 1`)
|
||||
- UPDATE - `email_template_edit` i `template_save` obsluguja tylko szablony administracyjne
|
||||
- CLEANUP - usuniete nieuzywane szablony newslettera: `admin/templates/newsletter/prepare.php`, `admin/templates/newsletter/preview.php`, `admin/templates/newsletter/email-templates-user.php`
|
||||
- UPDATE - plik do usuniecia dodany w `updates/0.20/ver_0.258_files.txt`
|
||||
<hr><b>ver. 0.257 - 12.02.2026</b><br />
|
||||
- NEW - migracja modulu `Newsletter` do architektury Domain + DI (`Domain\\Newsletter\\NewsletterRepository`, `Domain\\Newsletter\\NewsletterPreviewRenderer`, `admin\\Controllers\\NewsletterController`)
|
||||
- UPDATE - widoki `/admin/newsletter/*` przepiete z legacy `grid/gridEdit` na nowe komponenty (`components/table-list`, `components/form-edit`) + nowy endpoint `/admin/newsletter/preview/`
|
||||
- UPDATE - routing DI (`admin\\Site`) rozszerzony o moduł `Newsletter`
|
||||
- UPDATE - `admin\\factory\\Newsletter` dziala jako fasada do nowego repozytorium (backward compatibility)
|
||||
- UPDATE - `front\\factory\\Newsletter` nie korzysta juz z `admin\\view\\Newsletter`
|
||||
- CLEANUP - usuniete legacy klasy `autoload/admin/controls/class.Newsletter.php`, `autoload/admin/view/class.Newsletter.php`
|
||||
<hr><b>ver. 0.256 - 12.02.2026</b><br />
|
||||
- NEW - migracja modulu `Layouts` do architektury Domain + DI (`Domain\\Layouts\\LayoutsRepository`, `admin\\Controllers\\LayoutsController`)
|
||||
- UPDATE - lista `/admin/layouts/view_list/` przepieta z legacy `grid` na `components/table-list` (filtry, sortowanie, paginacja)
|
||||
- UPDATE - `layouts/layout-edit` korzysta z danych z repozytorium (menus/categories), bez wywolan legacy factory w widoku
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?
|
||||
$current_ver = 256;
|
||||
$current_ver = 258;
|
||||
|
||||
for ($i = 1; $i <= $current_ver; $i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user