Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f94daeb76 | |||
| 72159062f5 | |||
| 2461087d9b | |||
| 6434933dfb | |||
| 28f53b7998 | |||
| 98029b1720 | |||
| a531fabeaf | |||
| c53778ab36 | |||
| 52119a0724 | |||
| 97d7473753 | |||
| 754f004096 | |||
| 3b2d156e84 | |||
| c44f59894e | |||
| fe2a77e995 | |||
| f0b1152ab1 | |||
| 44ac25b063 | |||
| ee8459ca2a | |||
| 8e2e070eb7 | |||
| ec4e25946d | |||
| 4f66dbe42c | |||
| 4e720c5689 | |||
| 702e3a94be | |||
| 9a351c16ee | |||
| 4056296dab | |||
| 7158f4d369 | |||
| 1d613d8226 | |||
| 174a85a707 | |||
| 835386a887 |
@@ -67,7 +67,10 @@
|
|||||||
"Bash(rm -rf \"C:/visual studio code/projekty/shopPRO/temp/temp_314\" && cd \"C:/visual studio code/projekty/shopPRO\" && powershell -ExecutionPolicy Bypass -File build-update.ps1 -FromTag v0.313 -ToTag v0.314 -ChangelogEntry \"FIX - naprawa globalnej wyszukiwarki admin \\(Content-Type, Cache-Control, POST, try/catch\\), NEW - title strony z numerem zamówienia\" 2>&1)",
|
"Bash(rm -rf \"C:/visual studio code/projekty/shopPRO/temp/temp_314\" && cd \"C:/visual studio code/projekty/shopPRO\" && powershell -ExecutionPolicy Bypass -File build-update.ps1 -FromTag v0.313 -ToTag v0.314 -ChangelogEntry \"FIX - naprawa globalnej wyszukiwarki admin \\(Content-Type, Cache-Control, POST, try/catch\\), NEW - title strony z numerem zamówienia\" 2>&1)",
|
||||||
"mcp__serena__initial_instructions",
|
"mcp__serena__initial_instructions",
|
||||||
"mcp__serena__list_memories",
|
"mcp__serena__list_memories",
|
||||||
"mcp__serena__find_referencing_symbols"
|
"mcp__serena__find_referencing_symbols",
|
||||||
|
"Bash(cd C:\\\\visual studio code\\\\projekty\\\\shopPRO:*)",
|
||||||
|
"Bash(cd \"/c/visual studio code/projekty/shopPRO\" && rm -rf temp/temp_317 && powershell -ExecutionPolicy Bypass -File build-update.ps1 -FromTag v0.316 -ToTag v0.317 -ChangelogEntry \"FIX - klucz API: fix zapisu \\(brakowalo w whiteliście\\), przycisk Generuj losowy klucz, ulepszony routing API\" 2>&1)",
|
||||||
|
"Bash(./test.ps1)"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
47
.serena/memories/code_style_and_conventions.md
Normal file
47
.serena/memories/code_style_and_conventions.md
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
# Code Style and Conventions
|
||||||
|
|
||||||
|
## PHP Version
|
||||||
|
PHP 7.4 — no PHP 8.0+ features allowed.
|
||||||
|
|
||||||
|
## File Naming
|
||||||
|
- New classes: `ClassName.php` (no prefix)
|
||||||
|
- Legacy classes: `class.ClassName.php` (leave until migrated)
|
||||||
|
|
||||||
|
## DI Pattern (all new code)
|
||||||
|
```php
|
||||||
|
class ExampleRepository {
|
||||||
|
private $db;
|
||||||
|
public function __construct($db) {
|
||||||
|
$this->db = $db;
|
||||||
|
}
|
||||||
|
public function find(int $id): ?array {
|
||||||
|
return $this->db->get('pp_table', '*', ['id' => $id]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Controller Wiring
|
||||||
|
- Admin: `admin\App::getControllerFactories()`
|
||||||
|
- Frontend: `front\App::getControllerFactories()`
|
||||||
|
- API: `api\ApiRouter::getControllerFactories()`
|
||||||
|
|
||||||
|
## Medoo ORM Pitfalls
|
||||||
|
- `$mdb->delete($table, $where)` takes 2 arguments, NOT 3
|
||||||
|
- `$mdb->get()` returns `null` when no record, NOT `false`
|
||||||
|
- After `$mdb->insert()`, check `$mdb->id()` to confirm success
|
||||||
|
|
||||||
|
## Test Conventions
|
||||||
|
- Extend `PHPUnit\Framework\TestCase`
|
||||||
|
- Mock Medoo: `$this->createMock(\medoo::class)`
|
||||||
|
- AAA pattern: Arrange, Act, Assert
|
||||||
|
- Mirror source structure: `tests/Unit/Domain/{Module}/{Class}Test.php`
|
||||||
|
|
||||||
|
## Caching
|
||||||
|
- Redis via `\Shared\Cache\CacheHandler`
|
||||||
|
- Key pattern: `shop\product:{id}:{lang}:{permutation_hash}`
|
||||||
|
- Default TTL: 86400 (24h)
|
||||||
|
- Data serialized — use `unserialize()` after `get()`
|
||||||
|
|
||||||
|
## Database
|
||||||
|
- Table prefix: `pp_`
|
||||||
|
- Key tables: `pp_shop_products`, `pp_shop_orders`, `pp_shop_categories`, `pp_shop_clients`
|
||||||
65
.serena/memories/project_overview.md
Normal file
65
.serena/memories/project_overview.md
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
# shopPRO — Project Overview
|
||||||
|
|
||||||
|
## Purpose
|
||||||
|
shopPRO is a PHP e-commerce platform with an admin panel, customer-facing storefront, and REST API.
|
||||||
|
|
||||||
|
## Tech Stack
|
||||||
|
- **Language**: PHP 7.4 (production runs PHP < 8.0 — do NOT use PHP 8.0+ syntax!)
|
||||||
|
- **ORM**: Medoo (`$mdb` global, injected via DI in new code)
|
||||||
|
- **Caching**: Redis via `\Shared\Cache\CacheHandler`
|
||||||
|
- **Testing**: PHPUnit 9.6 via `phpunit.phar`
|
||||||
|
- **Frontend**: Custom template engine (`\Shared\Tpl\Tpl`)
|
||||||
|
- **Database**: MySQL with `pp_` table prefix
|
||||||
|
- **Platform**: Windows (development), Linux (production)
|
||||||
|
|
||||||
|
## PHP 7.4 Constraint — CRITICAL
|
||||||
|
Do NOT use any PHP 8.0+ features:
|
||||||
|
- No `match` expressions (use ternary/if-else)
|
||||||
|
- No named arguments
|
||||||
|
- No union types (`int|string`)
|
||||||
|
- No `str_contains()`, `str_starts_with()`, `str_ends_with()`
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
Domain-Driven Design with Dependency Injection.
|
||||||
|
|
||||||
|
### Layers
|
||||||
|
1. **Domain** (`autoload/Domain/`) — Business logic repositories, 27 modules
|
||||||
|
2. **Admin** (`autoload/admin/`) — Admin panel controllers, support, validation, view models
|
||||||
|
3. **Frontend** (`autoload/front/`) — Customer-facing controllers and views
|
||||||
|
4. **API** (`autoload/api/`) — REST API controllers
|
||||||
|
5. **Shared** (`autoload/Shared/`) — Cache, Email, Helpers, Html, Image, Tpl
|
||||||
|
|
||||||
|
### Domain Modules
|
||||||
|
Article, Attribute, Banner, Basket, Cache, Category, Client, Coupon, Dashboard, Dictionaries, Integrations, Languages, Layouts, Newsletter, Order, Pages, PaymentMethod, Producer, Product, ProductSet, Promotion, Scontainers, Settings, ShopStatus, Transport, Update, User
|
||||||
|
|
||||||
|
### Entry Points
|
||||||
|
- `index.php` — Frontend
|
||||||
|
- `admin/index.php` — Admin panel
|
||||||
|
- `api.php` — REST API
|
||||||
|
- `ajax.php` — Frontend AJAX
|
||||||
|
- `admin/ajax.php` — Admin AJAX
|
||||||
|
- `cron.php` — CRON jobs
|
||||||
|
|
||||||
|
### Namespace Conventions (case-sensitive on Linux!)
|
||||||
|
- `\Domain\` → `autoload/Domain/` (uppercase D)
|
||||||
|
- `\admin\Controllers\` → `autoload/admin/Controllers/` (lowercase a)
|
||||||
|
- `\Shared\` → `autoload/Shared/`
|
||||||
|
- `\front\` → `autoload/front/`
|
||||||
|
- `\api\` → `autoload/api/`
|
||||||
|
|
||||||
|
### Autoloader
|
||||||
|
Custom autoloader (not Composer at runtime). Tries:
|
||||||
|
1. `autoload/{namespace}/class.{ClassName}.php` (legacy)
|
||||||
|
2. `autoload/{namespace}/{ClassName}.php` (PSR-4 style)
|
||||||
|
|
||||||
|
### Key Classes
|
||||||
|
- `\admin\App` — Admin router
|
||||||
|
- `\front\App` — Frontend router
|
||||||
|
- `\front\LayoutEngine` — Frontend layout engine
|
||||||
|
- `\Shared\Helpers\Helpers` — Utility methods
|
||||||
|
- `\Shared\Tpl\Tpl` — Template engine
|
||||||
|
- `\Shared\Cache\CacheHandler` — Redis cache
|
||||||
|
- `\api\ApiRouter` — REST API router
|
||||||
|
|
||||||
|
## Test Suite
|
||||||
|
765 tests, 2153 assertions. Tests mirror source structure in `tests/Unit/`.
|
||||||
41
.serena/memories/suggested_commands.md
Normal file
41
.serena/memories/suggested_commands.md
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# Suggested Commands
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
```bash
|
||||||
|
# Full test suite (recommended, PowerShell)
|
||||||
|
./test.ps1
|
||||||
|
|
||||||
|
# Specific test file
|
||||||
|
./test.ps1 tests/Unit/Domain/Product/ProductRepositoryTest.php
|
||||||
|
|
||||||
|
# Specific test method
|
||||||
|
./test.ps1 --filter testGetQuantityReturnsCorrectValue
|
||||||
|
|
||||||
|
# Via composer
|
||||||
|
composer test
|
||||||
|
```
|
||||||
|
|
||||||
|
## System Utilities (Windows with Git Bash)
|
||||||
|
```bash
|
||||||
|
# Use Unix-style commands (Git Bash shell)
|
||||||
|
ls # list directory
|
||||||
|
grep -r # search content (prefer Serena tools instead)
|
||||||
|
git status # git operations
|
||||||
|
git log --oneline -10
|
||||||
|
git diff
|
||||||
|
git add <file>
|
||||||
|
git commit -m "message"
|
||||||
|
git push
|
||||||
|
```
|
||||||
|
|
||||||
|
## Development
|
||||||
|
```bash
|
||||||
|
# No build step — PHP is interpreted
|
||||||
|
# No linting/formatting tool configured
|
||||||
|
# Entry points are served via web server (XAMPP)
|
||||||
|
```
|
||||||
|
|
||||||
|
## PHP binary
|
||||||
|
```
|
||||||
|
C:\xampp\php\php.exe
|
||||||
|
```
|
||||||
25
.serena/memories/task_completion_checklist.md
Normal file
25
.serena/memories/task_completion_checklist.md
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# Task Completion Checklist
|
||||||
|
|
||||||
|
When user says "KONIEC PRACY", execute in order:
|
||||||
|
|
||||||
|
1. **Run tests** — `./test.ps1`
|
||||||
|
2. **Update documentation if needed**:
|
||||||
|
- `docs/DATABASE_STRUCTURE.md`
|
||||||
|
- `docs/PROJECT_STRUCTURE.md`
|
||||||
|
- `docs/FORM_EDIT_SYSTEM.md`
|
||||||
|
- `docs/CHANGELOG.md`
|
||||||
|
- `docs/TESTING.md`
|
||||||
|
3. **SQL migrations** (if DB changes): place in `migrations/{version}.sql`
|
||||||
|
- NOT in `updates/` — build script reads from `migrations/` automatically
|
||||||
|
4. **Commit** changes
|
||||||
|
5. **Push** to remote
|
||||||
|
|
||||||
|
## Key Documentation Files
|
||||||
|
- `docs/MEMORY.md` — project memory, known issues
|
||||||
|
- `docs/PROJECT_STRUCTURE.md` — architecture
|
||||||
|
- `docs/DATABASE_STRUCTURE.md` — full DB schema
|
||||||
|
- `docs/TESTING.md` — test suite guide
|
||||||
|
- `docs/FORM_EDIT_SYSTEM.md` — form system
|
||||||
|
- `docs/CHANGELOG.md` — version history
|
||||||
|
- `docs/API.md` — REST API docs
|
||||||
|
- `docs/UPDATE_INSTRUCTIONS.md` — update packages
|
||||||
@@ -116,3 +116,10 @@ initial_prompt: ""
|
|||||||
# override of the corresponding setting in serena_config.yml, see the documentation there.
|
# override of the corresponding setting in serena_config.yml, see the documentation there.
|
||||||
# If null or missing, the value from the global config is used.
|
# If null or missing, the value from the global config is used.
|
||||||
symbol_info_budget:
|
symbol_info_budget:
|
||||||
|
|
||||||
|
# The language backend to use for this project.
|
||||||
|
# If not set, the global setting from serena_config.yml is used.
|
||||||
|
# Valid values: LSP, JetBrains
|
||||||
|
# Note: the backend is fixed at startup. If a project with a different backend
|
||||||
|
# is activated post-init, an error will be returned.
|
||||||
|
language_backend:
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ composer test
|
|||||||
|
|
||||||
PHPUnit 9.6 via `phpunit.phar`. Bootstrap: `tests/bootstrap.php`. Config: `phpunit.xml`.
|
PHPUnit 9.6 via `phpunit.phar`. Bootstrap: `tests/bootstrap.php`. Config: `phpunit.xml`.
|
||||||
|
|
||||||
Current suite: **758 tests, 2135 assertions**.
|
Current suite: **805 tests, 2253 assertions**.
|
||||||
|
|
||||||
### Creating Updates
|
### Creating Updates
|
||||||
See `docs/UPDATE_INSTRUCTIONS.md` for the full procedure. Updates are ZIP packages in `updates/0.XX/`. Never include `*.md` files, `updates/changelog.php`, or root `.htaccess` in update ZIPs.
|
See `docs/UPDATE_INSTRUCTIONS.md` for the full procedure. Updates are ZIP packages in `updates/0.XX/`. Never include `*.md` files, `updates/changelog.php`, or root `.htaccess` in update ZIPs.
|
||||||
@@ -116,7 +116,7 @@ All legacy directories (`admin/controls/`, `admin/factory/`, `admin/view/`, `fro
|
|||||||
- Constructor DI with `$db` (Medoo instance)
|
- Constructor DI with `$db` (Medoo instance)
|
||||||
- Methods serve both admin and frontend (shared Domain, no separate services)
|
- Methods serve both admin and frontend (shared Domain, no separate services)
|
||||||
|
|
||||||
**Domain Modules**: Article, Attribute, Banner, Basket, Cache, Category, Client, Coupon, Dashboard, Dictionaries, Integrations, Languages, Layouts, Newsletter, Order, Pages, PaymentMethod, Producer, Product, ProductSet, Promotion, Scontainers, Settings, ShopStatus, Transport, Update, User
|
**Domain Modules**: Article, Attribute, Banner, Basket, Cache, Category, Client, Coupon, CronJob, Dashboard, Dictionaries, Integrations, Languages, Layouts, Newsletter, Order, Pages, PaymentMethod, Producer, Product, ProductSet, Promotion, Scontainers, Settings, ShopStatus, Transport, Update, User
|
||||||
|
|
||||||
**Admin Controllers** (`autoload/admin/Controllers/`):
|
**Admin Controllers** (`autoload/admin/Controllers/`):
|
||||||
- DI via constructor (repositories injected)
|
- DI via constructor (repositories injected)
|
||||||
@@ -223,3 +223,5 @@ Before starting implementation, review current state of docs (see AGENTS.md for
|
|||||||
- `docs/CHANGELOG.md` — version history
|
- `docs/CHANGELOG.md` — version history
|
||||||
- `docs/API.md` — REST API documentation (ordersPRO)
|
- `docs/API.md` — REST API documentation (ordersPRO)
|
||||||
- `docs/UPDATE_INSTRUCTIONS.md` — how to build client update packages
|
- `docs/UPDATE_INSTRUCTIONS.md` — how to build client update packages
|
||||||
|
|
||||||
|
## Za każdym razem jak próbujesz sprawdzić jakiś plik z logami spróbuj go najpierw pobrać z serwera FTP
|
||||||
@@ -91,6 +91,20 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- API key -->
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-lg-3 control-label" for="inputDefault">API key</label>
|
||||||
|
<div class="col-lg-9">
|
||||||
|
<div class="bs-component">
|
||||||
|
<div class="input-group">
|
||||||
|
<input class="form-control" type="text" id="api_key" name="api_key" placeholder="" value="<?= $this -> settings['api_key'];?>">
|
||||||
|
<span class="input-group-addon cursor" field-id="api_key">
|
||||||
|
<i class="fa fa-save"></i>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
|
|
||||||
@@ -123,4 +137,4 @@
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
<span class="panel-title">Changelog</span>
|
<span class="panel-title">Changelog</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<?= @file_get_contents( 'https://shoppro.project-dc.pl/updates/changelog.php' ); ?>
|
<?= @file_get_contents( 'https://shoppro.project-dc.pl/updates/changelog.php?ver=' . $this->ver ); ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
45
api.php
45
api.php
@@ -47,6 +47,43 @@ if ( !$isApiRequest )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- API routing (ordersPRO) ---
|
||||||
|
if ( $isApiRequest )
|
||||||
|
{
|
||||||
|
if ( !headers_sent() )
|
||||||
|
header( 'Content-Type: application/json; charset=utf-8' );
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$mdb = new medoo( [
|
||||||
|
'database_type' => 'mysql',
|
||||||
|
'database_name' => $database[ 'name' ],
|
||||||
|
'server' => $database[ 'host' ],
|
||||||
|
'username' => $database[ 'user' ],
|
||||||
|
'password' => $database[ 'password' ],
|
||||||
|
'charset' => 'utf8'
|
||||||
|
] );
|
||||||
|
|
||||||
|
$settingsRepo = new \Domain\Settings\SettingsRepository( $mdb );
|
||||||
|
$router = new \api\ApiRouter( $mdb, $settingsRepo );
|
||||||
|
$router->handle();
|
||||||
|
}
|
||||||
|
catch ( \Throwable $e )
|
||||||
|
{
|
||||||
|
if ( !headers_sent() )
|
||||||
|
header( 'Content-Type: application/json; charset=utf-8' );
|
||||||
|
|
||||||
|
http_response_code( 500 );
|
||||||
|
echo json_encode( [
|
||||||
|
'status' => 'error',
|
||||||
|
'code' => 'INTERNAL_ERROR',
|
||||||
|
'message' => 'Internal server error'
|
||||||
|
], JSON_UNESCAPED_UNICODE );
|
||||||
|
}
|
||||||
|
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
$mdb = new medoo( [
|
$mdb = new medoo( [
|
||||||
'database_type' => 'mysql',
|
'database_type' => 'mysql',
|
||||||
'database_name' => $database[ 'name' ],
|
'database_name' => $database[ 'name' ],
|
||||||
@@ -59,14 +96,6 @@ $mdb = new medoo( [
|
|||||||
$settingsRepo = new \Domain\Settings\SettingsRepository( $mdb );
|
$settingsRepo = new \Domain\Settings\SettingsRepository( $mdb );
|
||||||
$settings = $settingsRepo->allSettings();
|
$settings = $settingsRepo->allSettings();
|
||||||
|
|
||||||
// --- API routing (ordersPRO) ---
|
|
||||||
if ( $isApiRequest )
|
|
||||||
{
|
|
||||||
$router = new \api\ApiRouter( $mdb, $settingsRepo );
|
|
||||||
$router->handle();
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Ekomi CSV export ---
|
// --- Ekomi CSV export ---
|
||||||
if ( \Shared\Helpers\Helpers::get( 'ekomi_csv' ) )
|
if ( \Shared\Helpers\Helpers::get( 'ekomi_csv' ) )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -655,6 +655,95 @@ class AttributeRepository
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find existing attribute by name/type or create a new one for API integration.
|
||||||
|
*
|
||||||
|
* @return array{id:int,created:bool}|null
|
||||||
|
*/
|
||||||
|
public function ensureAttributeForApi(string $name, int $type = 0, string $langId = 'pl'): ?array
|
||||||
|
{
|
||||||
|
$normalizedName = trim($name);
|
||||||
|
$normalizedLangId = trim($langId) !== '' ? trim($langId) : 'pl';
|
||||||
|
$normalizedType = $this->toTypeValue($type);
|
||||||
|
if ($normalizedName === '') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$existingId = $this->findAttributeIdByNameAndType($normalizedName, $normalizedType);
|
||||||
|
if ($existingId > 0) {
|
||||||
|
return ['id' => $existingId, 'created' => false];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_shop_attributes', [
|
||||||
|
'status' => 1,
|
||||||
|
'type' => $normalizedType,
|
||||||
|
'o' => $this->nextOrder(),
|
||||||
|
]);
|
||||||
|
$attributeId = (int) $this->db->id();
|
||||||
|
if ($attributeId <= 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_shop_attributes_langs', [
|
||||||
|
'attribute_id' => $attributeId,
|
||||||
|
'lang_id' => $normalizedLangId,
|
||||||
|
'name' => $normalizedName,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->clearTempAndCache();
|
||||||
|
$this->clearFrontCache($attributeId, 'frontAttributeDetails');
|
||||||
|
|
||||||
|
return ['id' => $attributeId, 'created' => true];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find existing value by name within attribute or create a new one for API integration.
|
||||||
|
*
|
||||||
|
* @return array{id:int,created:bool}|null
|
||||||
|
*/
|
||||||
|
public function ensureAttributeValueForApi(int $attributeId, string $name, string $langId = 'pl'): ?array
|
||||||
|
{
|
||||||
|
$normalizedName = trim($name);
|
||||||
|
$normalizedLangId = trim($langId) !== '' ? trim($langId) : 'pl';
|
||||||
|
$attributeId = max(0, $attributeId);
|
||||||
|
|
||||||
|
if ($attributeId <= 0 || $normalizedName === '') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributeExists = (int) $this->db->count('pp_shop_attributes', ['id' => $attributeId]) > 0;
|
||||||
|
if (!$attributeExists) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$existingId = $this->findAttributeValueIdByName($attributeId, $normalizedName);
|
||||||
|
if ($existingId > 0) {
|
||||||
|
return ['id' => $existingId, 'created' => false];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_shop_attributes_values', [
|
||||||
|
'attribute_id' => $attributeId,
|
||||||
|
'impact_on_the_price' => null,
|
||||||
|
'is_default' => 0,
|
||||||
|
]);
|
||||||
|
$valueId = (int) $this->db->id();
|
||||||
|
if ($valueId <= 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_shop_attributes_values_langs', [
|
||||||
|
'value_id' => $valueId,
|
||||||
|
'lang_id' => $normalizedLangId,
|
||||||
|
'name' => $normalizedName,
|
||||||
|
'value' => null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->clearTempAndCache();
|
||||||
|
$this->clearFrontCache($valueId, 'frontValueDetails');
|
||||||
|
|
||||||
|
return ['id' => $valueId, 'created' => true];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array{sql: string, params: array<string, mixed>}
|
* @return array{sql: string, params: array<string, mixed>}
|
||||||
*/
|
*/
|
||||||
@@ -972,6 +1061,52 @@ class AttributeRepository
|
|||||||
return $this->defaultLangId;
|
return $this->defaultLangId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function findAttributeIdByNameAndType(string $name, int $type): int
|
||||||
|
{
|
||||||
|
$statement = $this->db->query(
|
||||||
|
'SELECT sa.id
|
||||||
|
FROM pp_shop_attributes sa
|
||||||
|
INNER JOIN pp_shop_attributes_langs sal ON sal.attribute_id = sa.id
|
||||||
|
WHERE sa.type = :type
|
||||||
|
AND LOWER(TRIM(sal.name)) = LOWER(TRIM(:name))
|
||||||
|
ORDER BY sa.id ASC
|
||||||
|
LIMIT 1',
|
||||||
|
[
|
||||||
|
':type' => $type,
|
||||||
|
':name' => $name,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
if (!$statement) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$id = $statement->fetchColumn();
|
||||||
|
return $id === false ? 0 : (int) $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function findAttributeValueIdByName(int $attributeId, string $name): int
|
||||||
|
{
|
||||||
|
$statement = $this->db->query(
|
||||||
|
'SELECT sav.id
|
||||||
|
FROM pp_shop_attributes_values sav
|
||||||
|
INNER JOIN pp_shop_attributes_values_langs savl ON savl.value_id = sav.id
|
||||||
|
WHERE sav.attribute_id = :attribute_id
|
||||||
|
AND LOWER(TRIM(savl.name)) = LOWER(TRIM(:name))
|
||||||
|
ORDER BY sav.id ASC
|
||||||
|
LIMIT 1',
|
||||||
|
[
|
||||||
|
':attribute_id' => $attributeId,
|
||||||
|
':name' => $name,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
if (!$statement) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$id = $statement->fetchColumn();
|
||||||
|
return $id === false ? 0 : (int) $id;
|
||||||
|
}
|
||||||
|
|
||||||
// ── Frontend methods ──────────────────────────────────────────
|
// ── Frontend methods ──────────────────────────────────────────
|
||||||
|
|
||||||
public function frontAttributeDetails(int $attributeId, string $langId): array
|
public function frontAttributeDetails(int $attributeId, string $langId): array
|
||||||
|
|||||||
140
autoload/Domain/CronJob/CronJobProcessor.php
Normal file
140
autoload/Domain/CronJob/CronJobProcessor.php
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Domain\CronJob;
|
||||||
|
|
||||||
|
class CronJobProcessor
|
||||||
|
{
|
||||||
|
/** @var CronJobRepository */
|
||||||
|
private $cronRepo;
|
||||||
|
|
||||||
|
/** @var array<string, callable> */
|
||||||
|
private $handlers = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param CronJobRepository $cronRepo
|
||||||
|
*/
|
||||||
|
public function __construct(CronJobRepository $cronRepo)
|
||||||
|
{
|
||||||
|
$this->cronRepo = $cronRepo;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Zarejestruj handler dla typu zadania
|
||||||
|
*
|
||||||
|
* @param string $jobType
|
||||||
|
* @param callable $handler fn($payload): bool|array — true/array = success, false/exception = fail
|
||||||
|
*/
|
||||||
|
public function registerHandler($jobType, callable $handler)
|
||||||
|
{
|
||||||
|
$this->handlers[$jobType] = $handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utwórz zadania z harmonogramów, których next_run_at <= NOW
|
||||||
|
*
|
||||||
|
* @return int Liczba utworzonych zadań
|
||||||
|
*/
|
||||||
|
public function createScheduledJobs()
|
||||||
|
{
|
||||||
|
$schedules = $this->cronRepo->getDueSchedules();
|
||||||
|
$created = 0;
|
||||||
|
|
||||||
|
foreach ($schedules as $schedule) {
|
||||||
|
$jobType = $schedule['job_type'];
|
||||||
|
|
||||||
|
// Nie twórz duplikatów
|
||||||
|
if ($this->cronRepo->hasPendingJob($jobType)) {
|
||||||
|
// Mimo duplikatu, przesuń next_run_at żeby nie sprawdzać co sekundę
|
||||||
|
$this->cronRepo->touchSchedule($schedule['id'], (int) $schedule['interval_seconds']);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$payload = null;
|
||||||
|
if (!empty($schedule['payload'])) {
|
||||||
|
$payload = json_decode($schedule['payload'], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->cronRepo->enqueue(
|
||||||
|
$jobType,
|
||||||
|
$payload,
|
||||||
|
(int) $schedule['priority'],
|
||||||
|
(int) $schedule['max_attempts']
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->cronRepo->touchSchedule($schedule['id'], (int) $schedule['interval_seconds']);
|
||||||
|
$created++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $created;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Przetwórz kolejkę zadań
|
||||||
|
*
|
||||||
|
* @param int $limit
|
||||||
|
* @return array Statystyki: ['processed' => int, 'succeeded' => int, 'failed' => int, 'skipped' => int]
|
||||||
|
*/
|
||||||
|
public function processQueue($limit = 10)
|
||||||
|
{
|
||||||
|
$stats = ['processed' => 0, 'succeeded' => 0, 'failed' => 0, 'skipped' => 0];
|
||||||
|
|
||||||
|
$jobs = $this->cronRepo->fetchNext($limit);
|
||||||
|
|
||||||
|
foreach ($jobs as $job) {
|
||||||
|
$jobType = $job['job_type'];
|
||||||
|
$jobId = (int) $job['id'];
|
||||||
|
$stats['processed']++;
|
||||||
|
|
||||||
|
if (!isset($this->handlers[$jobType])) {
|
||||||
|
$this->cronRepo->markFailed($jobId, 'No handler registered for job type: ' . $jobType, (int) $job['attempts']);
|
||||||
|
$stats['skipped']++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$result = call_user_func($this->handlers[$jobType], $job['payload']);
|
||||||
|
|
||||||
|
if ($result === false) {
|
||||||
|
$this->cronRepo->markFailed($jobId, 'Handler returned false', (int) $job['attempts']);
|
||||||
|
$stats['failed']++;
|
||||||
|
} else {
|
||||||
|
$resultData = is_array($result) ? $result : null;
|
||||||
|
$this->cronRepo->markCompleted($jobId, $resultData);
|
||||||
|
$stats['succeeded']++;
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->cronRepo->markFailed($jobId, $e->getMessage(), (int) $job['attempts']);
|
||||||
|
$stats['failed']++;
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
$this->cronRepo->markFailed($jobId, $e->getMessage(), (int) $job['attempts']);
|
||||||
|
$stats['failed']++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $stats;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Główna metoda: utwórz scheduled jobs + przetwórz kolejkę
|
||||||
|
*
|
||||||
|
* @param int $limit
|
||||||
|
* @return array ['scheduled' => int, 'processed' => int, 'succeeded' => int, 'failed' => int, 'skipped' => int]
|
||||||
|
*/
|
||||||
|
public function run($limit = 20)
|
||||||
|
{
|
||||||
|
// Odzyskaj stuck jobs
|
||||||
|
$this->cronRepo->recoverStuck(30);
|
||||||
|
|
||||||
|
// Utwórz zadania z harmonogramów
|
||||||
|
$scheduled = $this->createScheduledJobs();
|
||||||
|
|
||||||
|
// Przetwórz kolejkę
|
||||||
|
$stats = $this->processQueue($limit);
|
||||||
|
$stats['scheduled'] = $scheduled;
|
||||||
|
|
||||||
|
// Cleanup starych zadań (raz na uruchomienie)
|
||||||
|
$this->cronRepo->cleanup(30);
|
||||||
|
|
||||||
|
return $stats;
|
||||||
|
}
|
||||||
|
}
|
||||||
248
autoload/Domain/CronJob/CronJobRepository.php
Normal file
248
autoload/Domain/CronJob/CronJobRepository.php
Normal file
@@ -0,0 +1,248 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Domain\CronJob;
|
||||||
|
|
||||||
|
class CronJobRepository
|
||||||
|
{
|
||||||
|
/** @var \medoo */
|
||||||
|
private $db;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param \medoo $db
|
||||||
|
*/
|
||||||
|
public function __construct($db)
|
||||||
|
{
|
||||||
|
$this->db = $db;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dodaj zadanie do kolejki
|
||||||
|
*
|
||||||
|
* @param string $jobType
|
||||||
|
* @param array|null $payload
|
||||||
|
* @param int $priority
|
||||||
|
* @param int $maxAttempts
|
||||||
|
* @param string|null $scheduledAt
|
||||||
|
* @return int|null ID nowego zadania
|
||||||
|
*/
|
||||||
|
public function enqueue($jobType, $payload = null, $priority = CronJobType::PRIORITY_NORMAL, $maxAttempts = 10, $scheduledAt = null)
|
||||||
|
{
|
||||||
|
$data = [
|
||||||
|
'job_type' => $jobType,
|
||||||
|
'status' => CronJobType::STATUS_PENDING,
|
||||||
|
'priority' => $priority,
|
||||||
|
'max_attempts' => $maxAttempts,
|
||||||
|
'scheduled_at' => $scheduledAt ? $scheduledAt : date('Y-m-d H:i:s'),
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($payload !== null) {
|
||||||
|
$data['payload'] = json_encode($payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_cron_jobs', $data);
|
||||||
|
$id = $this->db->id();
|
||||||
|
|
||||||
|
return $id ? (int) $id : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Atomowe pobranie następnych zadań do przetworzenia.
|
||||||
|
*
|
||||||
|
* Uwaga: SELECT + UPDATE nie jest w pełni atomowe bez transakcji.
|
||||||
|
* Po UPDATE re-SELECT potwierdza, które joby zostały faktycznie przejęte
|
||||||
|
* (chroni przed race condition przy wielu workerach).
|
||||||
|
*
|
||||||
|
* @param int $limit
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function fetchNext($limit = 5)
|
||||||
|
{
|
||||||
|
$now = date('Y-m-d H:i:s');
|
||||||
|
|
||||||
|
$jobs = $this->db->select('pp_cron_jobs', '*', [
|
||||||
|
'status' => CronJobType::STATUS_PENDING,
|
||||||
|
'scheduled_at[<=]' => $now,
|
||||||
|
'ORDER' => ['priority' => 'ASC', 'scheduled_at' => 'ASC'],
|
||||||
|
'LIMIT' => $limit,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (empty($jobs)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$ids = array_column($jobs, 'id');
|
||||||
|
|
||||||
|
$this->db->update('pp_cron_jobs', [
|
||||||
|
'status' => CronJobType::STATUS_PROCESSING,
|
||||||
|
'started_at' => $now,
|
||||||
|
'attempts[+]' => 1,
|
||||||
|
], [
|
||||||
|
'id' => $ids,
|
||||||
|
'status' => CronJobType::STATUS_PENDING,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Re-SELECT: potwierdź, które joby zostały faktycznie przejęte
|
||||||
|
$claimed = $this->db->select('pp_cron_jobs', '*', [
|
||||||
|
'id' => $ids,
|
||||||
|
'status' => CronJobType::STATUS_PROCESSING,
|
||||||
|
'started_at' => $now,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (empty($claimed)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($claimed as &$job) {
|
||||||
|
if ($job['payload'] !== null) {
|
||||||
|
$job['payload'] = json_decode($job['payload'], true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $claimed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Oznacz zadanie jako zakończone
|
||||||
|
*
|
||||||
|
* @param int $jobId
|
||||||
|
* @param mixed $result
|
||||||
|
*/
|
||||||
|
public function markCompleted($jobId, $result = null)
|
||||||
|
{
|
||||||
|
$data = [
|
||||||
|
'status' => CronJobType::STATUS_COMPLETED,
|
||||||
|
'completed_at' => date('Y-m-d H:i:s'),
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($result !== null) {
|
||||||
|
$data['result'] = json_encode($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->update('pp_cron_jobs', $data, ['id' => $jobId]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Oznacz zadanie jako nieudane z backoffem
|
||||||
|
*
|
||||||
|
* @param int $jobId
|
||||||
|
* @param string $error
|
||||||
|
* @param int $attempt Numer próby (do obliczenia backoffu)
|
||||||
|
*/
|
||||||
|
public function markFailed($jobId, $error, $attempt = 1)
|
||||||
|
{
|
||||||
|
$job = $this->db->get('pp_cron_jobs', ['max_attempts', 'attempts'], ['id' => $jobId]);
|
||||||
|
|
||||||
|
$attempts = $job ? (int) $job['attempts'] : $attempt;
|
||||||
|
$maxAttempts = $job ? (int) $job['max_attempts'] : 10;
|
||||||
|
|
||||||
|
if ($attempts >= $maxAttempts) {
|
||||||
|
// Przekroczono limit prób — trwale failed
|
||||||
|
$this->db->update('pp_cron_jobs', [
|
||||||
|
'status' => CronJobType::STATUS_FAILED,
|
||||||
|
'last_error' => mb_substr($error, 0, 500),
|
||||||
|
'completed_at' => date('Y-m-d H:i:s'),
|
||||||
|
], ['id' => $jobId]);
|
||||||
|
} else {
|
||||||
|
// Wróć do pending z backoffem
|
||||||
|
$backoff = CronJobType::calculateBackoff($attempts);
|
||||||
|
$nextRun = date('Y-m-d H:i:s', time() + $backoff);
|
||||||
|
|
||||||
|
$this->db->update('pp_cron_jobs', [
|
||||||
|
'status' => CronJobType::STATUS_PENDING,
|
||||||
|
'last_error' => mb_substr($error, 0, 500),
|
||||||
|
'scheduled_at' => $nextRun,
|
||||||
|
], ['id' => $jobId]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sprawdź czy istnieje pending job danego typu z opcjonalnym payload match
|
||||||
|
*
|
||||||
|
* @param string $jobType
|
||||||
|
* @param array|null $payloadMatch
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasPendingJob($jobType, $payloadMatch = null)
|
||||||
|
{
|
||||||
|
$where = [
|
||||||
|
'job_type' => $jobType,
|
||||||
|
'status' => [CronJobType::STATUS_PENDING, CronJobType::STATUS_PROCESSING],
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($payloadMatch !== null) {
|
||||||
|
$where['payload'] = json_encode($payloadMatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
$count = $this->db->count('pp_cron_jobs', $where);
|
||||||
|
return $count > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wyczyść stare zakończone zadania
|
||||||
|
*
|
||||||
|
* @param int $olderThanDays
|
||||||
|
*/
|
||||||
|
public function cleanup($olderThanDays = 30)
|
||||||
|
{
|
||||||
|
$cutoff = date('Y-m-d H:i:s', time() - ($olderThanDays * 86400));
|
||||||
|
|
||||||
|
$this->db->delete('pp_cron_jobs', [
|
||||||
|
'status' => [CronJobType::STATUS_COMPLETED, CronJobType::STATUS_FAILED, CronJobType::STATUS_CANCELLED],
|
||||||
|
'updated_at[<]' => $cutoff,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Odzyskaj zablokowane zadania (stuck w processing)
|
||||||
|
*
|
||||||
|
* @param int $olderThanMinutes
|
||||||
|
*/
|
||||||
|
public function recoverStuck($olderThanMinutes = 30)
|
||||||
|
{
|
||||||
|
$cutoff = date('Y-m-d H:i:s', time() - ($olderThanMinutes * 60));
|
||||||
|
|
||||||
|
$this->db->update('pp_cron_jobs', [
|
||||||
|
'status' => CronJobType::STATUS_PENDING,
|
||||||
|
'started_at' => null,
|
||||||
|
], [
|
||||||
|
'status' => CronJobType::STATUS_PROCESSING,
|
||||||
|
'started_at[<]' => $cutoff,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pobierz harmonogramy gotowe do uruchomienia
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getDueSchedules()
|
||||||
|
{
|
||||||
|
$now = date('Y-m-d H:i:s');
|
||||||
|
|
||||||
|
return $this->db->select('pp_cron_schedules', '*', [
|
||||||
|
'enabled' => 1,
|
||||||
|
'OR' => [
|
||||||
|
'next_run_at' => null,
|
||||||
|
'next_run_at[<=]' => $now,
|
||||||
|
],
|
||||||
|
'ORDER' => ['priority' => 'ASC'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Aktualizuj harmonogram po uruchomieniu
|
||||||
|
*
|
||||||
|
* @param int $scheduleId
|
||||||
|
* @param int $intervalSeconds
|
||||||
|
*/
|
||||||
|
public function touchSchedule($scheduleId, $intervalSeconds)
|
||||||
|
{
|
||||||
|
$now = date('Y-m-d H:i:s');
|
||||||
|
$nextRun = date('Y-m-d H:i:s', time() + $intervalSeconds);
|
||||||
|
|
||||||
|
$this->db->update('pp_cron_schedules', [
|
||||||
|
'last_run_at' => $now,
|
||||||
|
'next_run_at' => $nextRun,
|
||||||
|
], ['id' => $scheduleId]);
|
||||||
|
}
|
||||||
|
}
|
||||||
81
autoload/Domain/CronJob/CronJobType.php
Normal file
81
autoload/Domain/CronJob/CronJobType.php
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Domain\CronJob;
|
||||||
|
|
||||||
|
class CronJobType
|
||||||
|
{
|
||||||
|
// Job types
|
||||||
|
const APILO_TOKEN_KEEPALIVE = 'apilo_token_keepalive';
|
||||||
|
const APILO_SEND_ORDER = 'apilo_send_order';
|
||||||
|
const APILO_SYNC_PAYMENT = 'apilo_sync_payment';
|
||||||
|
const APILO_SYNC_STATUS = 'apilo_sync_status';
|
||||||
|
const APILO_PRODUCT_SYNC = 'apilo_product_sync';
|
||||||
|
const APILO_PRICELIST_SYNC = 'apilo_pricelist_sync';
|
||||||
|
const APILO_STATUS_POLL = 'apilo_status_poll';
|
||||||
|
const PRICE_HISTORY = 'price_history';
|
||||||
|
const ORDER_ANALYSIS = 'order_analysis';
|
||||||
|
const TRUSTMATE_INVITATION = 'trustmate_invitation';
|
||||||
|
const GOOGLE_XML_FEED = 'google_xml_feed';
|
||||||
|
|
||||||
|
// Priorities (lower = more important)
|
||||||
|
const PRIORITY_CRITICAL = 10;
|
||||||
|
const PRIORITY_SEND_ORDER = 40; // apilo_send_order musi być PRZED sync payment/status
|
||||||
|
const PRIORITY_HIGH = 50;
|
||||||
|
const PRIORITY_NORMAL = 100;
|
||||||
|
const PRIORITY_LOW = 200;
|
||||||
|
|
||||||
|
// Statuses
|
||||||
|
const STATUS_PENDING = 'pending';
|
||||||
|
const STATUS_PROCESSING = 'processing';
|
||||||
|
const STATUS_COMPLETED = 'completed';
|
||||||
|
const STATUS_FAILED = 'failed';
|
||||||
|
const STATUS_CANCELLED = 'cancelled';
|
||||||
|
|
||||||
|
// Backoff
|
||||||
|
const BASE_BACKOFF_SECONDS = 60;
|
||||||
|
const MAX_BACKOFF_SECONDS = 3600;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string[]
|
||||||
|
*/
|
||||||
|
public static function allTypes()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
self::APILO_TOKEN_KEEPALIVE,
|
||||||
|
self::APILO_SEND_ORDER,
|
||||||
|
self::APILO_SYNC_PAYMENT,
|
||||||
|
self::APILO_SYNC_STATUS,
|
||||||
|
self::APILO_PRODUCT_SYNC,
|
||||||
|
self::APILO_PRICELIST_SYNC,
|
||||||
|
self::APILO_STATUS_POLL,
|
||||||
|
self::PRICE_HISTORY,
|
||||||
|
self::ORDER_ANALYSIS,
|
||||||
|
self::TRUSTMATE_INVITATION,
|
||||||
|
self::GOOGLE_XML_FEED,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string[]
|
||||||
|
*/
|
||||||
|
public static function allStatuses()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
self::STATUS_PENDING,
|
||||||
|
self::STATUS_PROCESSING,
|
||||||
|
self::STATUS_COMPLETED,
|
||||||
|
self::STATUS_FAILED,
|
||||||
|
self::STATUS_CANCELLED,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $attempt
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public static function calculateBackoff($attempt)
|
||||||
|
{
|
||||||
|
$backoff = self::BASE_BACKOFF_SECONDS * pow(2, $attempt - 1);
|
||||||
|
return min($backoff, self::MAX_BACKOFF_SECONDS);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -668,15 +668,12 @@ class IntegrationsRepository
|
|||||||
public function shopproImportProduct( int $productId ): array
|
public function shopproImportProduct( int $productId ): array
|
||||||
{
|
{
|
||||||
$settings = $this->getSettings( 'shoppro' );
|
$settings = $this->getSettings( 'shoppro' );
|
||||||
|
$missingSetting = $this->missingShopproSetting( $settings, [ 'domain', 'db_name', 'db_host', 'db_user' ] );
|
||||||
|
if ( $missingSetting !== null ) {
|
||||||
|
return [ 'success' => false, 'message' => 'Brakuje konfiguracji shopPRO: ' . $missingSetting . '.' ];
|
||||||
|
}
|
||||||
|
|
||||||
$mdb2 = new \medoo( [
|
$mdb2 = $this->shopproDb( $settings );
|
||||||
'database_type' => 'mysql',
|
|
||||||
'database_name' => $settings['db_name'],
|
|
||||||
'server' => $settings['db_host'],
|
|
||||||
'username' => $settings['db_user'],
|
|
||||||
'password' => $settings['db_password'],
|
|
||||||
'charset' => 'utf8'
|
|
||||||
] );
|
|
||||||
|
|
||||||
$product = $mdb2->get( 'pp_shop_products', '*', [ 'id' => $productId ] );
|
$product = $mdb2->get( 'pp_shop_products', '*', [ 'id' => $productId ] );
|
||||||
if ( !$product )
|
if ( !$product )
|
||||||
@@ -700,6 +697,7 @@ class IntegrationsRepository
|
|||||||
'additional_message_text' => $product['additional_message_text'],
|
'additional_message_text' => $product['additional_message_text'],
|
||||||
'additional_message_required'=> $product['additional_message_required'],
|
'additional_message_required'=> $product['additional_message_required'],
|
||||||
'weight' => $product['weight'],
|
'weight' => $product['weight'],
|
||||||
|
'producer_id' => $product['producer_id'] ?? null,
|
||||||
] );
|
] );
|
||||||
|
|
||||||
$newProductId = $this->db->id();
|
$newProductId = $this->db->id();
|
||||||
@@ -729,41 +727,149 @@ class IntegrationsRepository
|
|||||||
'warehouse_message_nonzero'=> $lang['warehouse_message_nonzero'],
|
'warehouse_message_nonzero'=> $lang['warehouse_message_nonzero'],
|
||||||
'canonical' => $lang['canonical'],
|
'canonical' => $lang['canonical'],
|
||||||
'xml_name' => $lang['xml_name'],
|
'xml_name' => $lang['xml_name'],
|
||||||
|
'security_information' => $lang['security_information'] ?? null,
|
||||||
|
] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Import custom fields
|
||||||
|
$customFields = $mdb2->select( 'pp_shop_products_custom_fields', '*', [ 'id_product' => $productId ] );
|
||||||
|
if ( is_array( $customFields ) ) {
|
||||||
|
foreach ( $customFields as $field ) {
|
||||||
|
$this->db->insert( 'pp_shop_products_custom_fields', [
|
||||||
|
'id_product' => $newProductId,
|
||||||
|
'name' => (string)($field['name'] ?? ''),
|
||||||
|
'type' => (string)($field['type'] ?? 'text'),
|
||||||
|
'is_required' => !empty( $field['is_required'] ) ? 1 : 0,
|
||||||
] );
|
] );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Import images
|
// Import images
|
||||||
$images = $mdb2->select( 'pp_shop_products_images', '*', [ 'product_id' => $productId ] );
|
$images = $mdb2->select( 'pp_shop_products_images', '*', [ 'product_id' => $productId ] );
|
||||||
|
$importLog = [];
|
||||||
|
$domainRaw = preg_replace( '#^https?://#', '', (string)($settings['domain'] ?? '') );
|
||||||
if ( is_array( $images ) ) {
|
if ( is_array( $images ) ) {
|
||||||
foreach ( $images as $image ) {
|
foreach ( $images as $image ) {
|
||||||
$imageUrl = 'https://' . $settings['domain'] . $image['src'];
|
$srcPath = (string)($image['src'] ?? '');
|
||||||
|
$imageUrl = 'https://' . rtrim( $domainRaw, '/' ) . '/' . ltrim( $srcPath, '/' );
|
||||||
|
$imageName = basename( $srcPath );
|
||||||
|
|
||||||
|
if ( $imageName === '' ) {
|
||||||
|
$importLog[] = '[SKIP] Pusta nazwa pliku dla src: ' . $srcPath;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$ch = curl_init( $imageUrl );
|
$ch = curl_init( $imageUrl );
|
||||||
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
|
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
|
||||||
curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
|
curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
|
||||||
curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
|
curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
|
||||||
curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false );
|
curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false );
|
||||||
$imageData = curl_exec( $ch );
|
curl_setopt( $ch, CURLOPT_TIMEOUT, 30 );
|
||||||
|
curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 10 );
|
||||||
|
$imageData = curl_exec( $ch );
|
||||||
|
$httpCode = (int)curl_getinfo( $ch, CURLINFO_HTTP_CODE );
|
||||||
|
$curlErrno = curl_errno( $ch );
|
||||||
|
$curlError = curl_error( $ch );
|
||||||
curl_close( $ch );
|
curl_close( $ch );
|
||||||
|
|
||||||
$imageName = basename( $imageUrl );
|
if ( $curlErrno !== 0 || $imageData === false ) {
|
||||||
$imageDir = '../upload/product_images/product_' . $newProductId;
|
$importLog[] = '[ERROR] cURL: ' . $imageUrl . ' — błąd ' . $curlErrno . ': ' . $curlError;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $httpCode !== 200 ) {
|
||||||
|
$importLog[] = '[ERROR] HTTP ' . $httpCode . ': ' . $imageUrl;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$imageDir = dirname( __DIR__, 3 ) . '/upload/product_images/product_' . $newProductId;
|
||||||
$imagePath = $imageDir . '/' . $imageName;
|
$imagePath = $imageDir . '/' . $imageName;
|
||||||
|
|
||||||
if ( !file_exists( $imageDir ) )
|
if ( !file_exists( $imageDir ) && !mkdir( $imageDir, 0777, true ) && !file_exists( $imageDir ) ) {
|
||||||
mkdir( $imageDir, 0777, true );
|
$importLog[] = '[ERROR] Nie można utworzyć katalogu: ' . $imageDir;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
file_put_contents( $imagePath, $imageData );
|
$written = file_put_contents( $imagePath, $imageData );
|
||||||
|
if ( $written === false ) {
|
||||||
|
$importLog[] = '[ERROR] Zapis pliku nieudany: ' . $imagePath;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->insert( 'pp_shop_products_images', [
|
$this->db->insert( 'pp_shop_products_images', [
|
||||||
'product_id' => $newProductId,
|
'product_id' => $newProductId,
|
||||||
'src' => '/upload/product_images/product_' . $newProductId . '/' . $imageName,
|
'src' => '/upload/product_images/product_' . $newProductId . '/' . $imageName,
|
||||||
|
'alt' => $image['alt'] ?? '',
|
||||||
'o' => $image['o'],
|
'o' => $image['o'],
|
||||||
] );
|
] );
|
||||||
|
$importLog[] = '[OK] ' . $imageUrl . ' → ' . $imagePath . ' (' . $written . ' B)';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return [ 'success' => true, 'message' => 'Produkt został zaimportowany.' ];
|
// Zapisz log importu zdjęć (ścieżka absolutna — niezależna od cwd)
|
||||||
|
$logDir = dirname( __DIR__, 3 ) . '/logs';
|
||||||
|
$logFile = $logDir . '/shoppro-import-debug.log';
|
||||||
|
$mkdirOk = file_exists( $logDir ) || mkdir( $logDir, 0755, true ) || file_exists( $logDir );
|
||||||
|
$logEntry = '[' . date( 'Y-m-d H:i:s' ) . '] Import produktu #' . $productId . ' → #' . $newProductId . "\n"
|
||||||
|
. ' Domain: ' . $domainRaw . "\n"
|
||||||
|
. ' Obrazy źródłowe: ' . count( $images ?: [] ) . "\n";
|
||||||
|
foreach ( $importLog as $line ) {
|
||||||
|
$logEntry .= ' ' . $line . "\n";
|
||||||
|
}
|
||||||
|
// Zawsze loguj do error_log (niezależnie od uprawnień do pliku)
|
||||||
|
error_log( '[shopPRO shoppro-import] ' . str_replace( "\n", ' | ', $logEntry ) );
|
||||||
|
|
||||||
|
if ( $mkdirOk && file_put_contents( $logFile, $logEntry, FILE_APPEND ) === false ) {
|
||||||
|
error_log( '[shopPRO shoppro-import] WARN: nie można zapisać logu do: ' . $logFile );
|
||||||
|
} elseif ( !$mkdirOk ) {
|
||||||
|
error_log( '[shopPRO shoppro-import] WARN: nie można utworzyć katalogu: ' . $logDir );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Zbuduj czytelny komunikat z wynikiem importu zdjęć
|
||||||
|
$imgCount = count( $images ?: [] );
|
||||||
|
if ( $imgCount === 0 ) {
|
||||||
|
$imgSummary = 'Zdjęcia: brak w bazie źródłowej.';
|
||||||
|
} else {
|
||||||
|
$ok = 0;
|
||||||
|
$errors = [];
|
||||||
|
foreach ( $importLog as $line ) {
|
||||||
|
if ( strncmp( $line, '[OK]', 4 ) === 0 ) {
|
||||||
|
$ok++;
|
||||||
|
} else {
|
||||||
|
$errors[] = $line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$imgSummary = 'Zdjęcia: ' . $ok . '/' . $imgCount . ' zaimportowanych.';
|
||||||
|
if ( !empty( $errors ) ) {
|
||||||
|
$imgSummary .= ' Błędy: ' . implode( '; ', $errors );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [ 'success' => true, 'message' => 'Produkt został zaimportowany. ' . $imgSummary ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function missingShopproSetting( array $settings, array $requiredKeys ): ?string
|
||||||
|
{
|
||||||
|
foreach ( $requiredKeys as $requiredKey ) {
|
||||||
|
if ( trim( (string)($settings[$requiredKey] ?? '') ) === '' ) {
|
||||||
|
return $requiredKey;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function shopproDb( array $settings ): \medoo
|
||||||
|
{
|
||||||
|
return new \medoo( [
|
||||||
|
'database_type' => 'mysql',
|
||||||
|
'database_name' => $settings['db_name'],
|
||||||
|
'server' => $settings['db_host'],
|
||||||
|
'username' => $settings['db_user'],
|
||||||
|
'password' => $settings['db_password'] ?? '',
|
||||||
|
'charset' => 'utf8'
|
||||||
|
] );
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,17 +7,21 @@ class OrderAdminService
|
|||||||
private $productRepo;
|
private $productRepo;
|
||||||
private $settingsRepo;
|
private $settingsRepo;
|
||||||
private $transportRepo;
|
private $transportRepo;
|
||||||
|
/** @var \Domain\CronJob\CronJobRepository|null */
|
||||||
|
private $cronJobRepo;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
OrderRepository $orders,
|
OrderRepository $orders,
|
||||||
$productRepo = null,
|
$productRepo = null,
|
||||||
$settingsRepo = null,
|
$settingsRepo = null,
|
||||||
$transportRepo = null
|
$transportRepo = null,
|
||||||
|
$cronJobRepo = null
|
||||||
) {
|
) {
|
||||||
$this->orders = $orders;
|
$this->orders = $orders;
|
||||||
$this->productRepo = $productRepo;
|
$this->productRepo = $productRepo;
|
||||||
$this->settingsRepo = $settingsRepo;
|
$this->settingsRepo = $settingsRepo;
|
||||||
$this->transportRepo = $transportRepo;
|
$this->transportRepo = $transportRepo;
|
||||||
|
$this->cronJobRepo = $cronJobRepo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function details(int $orderId): array
|
public function details(int $orderId): array
|
||||||
@@ -519,92 +523,6 @@ class OrderAdminService
|
|||||||
return $this->orders->deleteOrder($orderId);
|
return $this->orders->deleteOrder($orderId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
|
||||||
// Apilo sync queue (migrated from \shop\Order)
|
|
||||||
// =========================================================================
|
|
||||||
|
|
||||||
private const APILO_SYNC_QUEUE_FILE = '/temp/apilo-sync-queue.json';
|
|
||||||
|
|
||||||
public function processApiloSyncQueue(int $limit = 10): int
|
|
||||||
{
|
|
||||||
$queue = self::loadApiloSyncQueue();
|
|
||||||
if (!\Shared\Helpers\Helpers::is_array_fix($queue)) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$processed = 0;
|
|
||||||
|
|
||||||
foreach ($queue as $key => $task)
|
|
||||||
{
|
|
||||||
if ($processed >= $limit) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
$order_id = (int)($task['order_id'] ?? 0);
|
|
||||||
if ($order_id <= 0) {
|
|
||||||
unset($queue[$key]);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$order = $this->orders->findRawById($order_id);
|
|
||||||
if (!$order) {
|
|
||||||
unset($queue[$key]);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$error = '';
|
|
||||||
$sync_failed = false;
|
|
||||||
$max_attempts = 50; // ~8h przy cronie co 10 min
|
|
||||||
|
|
||||||
// Zamówienie jeszcze nie wysłane do Apilo — czekaj na crona
|
|
||||||
if (!(int)$order['apilo_order_id']) {
|
|
||||||
$attempts = (int)($task['attempts'] ?? 0) + 1;
|
|
||||||
if ($attempts >= $max_attempts) {
|
|
||||||
// Przekroczono limit prób — porzuć task
|
|
||||||
unset($queue[$key]);
|
|
||||||
} else {
|
|
||||||
$task['attempts'] = $attempts;
|
|
||||||
$task['last_error'] = 'awaiting_apilo_order';
|
|
||||||
$task['updated_at'] = date('Y-m-d H:i:s');
|
|
||||||
$queue[$key] = $task;
|
|
||||||
}
|
|
||||||
$processed++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$payment_pending = !empty($task['payment']) && (int)$order['paid'] === 1;
|
|
||||||
if ($payment_pending) {
|
|
||||||
if (!$this->syncApiloPayment($order)) {
|
|
||||||
$sync_failed = true;
|
|
||||||
$error = 'payment_sync_failed';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$status_pending = isset($task['status']) && $task['status'] !== null && $task['status'] !== '';
|
|
||||||
if (!$sync_failed && $status_pending) {
|
|
||||||
if (!$this->syncApiloStatus($order, (int)$task['status'])) {
|
|
||||||
$sync_failed = true;
|
|
||||||
$error = 'status_sync_failed';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($sync_failed) {
|
|
||||||
$task['attempts'] = (int)($task['attempts'] ?? 0) + 1;
|
|
||||||
$task['last_error'] = $error;
|
|
||||||
$task['updated_at'] = date('Y-m-d H:i:s');
|
|
||||||
$queue[$key] = $task;
|
|
||||||
} else {
|
|
||||||
unset($queue[$key]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$processed++;
|
|
||||||
}
|
|
||||||
|
|
||||||
self::saveApiloSyncQueue($queue);
|
|
||||||
|
|
||||||
return $processed;
|
|
||||||
}
|
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// Private: email
|
// Private: email
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
@@ -689,7 +607,7 @@ class OrderAdminService
|
|||||||
'Brak apilo_order_id — płatność zakolejkowana do sync',
|
'Brak apilo_order_id — płatność zakolejkowana do sync',
|
||||||
['apilo_order_id' => $order['apilo_order_id'] ?? null]
|
['apilo_order_id' => $order['apilo_order_id'] ?? null]
|
||||||
);
|
);
|
||||||
self::queueApiloSync((int)$order['id'], true, null, 'awaiting_apilo_order');
|
$this->queueApiloSync((int)$order['id'], true, null, 'awaiting_apilo_order');
|
||||||
} elseif (!$this->syncApiloPayment($order)) {
|
} elseif (!$this->syncApiloPayment($order)) {
|
||||||
\Domain\Integrations\ApiloLogger::log(
|
\Domain\Integrations\ApiloLogger::log(
|
||||||
$db,
|
$db,
|
||||||
@@ -698,7 +616,7 @@ class OrderAdminService
|
|||||||
'Sync płatności nieudany — zakolejkowano ponowną próbę',
|
'Sync płatności nieudany — zakolejkowano ponowną próbę',
|
||||||
['apilo_order_id' => $order['apilo_order_id']]
|
['apilo_order_id' => $order['apilo_order_id']]
|
||||||
);
|
);
|
||||||
self::queueApiloSync((int)$order['id'], true, null, 'payment_sync_failed');
|
$this->queueApiloSync((int)$order['id'], true, null, 'payment_sync_failed');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -739,7 +657,7 @@ class OrderAdminService
|
|||||||
'Brak apilo_order_id — status zakolejkowany do sync',
|
'Brak apilo_order_id — status zakolejkowany do sync',
|
||||||
['apilo_order_id' => $order['apilo_order_id'] ?? null, 'target_status' => $status]
|
['apilo_order_id' => $order['apilo_order_id'] ?? null, 'target_status' => $status]
|
||||||
);
|
);
|
||||||
self::queueApiloSync((int)$order['id'], false, $status, 'awaiting_apilo_order');
|
$this->queueApiloSync((int)$order['id'], false, $status, 'awaiting_apilo_order');
|
||||||
} elseif (!$this->syncApiloStatus($order, $status)) {
|
} elseif (!$this->syncApiloStatus($order, $status)) {
|
||||||
\Domain\Integrations\ApiloLogger::log(
|
\Domain\Integrations\ApiloLogger::log(
|
||||||
$db,
|
$db,
|
||||||
@@ -748,11 +666,11 @@ class OrderAdminService
|
|||||||
'Sync statusu nieudany — zakolejkowano ponowną próbę',
|
'Sync statusu nieudany — zakolejkowano ponowną próbę',
|
||||||
['apilo_order_id' => $order['apilo_order_id'], 'target_status' => $status]
|
['apilo_order_id' => $order['apilo_order_id'], 'target_status' => $status]
|
||||||
);
|
);
|
||||||
self::queueApiloSync((int)$order['id'], false, $status, 'status_sync_failed');
|
$this->queueApiloSync((int)$order['id'], false, $status, 'status_sync_failed');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function syncApiloPayment(array $order): bool
|
public function syncApiloPayment(array $order): bool
|
||||||
{
|
{
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
@@ -819,7 +737,7 @@ class OrderAdminService
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function syncApiloStatus(array $order, int $status): bool
|
public function syncApiloStatus(array $order, int $status): bool
|
||||||
{
|
{
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
@@ -882,59 +800,42 @@ class OrderAdminService
|
|||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// Private: Apilo sync queue file helpers
|
// Private: Apilo sync queue (DB-based via CronJobRepository)
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
private static function queueApiloSync(int $order_id, bool $payment, ?int $status, string $error): void
|
private function queueApiloSync(int $order_id, bool $payment, ?int $status, string $error): void
|
||||||
{
|
{
|
||||||
if ($order_id <= 0) return;
|
if ($order_id <= 0) return;
|
||||||
|
|
||||||
$queue = self::loadApiloSyncQueue();
|
if ($this->cronJobRepo === null) return;
|
||||||
$key = (string)$order_id;
|
|
||||||
$row = is_array($queue[$key] ?? null) ? $queue[$key] : [];
|
if ($payment) {
|
||||||
|
$jobType = \Domain\CronJob\CronJobType::APILO_SYNC_PAYMENT;
|
||||||
|
$payload = ['order_id' => $order_id];
|
||||||
|
|
||||||
|
if (!$this->cronJobRepo->hasPendingJob($jobType, $payload)) {
|
||||||
|
$this->cronJobRepo->enqueue(
|
||||||
|
$jobType,
|
||||||
|
$payload,
|
||||||
|
\Domain\CronJob\CronJobType::PRIORITY_HIGH,
|
||||||
|
50
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$row['order_id'] = $order_id;
|
|
||||||
$row['payment'] = !empty($row['payment']) || $payment ? 1 : 0;
|
|
||||||
if ($status !== null) {
|
if ($status !== null) {
|
||||||
$row['status'] = $status;
|
$jobType = \Domain\CronJob\CronJobType::APILO_SYNC_STATUS;
|
||||||
|
$payload = ['order_id' => $order_id, 'status' => $status];
|
||||||
|
|
||||||
|
if (!$this->cronJobRepo->hasPendingJob($jobType, $payload)) {
|
||||||
|
$this->cronJobRepo->enqueue(
|
||||||
|
$jobType,
|
||||||
|
$payload,
|
||||||
|
\Domain\CronJob\CronJobType::PRIORITY_HIGH,
|
||||||
|
50
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$row['attempts'] = (int)($row['attempts'] ?? 0) + 1;
|
|
||||||
$row['last_error'] = $error;
|
|
||||||
$row['updated_at'] = date('Y-m-d H:i:s');
|
|
||||||
|
|
||||||
$queue[$key] = $row;
|
|
||||||
self::saveApiloSyncQueue($queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static function apiloSyncQueuePath(): string
|
|
||||||
{
|
|
||||||
return dirname(__DIR__, 2) . self::APILO_SYNC_QUEUE_FILE;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static function loadApiloSyncQueue(): array
|
|
||||||
{
|
|
||||||
$path = self::apiloSyncQueuePath();
|
|
||||||
if (!file_exists($path)) return [];
|
|
||||||
|
|
||||||
$content = file_get_contents($path);
|
|
||||||
if (!$content) return [];
|
|
||||||
|
|
||||||
$decoded = json_decode($content, true);
|
|
||||||
if (!is_array($decoded)) return [];
|
|
||||||
|
|
||||||
return $decoded;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static function saveApiloSyncQueue(array $queue): void
|
|
||||||
{
|
|
||||||
$path = self::apiloSyncQueuePath();
|
|
||||||
$dir = dirname($path);
|
|
||||||
if (!is_dir($dir)) {
|
|
||||||
mkdir($dir, 0777, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
file_put_contents($path, json_encode($queue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOCK_EX);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function appendApiloLog(string $message): void
|
private static function appendApiloLog(string $message): void
|
||||||
|
|||||||
@@ -357,4 +357,34 @@ class ProducerRepository
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Znajdź producenta po nazwie lub utwórz nowego (dla API).
|
||||||
|
*
|
||||||
|
* @return array{id: int, created: bool}
|
||||||
|
*/
|
||||||
|
public function ensureProducerForApi(string $name): array
|
||||||
|
{
|
||||||
|
$name = trim($name);
|
||||||
|
if ($name === '') {
|
||||||
|
return ['id' => 0, 'created' => false];
|
||||||
|
}
|
||||||
|
|
||||||
|
$existing = $this->db->get('pp_shop_producer', 'id', ['name' => $name]);
|
||||||
|
if (!empty($existing)) {
|
||||||
|
return ['id' => (int)$existing, 'created' => false];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->insert('pp_shop_producer', [
|
||||||
|
'name' => $name,
|
||||||
|
'status' => 1,
|
||||||
|
'img' => null,
|
||||||
|
]);
|
||||||
|
$id = (int)$this->db->id();
|
||||||
|
if ($id <= 0) {
|
||||||
|
return ['id' => 0, 'created' => false];
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['id' => $id, 'created' => true];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -657,6 +657,7 @@ class ProductRepository
|
|||||||
'set_id' => $product['set_id'] !== null ? (int)$product['set_id'] : null,
|
'set_id' => $product['set_id'] !== null ? (int)$product['set_id'] : null,
|
||||||
'product_unit_id' => $product['product_unit_id'] !== null ? (int)$product['product_unit_id'] : null,
|
'product_unit_id' => $product['product_unit_id'] !== null ? (int)$product['product_unit_id'] : null,
|
||||||
'producer_id' => $product['producer_id'] !== null ? (int)$product['producer_id'] : null,
|
'producer_id' => $product['producer_id'] !== null ? (int)$product['producer_id'] : null,
|
||||||
|
'producer_name' => $this->resolveProducerName($product['producer_id']),
|
||||||
'date_add' => $product['date_add'],
|
'date_add' => $product['date_add'],
|
||||||
'date_modify' => $product['date_modify'],
|
'date_modify' => $product['date_modify'],
|
||||||
];
|
];
|
||||||
@@ -682,6 +683,7 @@ class ProductRepository
|
|||||||
'tab_name_2' => $lang['tab_name_2'],
|
'tab_name_2' => $lang['tab_name_2'],
|
||||||
'tab_description_2' => $lang['tab_description_2'],
|
'tab_description_2' => $lang['tab_description_2'],
|
||||||
'canonical' => $lang['canonical'],
|
'canonical' => $lang['canonical'],
|
||||||
|
'security_information' => $lang['security_information'] ?? null,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -733,6 +735,19 @@ class ProductRepository
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Custom fields (Dodatkowe pola)
|
||||||
|
$customFields = $this->db->select('pp_shop_products_custom_fields', ['name', 'type', 'is_required'], ['id_product' => $id]);
|
||||||
|
$result['custom_fields'] = [];
|
||||||
|
if (is_array($customFields)) {
|
||||||
|
foreach ($customFields as $cf) {
|
||||||
|
$result['custom_fields'][] = [
|
||||||
|
'name' => $cf['name'],
|
||||||
|
'type' => !empty($cf['type']) ? $cf['type'] : 'text',
|
||||||
|
'is_required' => $cf['is_required'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Variants (only for parent products)
|
// Variants (only for parent products)
|
||||||
if (empty($product['parent_id'])) {
|
if (empty($product['parent_id'])) {
|
||||||
$result['variants'] = $this->findVariantsForApi($id);
|
$result['variants'] = $this->findVariantsForApi($id);
|
||||||
@@ -1116,6 +1131,21 @@ class ProductRepository
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Zwraca nazwę producenta po ID (null jeśli brak).
|
||||||
|
*
|
||||||
|
* @param mixed $producerId
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
private function resolveProducerName($producerId): ?string
|
||||||
|
{
|
||||||
|
if (empty($producerId)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
$name = $this->db->get('pp_shop_producer', 'name', ['id' => (int)$producerId]);
|
||||||
|
return ($name !== false && $name !== null) ? (string)$name : null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Szczegóły produktu (admin) — zastępuje factory product_details().
|
* Szczegóły produktu (admin) — zastępuje factory product_details().
|
||||||
*/
|
*/
|
||||||
@@ -1239,7 +1269,7 @@ class ProductRepository
|
|||||||
|
|
||||||
$productData = [
|
$productData = [
|
||||||
'date_modify' => date( 'Y-m-d H:i:s' ),
|
'date_modify' => date( 'Y-m-d H:i:s' ),
|
||||||
'modify_by' => $userId,
|
'modify_by' => $userId !== null ? (int) $userId : 0,
|
||||||
'status' => ( $d['status'] ?? '' ) === 'on' ? 1 : 0,
|
'status' => ( $d['status'] ?? '' ) === 'on' ? 1 : 0,
|
||||||
'price_netto' => $this->nullIfEmpty( $d['price_netto'] ?? null ),
|
'price_netto' => $this->nullIfEmpty( $d['price_netto'] ?? null ),
|
||||||
'price_brutto' => $this->nullIfEmpty( $d['price_brutto'] ?? null ),
|
'price_brutto' => $this->nullIfEmpty( $d['price_brutto'] ?? null ),
|
||||||
@@ -1301,7 +1331,10 @@ class ProductRepository
|
|||||||
$this->saveImagesOrder( $productId, $d['gallery_order'] );
|
$this->saveImagesOrder( $productId, $d['gallery_order'] );
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->saveCustomFields( $productId, $d['custom_field_name'] ?? [], $d['custom_field_type'] ?? [], $d['custom_field_required'] ?? [] );
|
// Zapisz custom fields tylko gdy jawnie podane (partial update przez API może nie zawierać tego klucza)
|
||||||
|
if ( array_key_exists( 'custom_field_name', $d ) ) {
|
||||||
|
$this->saveCustomFields( $productId, $d['custom_field_name'] ?? [], $d['custom_field_type'] ?? [], $d['custom_field_required'] ?? [] );
|
||||||
|
}
|
||||||
|
|
||||||
if ( !$isNew ) {
|
if ( !$isNew ) {
|
||||||
$this->cleanupDeletedFiles( $productId );
|
$this->cleanupDeletedFiles( $productId );
|
||||||
@@ -1615,6 +1648,7 @@ class ProductRepository
|
|||||||
$this->db->delete( 'pp_shop_products_langs', [ 'product_id' => $productId ] );
|
$this->db->delete( 'pp_shop_products_langs', [ 'product_id' => $productId ] );
|
||||||
$this->db->delete( 'pp_shop_products_images', [ 'product_id' => $productId ] );
|
$this->db->delete( 'pp_shop_products_images', [ 'product_id' => $productId ] );
|
||||||
$this->db->delete( 'pp_shop_products_files', [ 'product_id' => $productId ] );
|
$this->db->delete( 'pp_shop_products_files', [ 'product_id' => $productId ] );
|
||||||
|
$this->db->delete( 'pp_shop_products_custom_fields', [ 'id_product' => $productId ] );
|
||||||
$this->db->delete( 'pp_shop_products_attributes', [ 'product_id' => $productId ] );
|
$this->db->delete( 'pp_shop_products_attributes', [ 'product_id' => $productId ] );
|
||||||
$this->db->delete( 'pp_shop_products', [ 'id' => $productId ] );
|
$this->db->delete( 'pp_shop_products', [ 'id' => $productId ] );
|
||||||
$this->db->delete( 'pp_shop_product_sets_products', [ 'product_id' => $productId ] );
|
$this->db->delete( 'pp_shop_product_sets_products', [ 'product_id' => $productId ] );
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ class SettingsRepository
|
|||||||
'infinitescroll' => $this->isEnabled($values['infinitescroll'] ?? null) ? 1 : 0,
|
'infinitescroll' => $this->isEnabled($values['infinitescroll'] ?? null) ? 1 : 0,
|
||||||
'own_gtm_js' => $values['own_gtm_js'] ?? '',
|
'own_gtm_js' => $values['own_gtm_js'] ?? '',
|
||||||
'own_gtm_html' => $values['own_gtm_html'] ?? '',
|
'own_gtm_html' => $values['own_gtm_html'] ?? '',
|
||||||
|
'api_key' => $values['api_key'] ?? '',
|
||||||
];
|
];
|
||||||
|
|
||||||
$warehouseMessageZero = $values['warehouse_message_zero'] ?? [];
|
$warehouseMessageZero = $values['warehouse_message_zero'] ?? [];
|
||||||
|
|||||||
@@ -172,13 +172,19 @@ class UpdateRepository
|
|||||||
|
|
||||||
foreach ( $manifest['sql'] as $query ) {
|
foreach ( $manifest['sql'] as $query ) {
|
||||||
$query = trim( $query );
|
$query = trim( $query );
|
||||||
if ( $query !== '' ) {
|
if ( $query === '' || strpos( $query, '--' ) === 0 ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
try {
|
||||||
if ( $this->db->query( $query ) ) {
|
if ( $this->db->query( $query ) ) {
|
||||||
$success++;
|
$success++;
|
||||||
} else {
|
} else {
|
||||||
$errors++;
|
$errors++;
|
||||||
$log[] = '[WARNING] Błąd SQL: ' . $query;
|
$log[] = '[WARNING] Błąd SQL: ' . $query;
|
||||||
}
|
}
|
||||||
|
} catch ( \Exception $e ) {
|
||||||
|
$errors++;
|
||||||
|
$log[] = '[WARNING] Wyjątek SQL: ' . $e->getMessage() . ' | Query: ' . substr( $query, 0, 200 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -423,7 +423,8 @@ class App
|
|||||||
new \Domain\Order\OrderRepository( $mdb ),
|
new \Domain\Order\OrderRepository( $mdb ),
|
||||||
$productRepo,
|
$productRepo,
|
||||||
new \Domain\Settings\SettingsRepository( $mdb ),
|
new \Domain\Settings\SettingsRepository( $mdb ),
|
||||||
new \Domain\Transport\TransportRepository( $mdb )
|
new \Domain\Transport\TransportRepository( $mdb ),
|
||||||
|
new \Domain\CronJob\CronJobRepository( $mdb )
|
||||||
),
|
),
|
||||||
$productRepo
|
$productRepo
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -106,6 +106,14 @@ class ProductArchiveController
|
|||||||
'confirm_ok' => 'Przywroc',
|
'confirm_ok' => 'Przywroc',
|
||||||
'confirm_cancel' => 'Anuluj',
|
'confirm_cancel' => 'Anuluj',
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'label' => 'Usun trwale',
|
||||||
|
'url' => '/admin/product_archive/delete_permanent/product_id=' . $id,
|
||||||
|
'class' => 'btn btn-xs btn-danger',
|
||||||
|
'confirm' => 'UWAGA! Operacja nieodwracalna!' . "\n\n" . 'Produkt "' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '" zostanie trwale usuniety razem ze wszystkimi zdjeciami i zalacznikami z serwera.' . "\n\n" . 'Czy na pewno chcesz usunac ten produkt?',
|
||||||
|
'confirm_ok' => 'Tak, usun trwale',
|
||||||
|
'confirm_cancel' => 'Anuluj',
|
||||||
|
],
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -162,4 +170,24 @@ class ProductArchiveController
|
|||||||
header( 'Location: /admin/product_archive/list/' );
|
header( 'Location: /admin/product_archive/list/' );
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function delete_permanent(): void
|
||||||
|
{
|
||||||
|
$productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
|
||||||
|
|
||||||
|
if ( $productId <= 0 ) {
|
||||||
|
\Shared\Helpers\Helpers::alert( 'Nieprawidłowe ID produktu.' );
|
||||||
|
header( 'Location: /admin/product_archive/list/' );
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $this->productRepository->delete( $productId ) ) {
|
||||||
|
\Shared\Helpers\Helpers::set_message( 'Produkt został trwale usunięty wraz ze zdjęciami i załącznikami.' );
|
||||||
|
} else {
|
||||||
|
\Shared\Helpers\Helpers::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie.' );
|
||||||
|
}
|
||||||
|
|
||||||
|
header( 'Location: /admin/product_archive/list/' );
|
||||||
|
exit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -471,8 +471,7 @@ class SettingsController
|
|||||||
'label' => 'Htaccess cache',
|
'label' => 'Htaccess cache',
|
||||||
'tab' => 'system',
|
'tab' => 'system',
|
||||||
]),
|
]),
|
||||||
FormField::text('api_key', [
|
FormField::custom('api_key', $this->renderApiKeyField($data['api_key'] ?? ''), [
|
||||||
'label' => 'Klucz API (ordersPRO)',
|
|
||||||
'tab' => 'system',
|
'tab' => 'system',
|
||||||
]),
|
]),
|
||||||
|
|
||||||
@@ -560,4 +559,23 @@ class SettingsController
|
|||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function renderApiKeyField(string $value): string
|
||||||
|
{
|
||||||
|
$escaped = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
|
||||||
|
|
||||||
|
$js = "var c='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',"
|
||||||
|
. "k='';for(var i=0;i<32;i++){k+=c.charAt(Math.floor(Math.random()*c.length));}"
|
||||||
|
. "document.getElementById('api_key').value=k;";
|
||||||
|
|
||||||
|
return '<div class="form-group row">'
|
||||||
|
. '<label class="col-lg-4 control-label">Klucz API:</label>'
|
||||||
|
. '<div class="col-lg-8">'
|
||||||
|
. '<div class="input-group">'
|
||||||
|
. '<input type="text" id="api_key" class="form-control" name="api_key" value="' . $escaped . '" />'
|
||||||
|
. '<span class="input-group-addon btn btn-info" onclick="' . htmlspecialchars($js, ENT_QUOTES, 'UTF-8') . '">Generuj</span>'
|
||||||
|
. '</div>'
|
||||||
|
. '</div>'
|
||||||
|
. '</div>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ class ShopProductController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$rows[] = $row;
|
$rows[] = $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class ApiRouter
|
|||||||
}
|
}
|
||||||
|
|
||||||
$controller->$action();
|
$controller->$action();
|
||||||
} catch (\Exception $e) {
|
} catch (\Throwable $e) {
|
||||||
self::sendError('INTERNAL_ERROR', 'Internal server error', 500);
|
self::sendError('INTERNAL_ERROR', 'Internal server error', 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,7 +87,8 @@ class ApiRouter
|
|||||||
$settingsRepo = new \Domain\Settings\SettingsRepository($db);
|
$settingsRepo = new \Domain\Settings\SettingsRepository($db);
|
||||||
$productRepo = new \Domain\Product\ProductRepository($db);
|
$productRepo = new \Domain\Product\ProductRepository($db);
|
||||||
$transportRepo = new \Domain\Transport\TransportRepository($db);
|
$transportRepo = new \Domain\Transport\TransportRepository($db);
|
||||||
$service = new \Domain\Order\OrderAdminService($orderRepo, $productRepo, $settingsRepo, $transportRepo);
|
$cronJobRepo = new \Domain\CronJob\CronJobRepository($db);
|
||||||
|
$service = new \Domain\Order\OrderAdminService($orderRepo, $productRepo, $settingsRepo, $transportRepo, $cronJobRepo);
|
||||||
return new Controllers\OrdersApiController($service, $orderRepo);
|
return new Controllers\OrdersApiController($service, $orderRepo);
|
||||||
},
|
},
|
||||||
'products' => function () use ($db) {
|
'products' => function () use ($db) {
|
||||||
@@ -100,7 +101,11 @@ class ApiRouter
|
|||||||
$transportRepo = new \Domain\Transport\TransportRepository($db);
|
$transportRepo = new \Domain\Transport\TransportRepository($db);
|
||||||
$paymentRepo = new \Domain\PaymentMethod\PaymentMethodRepository($db);
|
$paymentRepo = new \Domain\PaymentMethod\PaymentMethodRepository($db);
|
||||||
$attrRepo = new \Domain\Attribute\AttributeRepository($db);
|
$attrRepo = new \Domain\Attribute\AttributeRepository($db);
|
||||||
return new Controllers\DictionariesApiController($statusRepo, $transportRepo, $paymentRepo, $attrRepo);
|
$producerRepo = new \Domain\Producer\ProducerRepository($db);
|
||||||
|
return new Controllers\DictionariesApiController($statusRepo, $transportRepo, $paymentRepo, $attrRepo, $producerRepo);
|
||||||
|
},
|
||||||
|
'categories' => function () use ($db) {
|
||||||
|
return new Controllers\CategoriesApiController();
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
104
autoload/api/Controllers/CategoriesApiController.php
Normal file
104
autoload/api/Controllers/CategoriesApiController.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
namespace api\Controllers;
|
||||||
|
|
||||||
|
use api\ApiRouter;
|
||||||
|
|
||||||
|
class CategoriesApiController
|
||||||
|
{
|
||||||
|
public function list(): void
|
||||||
|
{
|
||||||
|
if (!ApiRouter::requireMethod('GET')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = $GLOBALS['mdb'] ?? null;
|
||||||
|
if (!$db) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Database not available', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default shop language
|
||||||
|
$defaultLang = $db->get('pp_langs', 'id', ['start' => 1]);
|
||||||
|
if (!$defaultLang) {
|
||||||
|
$defaultLang = 'pl';
|
||||||
|
}
|
||||||
|
$defaultLang = (string)$defaultLang;
|
||||||
|
|
||||||
|
// All active categories, ordered by display order
|
||||||
|
$rows = $db->select(
|
||||||
|
'pp_shop_categories',
|
||||||
|
['id', 'parent_id'],
|
||||||
|
[
|
||||||
|
'status' => 1,
|
||||||
|
'ORDER' => ['o' => 'ASC'],
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!is_array($rows) || empty($rows)) {
|
||||||
|
ApiRouter::sendSuccess(['categories' => []]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$categoryIds = array_values(array_filter(
|
||||||
|
array_map(fn($row) => (int)($row['id'] ?? 0), $rows),
|
||||||
|
fn($id) => $id > 0
|
||||||
|
));
|
||||||
|
|
||||||
|
// Bulk fetch titles for default language
|
||||||
|
$titlesByCategory = [];
|
||||||
|
$titleRows = $db->select('pp_shop_categories_langs', ['category_id', 'title'], [
|
||||||
|
'AND' => [
|
||||||
|
'category_id' => $categoryIds,
|
||||||
|
'lang_id' => $defaultLang,
|
||||||
|
'title[!]' => '',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
if (is_array($titleRows)) {
|
||||||
|
foreach ($titleRows as $tr) {
|
||||||
|
$tid = (int)($tr['category_id'] ?? 0);
|
||||||
|
if ($tid > 0 && !isset($titlesByCategory[$tid])) {
|
||||||
|
$titlesByCategory[$tid] = (string)($tr['title'] ?? '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bulk fetch fallback titles for categories without a title in default language
|
||||||
|
$missingIds = array_values(array_filter($categoryIds, fn($id) => !isset($titlesByCategory[$id])));
|
||||||
|
if (!empty($missingIds)) {
|
||||||
|
$fallbackRows = $db->select('pp_shop_categories_langs', ['category_id', 'title'], [
|
||||||
|
'AND' => [
|
||||||
|
'category_id' => $missingIds,
|
||||||
|
'title[!]' => '',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
if (is_array($fallbackRows)) {
|
||||||
|
foreach ($fallbackRows as $fr) {
|
||||||
|
$fid = (int)($fr['category_id'] ?? 0);
|
||||||
|
if ($fid > 0 && !isset($titlesByCategory[$fid])) {
|
||||||
|
$titlesByCategory[$fid] = (string)($fr['title'] ?? '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build flat category list
|
||||||
|
$categories = [];
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$categoryId = (int)($row['id'] ?? 0);
|
||||||
|
if ($categoryId <= 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$parentId = $row['parent_id'] !== null ? (int)$row['parent_id'] : null;
|
||||||
|
$title = $titlesByCategory[$categoryId] ?? ('Kategoria #' . $categoryId);
|
||||||
|
|
||||||
|
$categories[] = [
|
||||||
|
'id' => $categoryId,
|
||||||
|
'parent_id' => $parentId,
|
||||||
|
'title' => $title,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiRouter::sendSuccess(['categories' => $categories]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ namespace api\Controllers;
|
|||||||
|
|
||||||
use api\ApiRouter;
|
use api\ApiRouter;
|
||||||
use Domain\Attribute\AttributeRepository;
|
use Domain\Attribute\AttributeRepository;
|
||||||
|
use Domain\Producer\ProducerRepository;
|
||||||
use Domain\ShopStatus\ShopStatusRepository;
|
use Domain\ShopStatus\ShopStatusRepository;
|
||||||
use Domain\Transport\TransportRepository;
|
use Domain\Transport\TransportRepository;
|
||||||
use Domain\PaymentMethod\PaymentMethodRepository;
|
use Domain\PaymentMethod\PaymentMethodRepository;
|
||||||
@@ -13,17 +14,20 @@ class DictionariesApiController
|
|||||||
private $transportRepo;
|
private $transportRepo;
|
||||||
private $paymentRepo;
|
private $paymentRepo;
|
||||||
private $attrRepo;
|
private $attrRepo;
|
||||||
|
private $producerRepo;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
ShopStatusRepository $statusRepo,
|
ShopStatusRepository $statusRepo,
|
||||||
TransportRepository $transportRepo,
|
TransportRepository $transportRepo,
|
||||||
PaymentMethodRepository $paymentRepo,
|
PaymentMethodRepository $paymentRepo,
|
||||||
AttributeRepository $attrRepo
|
AttributeRepository $attrRepo,
|
||||||
|
ProducerRepository $producerRepo
|
||||||
) {
|
) {
|
||||||
$this->statusRepo = $statusRepo;
|
$this->statusRepo = $statusRepo;
|
||||||
$this->transportRepo = $transportRepo;
|
$this->transportRepo = $transportRepo;
|
||||||
$this->paymentRepo = $paymentRepo;
|
$this->paymentRepo = $paymentRepo;
|
||||||
$this->attrRepo = $attrRepo;
|
$this->attrRepo = $attrRepo;
|
||||||
|
$this->producerRepo = $producerRepo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function statuses(): void
|
public function statuses(): void
|
||||||
@@ -94,4 +98,111 @@ class DictionariesApiController
|
|||||||
|
|
||||||
ApiRouter::sendSuccess($attributes);
|
ApiRouter::sendSuccess($attributes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function ensure_attribute(): void
|
||||||
|
{
|
||||||
|
if (!ApiRouter::requireMethod('POST')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$body = ApiRouter::getJsonBody();
|
||||||
|
if (!is_array($body)) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid JSON body', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$name = trim((string) ($body['name'] ?? ''));
|
||||||
|
if ($name === '') {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing name', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$type = (int) ($body['type'] ?? 0);
|
||||||
|
$lang = trim((string) ($body['lang'] ?? 'pl'));
|
||||||
|
if ($lang === '') {
|
||||||
|
$lang = 'pl';
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->attrRepo->ensureAttributeForApi($name, $type, $lang);
|
||||||
|
if (!is_array($result) || (int) ($result['id'] ?? 0) <= 0) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Failed to ensure attribute', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiRouter::sendSuccess([
|
||||||
|
'id' => (int) ($result['id'] ?? 0),
|
||||||
|
'created' => !empty($result['created']),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ensure_attribute_value(): void
|
||||||
|
{
|
||||||
|
if (!ApiRouter::requireMethod('POST')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$body = ApiRouter::getJsonBody();
|
||||||
|
if (!is_array($body)) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid JSON body', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributeId = (int) ($body['attribute_id'] ?? 0);
|
||||||
|
if ($attributeId <= 0) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid attribute_id', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$name = trim((string) ($body['name'] ?? ''));
|
||||||
|
if ($name === '') {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing name', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$lang = trim((string) ($body['lang'] ?? 'pl'));
|
||||||
|
if ($lang === '') {
|
||||||
|
$lang = 'pl';
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->attrRepo->ensureAttributeValueForApi($attributeId, $name, $lang);
|
||||||
|
if (!is_array($result) || (int) ($result['id'] ?? 0) <= 0) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Failed to ensure attribute value', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiRouter::sendSuccess([
|
||||||
|
'id' => (int) ($result['id'] ?? 0),
|
||||||
|
'created' => !empty($result['created']),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ensure_producer(): void
|
||||||
|
{
|
||||||
|
if (!ApiRouter::requireMethod('POST')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$body = ApiRouter::getJsonBody();
|
||||||
|
if (!is_array($body)) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid JSON body', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$name = trim((string) ($body['name'] ?? ''));
|
||||||
|
if ($name === '') {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing name', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->producerRepo->ensureProducerForApi($name);
|
||||||
|
if ((int) ($result['id'] ?? 0) <= 0) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Failed to ensure producer', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiRouter::sendSuccess([
|
||||||
|
'id' => (int) ($result['id'] ?? 0),
|
||||||
|
'created' => !empty($result['created']),
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -296,6 +296,96 @@ class ProductsApiController
|
|||||||
ApiRouter::sendSuccess(['id' => $variantId, 'deleted' => true]);
|
ApiRouter::sendSuccess(['id' => $variantId, 'deleted' => true]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function upload_image(): void
|
||||||
|
{
|
||||||
|
if (!ApiRouter::requireMethod('POST')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$body = ApiRouter::getJsonBody();
|
||||||
|
if ($body === null) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid JSON body', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$productId = (int)($body['id'] ?? 0);
|
||||||
|
if ($productId <= 0) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid product id', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$product = $this->productRepo->find($productId);
|
||||||
|
if ($product === null) {
|
||||||
|
ApiRouter::sendError('NOT_FOUND', 'Product not found', 404);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fileName = trim((string)($body['file_name'] ?? ''));
|
||||||
|
$base64 = (string)($body['content_base64'] ?? '');
|
||||||
|
if ($fileName === '' || $base64 === '') {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Missing file_name or content_base64', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$binary = base64_decode($base64, true);
|
||||||
|
if ($binary === false) {
|
||||||
|
ApiRouter::sendError('BAD_REQUEST', 'Invalid content_base64 payload', 400);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$safeName = preg_replace('/[^a-zA-Z0-9._-]/', '_', basename($fileName));
|
||||||
|
if ($safeName === '' || $safeName === null) {
|
||||||
|
$safeName = 'image_' . md5((string)microtime(true)) . '.jpg';
|
||||||
|
}
|
||||||
|
|
||||||
|
// api.php działa z rootu projektu (nie z admin/), więc ścieżka bez ../
|
||||||
|
$baseDir = 'upload/product_images/product_' . $productId;
|
||||||
|
if (!is_dir($baseDir) && !mkdir($baseDir, 0775, true) && !is_dir($baseDir)) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Failed to create target directory', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$targetPath = $baseDir . '/' . $safeName;
|
||||||
|
if (is_file($targetPath)) {
|
||||||
|
$name = pathinfo($safeName, PATHINFO_FILENAME);
|
||||||
|
$ext = pathinfo($safeName, PATHINFO_EXTENSION);
|
||||||
|
$targetPath = $baseDir . '/' . $name . '_' . substr(md5($safeName . microtime(true)), 0, 8) . ($ext !== '' ? '.' . $ext : '');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (file_put_contents($targetPath, $binary) === false) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Failed to save image file', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$src = '/upload/product_images/product_' . $productId . '/' . basename($targetPath);
|
||||||
|
$alt = (string)($body['alt'] ?? '');
|
||||||
|
$position = isset($body['o']) ? (int)$body['o'] : null;
|
||||||
|
|
||||||
|
$db = $GLOBALS['mdb'] ?? null;
|
||||||
|
if (!$db) {
|
||||||
|
ApiRouter::sendError('INTERNAL_ERROR', 'Database not available', 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($position === null) {
|
||||||
|
$max = $db->max('pp_shop_products_images', 'o', ['product_id' => $productId]);
|
||||||
|
$position = (int)$max + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
$db->insert('pp_shop_products_images', [
|
||||||
|
'product_id' => $productId,
|
||||||
|
'src' => $src,
|
||||||
|
'alt' => $alt,
|
||||||
|
'o' => $position,
|
||||||
|
]);
|
||||||
|
|
||||||
|
ApiRouter::sendSuccess([
|
||||||
|
'src' => $src,
|
||||||
|
'alt' => $alt,
|
||||||
|
'o' => $position,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mapuje dane z JSON API na format oczekiwany przez saveProduct().
|
* Mapuje dane z JSON API na format oczekiwany przez saveProduct().
|
||||||
*
|
*
|
||||||
@@ -339,6 +429,11 @@ class ProductsApiController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// saveProduct() traktuje float 0.00 jako "puste", ale cena 0 musi pozostać jawnie ustawiona.
|
||||||
|
if (isset($d['price_brutto']) && is_numeric($d['price_brutto']) && (float)$d['price_brutto'] === 0.0) {
|
||||||
|
$d['price_brutto'] = '0';
|
||||||
|
}
|
||||||
|
|
||||||
// String fields — direct mapping
|
// String fields — direct mapping
|
||||||
$stringFields = [
|
$stringFields = [
|
||||||
'sku', 'ean', 'custom_label_0', 'custom_label_1', 'custom_label_2',
|
'sku', 'ean', 'custom_label_0', 'custom_label_1', 'custom_label_2',
|
||||||
@@ -403,6 +498,21 @@ class ProductsApiController
|
|||||||
$d['products_related'] = $body['products_related'];
|
$d['products_related'] = $body['products_related'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Custom fields (Dodatkowe pola)
|
||||||
|
if (isset($body['custom_fields']) && is_array($body['custom_fields'])) {
|
||||||
|
$d['custom_field_name'] = [];
|
||||||
|
$d['custom_field_type'] = [];
|
||||||
|
$d['custom_field_required'] = [];
|
||||||
|
foreach ($body['custom_fields'] as $cf) {
|
||||||
|
if (!is_array($cf) || empty($cf['name'])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$d['custom_field_name'][] = (string)$cf['name'];
|
||||||
|
$d['custom_field_type'][] = !empty($cf['type']) ? (string)$cf['type'] : 'text';
|
||||||
|
$d['custom_field_required'][] = !empty($cf['is_required']) ? 1 : 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $d;
|
return $d;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,9 +177,10 @@ class App
|
|||||||
'ShopOrder' => function() {
|
'ShopOrder' => function() {
|
||||||
global $mdb;
|
global $mdb;
|
||||||
$orderRepo = new \Domain\Order\OrderRepository( $mdb );
|
$orderRepo = new \Domain\Order\OrderRepository( $mdb );
|
||||||
|
$cronJobRepo = new \Domain\CronJob\CronJobRepository( $mdb );
|
||||||
return new \front\Controllers\ShopOrderController(
|
return new \front\Controllers\ShopOrderController(
|
||||||
$orderRepo,
|
$orderRepo,
|
||||||
new \Domain\Order\OrderAdminService( $orderRepo )
|
new \Domain\Order\OrderAdminService( $orderRepo, null, null, null, $cronJobRepo )
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
'ShopProducer' => function() {
|
'ShopProducer' => function() {
|
||||||
|
|||||||
@@ -215,7 +215,10 @@ $sqlQueries = @()
|
|||||||
$migrationFile = "migrations/$versionNumber.sql"
|
$migrationFile = "migrations/$versionNumber.sql"
|
||||||
|
|
||||||
if (Test-Path $migrationFile) {
|
if (Test-Path $migrationFile) {
|
||||||
$sqlQueries = @(Get-Content $migrationFile | Where-Object { $_.Trim() -ne '' } | ForEach-Object { $_.ToString() })
|
# Read entire file, strip comment lines, split by semicolons to get complete SQL statements
|
||||||
|
$rawLines = Get-Content $migrationFile | Where-Object { $_.Trim() -ne '' -and $_.Trim() -notmatch '^\s*--' }
|
||||||
|
$rawSql = ($rawLines -join "`n").Trim()
|
||||||
|
$sqlQueries = @($rawSql -split ';' | ForEach-Object { $_.Trim() } | Where-Object { $_ -ne '' } | ForEach-Object { $_.ToString() })
|
||||||
Write-Step "Znaleziono migracje SQL: $migrationFile ($($sqlQueries.Count) zapytan)"
|
Write-Step "Znaleziono migracje SQL: $migrationFile ($($sqlQueries.Count) zapytan)"
|
||||||
} else {
|
} else {
|
||||||
Write-Step "Brak migracji SQL ($migrationFile nie istnieje)"
|
Write-Step "Brak migracji SQL ($migrationFile nie istnieje)"
|
||||||
@@ -262,6 +265,10 @@ if (Test-Path $tempDir) {
|
|||||||
Remove-Item -Recurse -Force $tempDir
|
Remove-Item -Recurse -Force $tempDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (-not (Test-Path $tempDir)) {
|
||||||
|
New-Item -ItemType Directory -Path $tempDir -Force | Out-Null
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($f in $filesToPack) {
|
foreach ($f in $filesToPack) {
|
||||||
$destPath = Join-Path $tempDir $f
|
$destPath = Join-Path $tempDir $f
|
||||||
$destDir = Split-Path $destPath -Parent
|
$destDir = Split-Path $destPath -Parent
|
||||||
@@ -295,7 +302,16 @@ if (Test-Path $zipPath) {
|
|||||||
# Pakuj zawartosc temp dir (bez folderu temp/)
|
# Pakuj zawartosc temp dir (bez folderu temp/)
|
||||||
$originalLocation = Get-Location
|
$originalLocation = Get-Location
|
||||||
Set-Location $tempDir
|
Set-Location $tempDir
|
||||||
Compress-Archive -Path '*' -DestinationPath "../../$zipPath" -Force
|
$tempItems = Get-ChildItem -Force
|
||||||
|
if ($tempItems) {
|
||||||
|
Compress-Archive -Path '*' -DestinationPath "../../$zipPath" -Force
|
||||||
|
} else {
|
||||||
|
# SQL-only update: create minimal ZIP with empty placeholder
|
||||||
|
$placeholderPath = "_sql_only_update.txt"
|
||||||
|
Set-Content -Path $placeholderPath -Value "SQL-only update $versionNumber"
|
||||||
|
Compress-Archive -Path $placeholderPath -DestinationPath "../../$zipPath" -Force
|
||||||
|
Remove-Item $placeholderPath -Force
|
||||||
|
}
|
||||||
Set-Location $originalLocation
|
Set-Location $originalLocation
|
||||||
|
|
||||||
Write-Ok "Utworzono ZIP: $zipPath"
|
Write-Ok "Utworzono ZIP: $zipPath"
|
||||||
@@ -355,9 +371,9 @@ if (Test-Path $versionsFile) {
|
|||||||
Write-Ok "Zaktualizowano versions.php: `$current_ver = $versionInt"
|
Write-Ok "Zaktualizowano versions.php: `$current_ver = $versionInt"
|
||||||
}
|
}
|
||||||
|
|
||||||
# --- 14. Aktualizacja changelog.php ---
|
# --- 14. Aktualizacja changelog-data.html ---
|
||||||
|
|
||||||
$changelogFile = "updates/changelog.php"
|
$changelogFile = "updates/changelog-data.html"
|
||||||
if (Test-Path $changelogFile) {
|
if (Test-Path $changelogFile) {
|
||||||
$dateStr = Get-Date -Format "dd.MM.yyyy"
|
$dateStr = Get-Date -Format "dd.MM.yyyy"
|
||||||
$newEntry = "<b>ver. $versionNumber - $dateStr</b><br />`n$ChangelogEntry`n<hr>`n"
|
$newEntry = "<b>ver. $versionNumber - $dateStr</b><br />`n$ChangelogEntry`n<hr>`n"
|
||||||
@@ -365,7 +381,7 @@ if (Test-Path $changelogFile) {
|
|||||||
$changelogContent = Get-Content $changelogFile -Raw
|
$changelogContent = Get-Content $changelogFile -Raw
|
||||||
$changelogContent = $newEntry + $changelogContent
|
$changelogContent = $newEntry + $changelogContent
|
||||||
[System.IO.File]::WriteAllText($changelogFile, $changelogContent, $Utf8NoBom)
|
[System.IO.File]::WriteAllText($changelogFile, $changelogContent, $Utf8NoBom)
|
||||||
Write-Ok "Zaktualizowano changelog.php"
|
Write-Ok "Zaktualizowano changelog-data.html"
|
||||||
}
|
}
|
||||||
|
|
||||||
# --- 15. Cleanup ---
|
# --- 15. Cleanup ---
|
||||||
|
|||||||
@@ -17,4 +17,6 @@ $config['debug']['apilo'] = true;
|
|||||||
|
|
||||||
$config['trustmate']['enabled'] = true;
|
$config['trustmate']['enabled'] = true;
|
||||||
$config['trustmate']['uid'] = '34eb36ba-c715-4cdc-8707-22376c9f14c7';
|
$config['trustmate']['uid'] = '34eb36ba-c715-4cdc-8707-22376c9f14c7';
|
||||||
|
|
||||||
|
$config['cron_key'] = 'Gi7FzWtkry19hZ1BqT1LKEWfwokQpigh';
|
||||||
?>
|
?>
|
||||||
|
|||||||
467
cron.php
467
cron.php
@@ -50,19 +50,26 @@ $mdb = new medoo( [
|
|||||||
'charset' => 'utf8'
|
'charset' => 'utf8'
|
||||||
] );
|
] );
|
||||||
|
|
||||||
$settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
|
// =========================================================================
|
||||||
$integrationsRepository = new \Domain\Integrations\IntegrationsRepository( $mdb );
|
// Auth: cron endpoint protection
|
||||||
$apilo_settings = $integrationsRepository -> getSettings( 'apilo' );
|
// =========================================================================
|
||||||
|
|
||||||
// Keepalive tokenu Apilo: odswiezaj token przed wygasnieciem, zeby integracja byla stale aktywna.
|
if ( php_sapi_name() !== 'cli' )
|
||||||
if ( (int)($apilo_settings['enabled'] ?? 0) === 1 ) {
|
{
|
||||||
$integrationsRepository -> apiloKeepalive( 300 );
|
$cron_key = isset( $config['cron_key'] ) ? $config['cron_key'] : '';
|
||||||
$apilo_settings = $integrationsRepository -> getSettings( 'apilo' );
|
$provided_key = isset( $_GET['key'] ) ? $_GET['key'] : '';
|
||||||
$orderRepo = new \Domain\Order\OrderRepository( $mdb );
|
|
||||||
$orderAdminService = new \Domain\Order\OrderAdminService( $orderRepo );
|
if ( $cron_key === '' || $provided_key !== $cron_key )
|
||||||
$orderAdminService->processApiloSyncQueue( 10 );
|
{
|
||||||
|
http_response_code( 403 );
|
||||||
|
exit( 'Forbidden' );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =========================================================================
|
||||||
|
// Helper functions (used by handlers)
|
||||||
|
// =========================================================================
|
||||||
|
|
||||||
function parsePaczkomatAddress($input)
|
function parsePaczkomatAddress($input)
|
||||||
{
|
{
|
||||||
$pattern = '/^([\w-]+)\s+\|\s+([^,]+),\s+(\d{2}-\d{3})\s+(.+)$/';
|
$pattern = '/^([\w-]+)\s+\|\s+([^,]+),\s+(\d{2}-\d{3})\s+(.+)$/';
|
||||||
@@ -118,93 +125,90 @@ function getImageUrlById($id) {
|
|||||||
return isset($data['img']) ? $data['img'] : null;
|
return isset($data['img']) ? $data['img'] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// pobieranie informacji o produkcie z apilo.com
|
// =========================================================================
|
||||||
if ( $apilo_settings['enabled'] and $apilo_settings['sync_products'] and $apilo_settings['access-token'] )
|
// Shared dependencies
|
||||||
|
// =========================================================================
|
||||||
|
|
||||||
|
$settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
|
||||||
|
$integrationsRepository = new \Domain\Integrations\IntegrationsRepository( $mdb );
|
||||||
|
$orderRepo = new \Domain\Order\OrderRepository( $mdb );
|
||||||
|
$cronRepo = new \Domain\CronJob\CronJobRepository( $mdb );
|
||||||
|
$orderAdminService = new \Domain\Order\OrderAdminService( $orderRepo, null, null, null, $cronRepo );
|
||||||
|
|
||||||
|
$processor = new \Domain\CronJob\CronJobProcessor( $cronRepo );
|
||||||
|
|
||||||
|
// =========================================================================
|
||||||
|
// One-time migration: JSON queue → DB
|
||||||
|
// =========================================================================
|
||||||
|
|
||||||
|
$json_queue_path = __DIR__ . '/temp/apilo-sync-queue.json';
|
||||||
|
if ( file_exists( $json_queue_path ) )
|
||||||
{
|
{
|
||||||
if ( $result = $mdb -> query( 'SELECT id, apilo_product_id, apilo_get_data_date, apilo_product_name FROM pp_shop_products WHERE apilo_product_id IS NOT NULL AND apilo_product_id != 0 AND ( apilo_get_data_date IS NULL OR apilo_get_data_date <= \'' . date( 'Y-m-d H:i:s', strtotime( '-10 minutes', time() ) ) . '\' ) ORDER BY apilo_get_data_date ASC LIMIT 1' ) -> fetch( \PDO::FETCH_ASSOC ) )
|
$json_content = file_get_contents( $json_queue_path );
|
||||||
|
$json_queue = $json_content ? json_decode( $json_content, true ) : [];
|
||||||
|
|
||||||
|
if ( is_array( $json_queue ) )
|
||||||
{
|
{
|
||||||
$access_token = $integrationsRepository -> apiloGetAccessToken();
|
foreach ( $json_queue as $task )
|
||||||
$url = 'https://projectpro.apilo.com/rest/api/warehouse/product/' . $result['apilo_product_id'] . '/';
|
|
||||||
$curl = curl_init( $url );
|
|
||||||
curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
|
|
||||||
curl_setopt( $curl, CURLOPT_HTTPHEADER, [
|
|
||||||
"Authorization: Bearer " . $access_token,
|
|
||||||
"Accept: application/json"
|
|
||||||
] );
|
|
||||||
|
|
||||||
$response = curl_exec( $curl );
|
|
||||||
$responseData = json_decode( $response, true );
|
|
||||||
|
|
||||||
// aktualizowanie stanu magazynowego
|
|
||||||
$mdb -> update( 'pp_shop_products', [ 'quantity' => $responseData['quantity'] ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
|
||||||
// aktualizowanie ceny
|
|
||||||
$mdb -> update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithoutTax'], 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithTax'], 2 ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
|
||||||
|
|
||||||
$mdb -> update( 'pp_shop_products', [ 'apilo_get_data_date' => date( 'Y-m-d H:i:s' ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
|
||||||
|
|
||||||
// Czyszczenie cache produktu
|
|
||||||
\Shared\Helpers\Helpers::clear_product_cache( (int)$result['id'] );
|
|
||||||
|
|
||||||
echo '<p>Zaktualizowałem dane produktu (APILO) <b>' . $result['apilo_product_name'] . ' #' . $result['id'] . '</b></p>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// synchronizacja cen apilo.com
|
|
||||||
if ( $apilo_settings['enabled'] and $apilo_settings['access-token'] and ( !$apilo_settings['pricelist_update_date'] or $apilo_settings['pricelist_update_date'] <= date( 'Y-m-d H:i:s', strtotime( '-1 hour', time() ) ) ) )
|
|
||||||
{
|
|
||||||
$access_token = $integrationsRepository -> apiloGetAccessToken();
|
|
||||||
|
|
||||||
$url = 'https://projectpro.apilo.com/rest/api/warehouse/price-calculated/?price=' . $apilo_settings['pricelist_id'];
|
|
||||||
|
|
||||||
$curl = curl_init( $url );
|
|
||||||
curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
|
|
||||||
curl_setopt( $curl, CURLOPT_CUSTOMREQUEST, "GET" );
|
|
||||||
curl_setopt( $curl, CURLOPT_HTTPHEADER, [
|
|
||||||
"Authorization: Bearer " . $access_token,
|
|
||||||
"Accept: application/json",
|
|
||||||
"Content-Type: application/json"
|
|
||||||
] );
|
|
||||||
|
|
||||||
$response = curl_exec( $curl );
|
|
||||||
$responseData = json_decode( $response, true );
|
|
||||||
|
|
||||||
if ( $responseData['list'] )
|
|
||||||
{
|
|
||||||
foreach ( $responseData['list'] as $product_price )
|
|
||||||
{
|
{
|
||||||
//aktualizowanie ceny
|
$order_id = (int)($task['order_id'] ?? 0);
|
||||||
if ( $product_price['customPriceWithTax'] )
|
if ( $order_id <= 0 ) continue;
|
||||||
|
|
||||||
|
if ( !empty($task['payment']) )
|
||||||
{
|
{
|
||||||
$price_brutto = $product_price['customPriceWithTax'];
|
$cronRepo->enqueue(
|
||||||
$vat = $vat = $mdb -> get( 'pp_shop_products', 'vat', [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
\Domain\CronJob\CronJobType::APILO_SYNC_PAYMENT,
|
||||||
$price_netto = $price_brutto / ( ( 100 + $vat ) / 100 );
|
['order_id' => $order_id],
|
||||||
|
\Domain\CronJob\CronJobType::PRIORITY_HIGH,
|
||||||
$mdb -> update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $price_netto, 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $price_brutto, 2 ) ], [ 'apilo_product_id' => $product_price['product'] ] );
|
50
|
||||||
$product_id = $mdb -> get( 'pp_shop_products', 'id', [ 'apilo_product_id' => $product_price['product'] ] );
|
);
|
||||||
|
}
|
||||||
( new \Domain\Product\ProductRepository( $mdb ) )->updateCombinationPricesFromBase( (int)$product_id, $price_brutto, $vat, null );
|
if ( isset($task['status']) && $task['status'] !== null && $task['status'] !== '' )
|
||||||
|
{
|
||||||
// Czyszczenie cache produktu
|
$cronRepo->enqueue(
|
||||||
\Shared\Helpers\Helpers::clear_product_cache( (int)$product_id );
|
\Domain\CronJob\CronJobType::APILO_SYNC_STATUS,
|
||||||
|
['order_id' => $order_id, 'status' => (int)$task['status']],
|
||||||
|
\Domain\CronJob\CronJobType::PRIORITY_HIGH,
|
||||||
|
50
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$integrationsRepository -> saveSetting( 'apilo', 'pricelist_update_date', date( 'Y-m-d H:i:s' ) );
|
|
||||||
echo '<p>Zaktualizowałem ceny produktów (APILO)</p>';
|
unlink( $json_queue_path );
|
||||||
|
echo '<p>Migracja kolejki JSON → DB zakończona</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// wysyłanie zamówień do apilo
|
// =========================================================================
|
||||||
if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_settings['access-token'] and $apilo_settings['sync_orders_date_start'] <= date( 'Y-m-d H:i:s' ) )
|
// Handler registration
|
||||||
{
|
// =========================================================================
|
||||||
$orders = $mdb -> select( 'pp_shop_orders', '*', [ 'AND' => [ 'apilo_order_id' => null, 'date_order[>=]' => $apilo_settings['sync_orders_date_start'] ], 'ORDER' => [ 'date_order' => 'ASC' ], 'LIMIT' => 1 ] );
|
|
||||||
|
// 1. Apilo token keepalive (priorytet: krytyczny)
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_TOKEN_KEEPALIVE, function($payload) use ($integrationsRepository) {
|
||||||
|
$apilo_settings = $integrationsRepository->getSettings('apilo');
|
||||||
|
if ( !(int)($apilo_settings['enabled'] ?? 0) ) return true; // skip if disabled
|
||||||
|
|
||||||
|
$integrationsRepository->apiloKeepalive( 300 );
|
||||||
|
echo '<p>Apilo token keepalive</p>';
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. Apilo send order (priorytet: wysoki)
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_SEND_ORDER, function($payload) use ($mdb, $integrationsRepository, $orderAdminService, $config) {
|
||||||
|
$apilo_settings = $integrationsRepository->getSettings('apilo');
|
||||||
|
if ( !$apilo_settings['enabled'] || !$apilo_settings['sync_orders'] || !$apilo_settings['access-token'] || $apilo_settings['sync_orders_date_start'] > date('Y-m-d H:i:s') ) return true;
|
||||||
|
|
||||||
|
$orders = $mdb->select( 'pp_shop_orders', '*', [ 'AND' => [ 'apilo_order_id' => null, 'date_order[>=]' => $apilo_settings['sync_orders_date_start'] ], 'ORDER' => [ 'date_order' => 'ASC' ], 'LIMIT' => 1 ] );
|
||||||
|
if ( empty($orders) ) return true;
|
||||||
|
|
||||||
foreach ( $orders as $order )
|
foreach ( $orders as $order )
|
||||||
{
|
{
|
||||||
$products = $mdb -> select( 'pp_shop_order_products', '*', [ 'order_id' => $order['id'] ] );
|
$products = $mdb->select( 'pp_shop_order_products', '*', [ 'order_id' => $order['id'] ] );
|
||||||
|
$productRepo = new \Domain\Product\ProductRepository( $mdb );
|
||||||
$products_array = [];
|
$products_array = [];
|
||||||
$order_message = '';
|
$order_message = '';
|
||||||
foreach ( $products as $product )
|
foreach ( $products as $product )
|
||||||
{
|
{
|
||||||
$productRepo = new \Domain\Product\ProductRepository( $mdb );
|
|
||||||
$sku = $productRepo->getSkuWithFallback( (int)$product['product_id'], true );
|
$sku = $productRepo->getSkuWithFallback( (int)$product['product_id'], true );
|
||||||
|
|
||||||
$products_array[] = [
|
$products_array[] = [
|
||||||
@@ -237,11 +241,9 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
$order_message .= '<hr>';
|
$order_message .= '<hr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: ostatnio był problem kiedy wiadomość miała mniej 1024 znaki ale zawierała przeniesienie tekstu '<br>' i do tego jeszcze miała emoji. Wtedy APILO tego nie przepuszczał.
|
|
||||||
if ( strlen( $order_message ) > 850 )
|
if ( strlen( $order_message ) > 850 )
|
||||||
$order_message = '<p><strong>Wiadomość do zamówienia była zbyt długa. Sprawdź szczegóły w panelu sklepu</strong></p>';
|
$order_message = '<p><strong>Wiadomość do zamówienia była zbyt długa. Sprawdź szczegóły w panelu sklepu</strong></p>';
|
||||||
|
|
||||||
// add transport as product
|
|
||||||
$products_array[] = [
|
$products_array[] = [
|
||||||
'idExternal' => '',
|
'idExternal' => '',
|
||||||
'ean' => null,
|
'ean' => null,
|
||||||
@@ -256,7 +258,6 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
'media' => null
|
'media' => null
|
||||||
];
|
];
|
||||||
|
|
||||||
// Walidacja: sprawdź czy zamówienie ma produkty z cenami > 0
|
|
||||||
$has_priced_products = false;
|
$has_priced_products = false;
|
||||||
foreach ( $products_array as $pa )
|
foreach ( $products_array as $pa )
|
||||||
{
|
{
|
||||||
@@ -270,15 +271,13 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
{
|
{
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Pominięto zamówienie - wszystkie produkty mają cenę 0.00', [ 'products' => $products_array ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Pominięto zamówienie - wszystkie produkty mają cenę 0.00', [ 'products' => $products_array ] );
|
||||||
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Apilo: zamówienie #' . $order['id'] . ' ma zerowe ceny produktów', 'Zamówienie #' . $order['id'] . ' nie zostało wysłane do Apilo, ponieważ wszystkie produkty mają cenę 0.00 PLN. Sprawdź zamówienie w panelu sklepu.' );
|
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Apilo: zamówienie #' . $order['id'] . ' ma zerowe ceny produktów', 'Zamówienie #' . $order['id'] . ' nie zostało wysłane do Apilo, ponieważ wszystkie produkty mają cenę 0.00 PLN. Sprawdź zamówienie w panelu sklepu.' );
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => -2 ], [ 'id' => $order['id'] ] );
|
$mdb->update( 'pp_shop_orders', [ 'apilo_order_id' => -2 ], [ 'id' => $order['id'] ] );
|
||||||
echo '<p>Pominięto zamówienie #' . $order['id'] . ' - zerowe ceny produktów</p>';
|
echo '<p>Pominięto zamówienie #' . $order['id'] . ' - zerowe ceny produktów</p>';
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$access_token = $integrationsRepository -> apiloGetAccessToken();
|
$access_token = $integrationsRepository->apiloGetAccessToken();
|
||||||
|
|
||||||
$order_date = new DateTime( $order['date_order'] );
|
$order_date = new DateTime( $order['date_order'] );
|
||||||
|
|
||||||
$paczkomatData = parsePaczkomatAddress( $order['inpost_paczkomat'] );
|
$paczkomatData = parsePaczkomatAddress( $order['inpost_paczkomat'] );
|
||||||
$orlenPointData = parseOrlenAddress( $order['orlen_point'] );
|
$orlenPointData = parseOrlenAddress( $order['orlen_point'] );
|
||||||
|
|
||||||
@@ -326,7 +325,7 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
'originalCurrency' => 'PLN',
|
'originalCurrency' => 'PLN',
|
||||||
'originalAmountTotalWithTax' => str_replace( ',', '.', $order['summary'] ),
|
'originalAmountTotalWithTax' => str_replace( ',', '.', $order['summary'] ),
|
||||||
'orderItems' => $products_array,
|
'orderItems' => $products_array,
|
||||||
'orderedAt' => $order_date -> format('Y-m-d\TH:i:s\Z'),
|
'orderedAt' => $order_date->format('Y-m-d\TH:i:s\Z'),
|
||||||
'addressCustomer' => [
|
'addressCustomer' => [
|
||||||
'name' => $order['client_name'] . ' ' . $order['client_surname'],
|
'name' => $order['client_name'] . ' ' . $order['client_surname'],
|
||||||
'phone' => $order['client_phone'],
|
'phone' => $order['client_phone'],
|
||||||
@@ -361,7 +360,6 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
$postData['addressInvoice']['companyTaxNumber'] = $order['firm_nip'];
|
$postData['addressInvoice']['companyTaxNumber'] = $order['firm_nip'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// jeżeli paczkomat
|
|
||||||
if ( $order['inpost_paczkomat'] )
|
if ( $order['inpost_paczkomat'] )
|
||||||
{
|
{
|
||||||
$postData['addressDelivery']['parcelName'] = $order['inpost_paczkomat'] ? 'Paczkomat: ' . $order['inpost_paczkomat'] : null;
|
$postData['addressDelivery']['parcelName'] = $order['inpost_paczkomat'] ? 'Paczkomat: ' . $order['inpost_paczkomat'] : null;
|
||||||
@@ -381,7 +379,6 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// jeżeli orlen paczka
|
|
||||||
if ( $order['orlen_point'] )
|
if ( $order['orlen_point'] )
|
||||||
{
|
{
|
||||||
$postData['addressDelivery']['parcelName'] = $order['orlen_point'] ? 'Automat ORLEN ' . $order['orlen_point'] : null;
|
$postData['addressDelivery']['parcelName'] = $order['orlen_point'] ? 'Automat ORLEN ' . $order['orlen_point'] : null;
|
||||||
@@ -399,16 +396,14 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
$postData['addressDelivery']['zipCode'] = $postalCode;
|
$postData['addressDelivery']['zipCode'] = $postalCode;
|
||||||
$postData['addressDelivery']['city'] = $city;
|
$postData['addressDelivery']['city'] = $city;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $order['paid'] )
|
if ( $order['paid'] )
|
||||||
{
|
{
|
||||||
$payment_date = new DateTime( $order['date_order'] );
|
$payment_date = new DateTime( $order['date_order'] );
|
||||||
|
|
||||||
$postData['orderPayments'][] = [
|
$postData['orderPayments'][] = [
|
||||||
'amount' => str_replace( ',', '.', $order['summary'] ),
|
'amount' => str_replace( ',', '.', $order['summary'] ),
|
||||||
'paymentDate' => $payment_date -> format('Y-m-d\TH:i:s\Z'),
|
'paymentDate' => $payment_date->format('Y-m-d\TH:i:s\Z'),
|
||||||
'type' => ( new \Domain\PaymentMethod\PaymentMethodRepository( $mdb ) )->getApiloPaymentTypeId( (int)$order['payment_method_id'] )
|
'type' => ( new \Domain\PaymentMethod\PaymentMethodRepository( $mdb ) )->getApiloPaymentTypeId( (int)$order['payment_method_id'] )
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -435,30 +430,29 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
|
|
||||||
$response = json_decode( $response, true );
|
$response = json_decode( $response, true );
|
||||||
|
|
||||||
if ( $config['debug']['apilo'] )
|
if ( isset($config['debug']['apilo']) && $config['debug']['apilo'] )
|
||||||
{
|
{
|
||||||
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', date( 'Y-m-d H:i:s' ) . " --- SEND ORDER TO APILO\n\n", FILE_APPEND );
|
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', date( 'Y-m-d H:i:s' ) . " --- SEND ORDER TO APILO\n\n", FILE_APPEND );
|
||||||
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', print_r( $postData, true ) . "\n\n", FILE_APPEND );
|
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', print_r( $postData, true ) . "\n\n", FILE_APPEND );
|
||||||
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', print_r( $response, true ) . "\n\n", FILE_APPEND );
|
file_put_contents( $_SERVER['DOCUMENT_ROOT'] . '/logs/apilo.txt', print_r( $response, true ) . "\n\n", FILE_APPEND );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $response['message'] == 'Order already exists' )
|
if ( isset($response['message']) && $response['message'] == 'Order already exists' )
|
||||||
{
|
{
|
||||||
$apilo_order_id = str_replace( 'Order id: ', '', $response['description'] );
|
$apilo_order_id = str_replace( 'Order id: ', '', $response['description'] );
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => $apilo_order_id ], [ 'id' => $order['id'] ] );
|
$mdb->update( 'pp_shop_orders', [ 'apilo_order_id' => $apilo_order_id ], [ 'id' => $order['id'] ] );
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Zamówienie już istnieje w Apilo (apilo_order_id: ' . $apilo_order_id . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Zamówienie już istnieje w Apilo (apilo_order_id: ' . $apilo_order_id . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
||||||
echo '<p>Zaktualizowałem id zamówienia na podstawie zamówienia apilo.com</p>';
|
echo '<p>Zaktualizowałem id zamówienia na podstawie zamówienia apilo.com</p>';
|
||||||
}
|
}
|
||||||
elseif ( $response['message'] == 'Validation error' )
|
elseif ( isset($response['message']) && $response['message'] == 'Validation error' )
|
||||||
{
|
{
|
||||||
// sprawdzanie czy błąd dotyczy duplikatu idExternal
|
|
||||||
$is_duplicate_idexternal = false;
|
$is_duplicate_idexternal = false;
|
||||||
if ( isset( $response['errors'] ) and is_array( $response['errors'] ) )
|
if ( isset( $response['errors'] ) && is_array( $response['errors'] ) )
|
||||||
{
|
{
|
||||||
foreach ( $response['errors'] as $error )
|
foreach ( $response['errors'] as $error )
|
||||||
{
|
{
|
||||||
if ( isset( $error['field'] ) and $error['field'] == 'idExternal' and
|
if ( isset( $error['field'] ) && $error['field'] == 'idExternal' &&
|
||||||
( strpos( $error['message'], 'już wykorzystywana' ) !== false or
|
( strpos( $error['message'], 'już wykorzystywana' ) !== false ||
|
||||||
strpos( $error['message'], 'already' ) !== false ) )
|
strpos( $error['message'], 'already' ) !== false ) )
|
||||||
{
|
{
|
||||||
$is_duplicate_idexternal = true;
|
$is_duplicate_idexternal = true;
|
||||||
@@ -469,7 +463,6 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
|
|
||||||
if ( $is_duplicate_idexternal )
|
if ( $is_duplicate_idexternal )
|
||||||
{
|
{
|
||||||
// próba pobrania zamówienia z Apilo na podstawie idExternal
|
|
||||||
$ch_get = curl_init();
|
$ch_get = curl_init();
|
||||||
curl_setopt( $ch_get, CURLOPT_URL, "https://projectpro.apilo.com/rest/api/orders/?idExternal=" . $order['id'] );
|
curl_setopt( $ch_get, CURLOPT_URL, "https://projectpro.apilo.com/rest/api/orders/?idExternal=" . $order['id'] );
|
||||||
curl_setopt( $ch_get, CURLOPT_RETURNTRANSFER, true );
|
curl_setopt( $ch_get, CURLOPT_RETURNTRANSFER, true );
|
||||||
@@ -482,22 +475,16 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
|
|
||||||
$get_response_data = json_decode( $get_response, true );
|
$get_response_data = json_decode( $get_response, true );
|
||||||
|
|
||||||
if ( isset( $get_response_data['list'] ) and count( $get_response_data['list'] ) > 0 )
|
if ( isset( $get_response_data['list'] ) && count( $get_response_data['list'] ) > 0 )
|
||||||
{
|
{
|
||||||
$apilo_order_id = $get_response_data['list'][0]['id'];
|
$apilo_order_id = $get_response_data['list'][0]['id'];
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => $apilo_order_id ], [ 'id' => $order['id'] ] );
|
$mdb->update( 'pp_shop_orders', [ 'apilo_order_id' => $apilo_order_id ], [ 'id' => $order['id'] ] );
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Duplikat idExternal - pobrano apilo_order_id: ' . $apilo_order_id, [ 'http_code' => $http_code_send, 'response' => $response, 'get_response' => $get_response_data ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Duplikat idExternal - pobrano apilo_order_id: ' . $apilo_order_id, [ 'http_code' => $http_code_send, 'response' => $response, 'get_response' => $get_response_data ] );
|
||||||
echo '<p>Zamówienie już istnieje w Apilo. Zaktualizowano ID zamówienia: ' . $apilo_order_id . '</p>';
|
echo '<p>Zamówienie już istnieje w Apilo. Zaktualizowano ID zamówienia: ' . $apilo_order_id . '</p>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
echo '<pre>';
|
|
||||||
echo print_r( $response, true );
|
|
||||||
echo print_r( $postData, true );
|
|
||||||
echo '</pre>';
|
|
||||||
|
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd: duplikat idExternal, ale nie znaleziono zamówienia w Apilo', [ 'http_code' => $http_code_send, 'response' => $response, 'get_response' => $get_response_data ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd: duplikat idExternal, ale nie znaleziono zamówienia w Apilo', [ 'http_code' => $http_code_send, 'response' => $response, 'get_response' => $get_response_data ] );
|
||||||
|
|
||||||
$email_data = print_r( $response, true );
|
$email_data = print_r( $response, true );
|
||||||
$email_data .= print_r( $postData, true );
|
$email_data .= print_r( $postData, true );
|
||||||
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com - nie znaleziono zamówienia', $email_data );
|
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com - nie znaleziono zamówienia', $email_data );
|
||||||
@@ -505,13 +492,7 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
echo '<pre>';
|
|
||||||
echo print_r( $response, true );
|
|
||||||
echo print_r( $postData, true );
|
|
||||||
echo '</pre>';
|
|
||||||
|
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd walidacji wysyłania zamówienia do Apilo', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd walidacji wysyłania zamówienia do Apilo', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
||||||
|
|
||||||
$email_data = print_r( $response, true );
|
$email_data = print_r( $response, true );
|
||||||
$email_data .= print_r( $postData, true );
|
$email_data .= print_r( $postData, true );
|
||||||
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com', $email_data );
|
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com', $email_data );
|
||||||
@@ -519,39 +500,146 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
}
|
}
|
||||||
elseif ( $http_code_send >= 400 || !isset( $response['id'] ) )
|
elseif ( $http_code_send >= 400 || !isset( $response['id'] ) )
|
||||||
{
|
{
|
||||||
// Błąd serwera lub brak ID w odpowiedzi — logujemy i pomijamy, NIE ustawiamy apilo_order_id
|
$mdb->update( 'pp_shop_orders', [ 'apilo_order_id' => -1 ], [ 'id' => $order['id'] ] );
|
||||||
// żeby zamówienie nie wpadło w nieskończoną pętlę, ustawiamy apilo_order_id na -1 (błąd)
|
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => -1 ], [ 'id' => $order['id'] ] );
|
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd wysyłania zamówienia do Apilo (HTTP ' . $http_code_send . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Błąd wysyłania zamówienia do Apilo (HTTP ' . $http_code_send . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
||||||
|
|
||||||
$email_data = 'HTTP Code: ' . $http_code_send . "\n\n";
|
$email_data = 'HTTP Code: ' . $http_code_send . "\n\n";
|
||||||
$email_data .= print_r( $response, true );
|
$email_data .= print_r( $response, true );
|
||||||
$email_data .= print_r( $postData, true );
|
$email_data .= print_r( $postData, true );
|
||||||
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia #' . $order['id'] . ' do apilo.com (HTTP ' . $http_code_send . ')', $email_data );
|
\Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia #' . $order['id'] . ' do apilo.com (HTTP ' . $http_code_send . ')', $email_data );
|
||||||
|
|
||||||
echo '<p>Błąd wysyłania zamówienia do apilo.com: ID: ' . $order['id'] . ' (HTTP ' . $http_code_send . ')</p>';
|
echo '<p>Błąd wysyłania zamówienia do apilo.com: ID: ' . $order['id'] . ' (HTTP ' . $http_code_send . ')</p>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => $response['id'] ], [ 'id' => $order['id'] ] );
|
$mdb->update( 'pp_shop_orders', [ 'apilo_order_id' => $response['id'] ], [ 'id' => $order['id'] ] );
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Zamówienie wysłane do Apilo (apilo_order_id: ' . $response['id'] . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'send_order', (int)$order['id'], 'Zamówienie wysłane do Apilo (apilo_order_id: ' . $response['id'] . ')', [ 'http_code' => $http_code_send, 'response' => $response ] );
|
||||||
echo '<p>Wysłałem zamówienie do apilo.com: ID: ' . $order['id'] . ' - ' . $response['id'] . '</p>';
|
echo '<p>Wysłałem zamówienie do apilo.com: ID: ' . $order['id'] . ' - ' . $response['id'] . '</p>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Po wysłaniu zamówień: przetwórz kolejkę sync (płatności/statusy oczekujące na apilo_order_id)
|
return true;
|
||||||
$orderAdminService->processApiloSyncQueue( 10 );
|
});
|
||||||
}
|
|
||||||
|
// 3. Apilo sync payment (event-driven — enqueued by OrderAdminService)
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_SYNC_PAYMENT, function($payload) use ($mdb, $orderRepo, $orderAdminService) {
|
||||||
|
$order_id = (int)($payload['order_id'] ?? 0);
|
||||||
|
if ( $order_id <= 0 ) return true;
|
||||||
|
|
||||||
|
$order = $orderRepo->findRawById( $order_id );
|
||||||
|
if ( !$order ) return true;
|
||||||
|
|
||||||
|
if ( empty($order['apilo_order_id']) ) return false; // retry — awaiting apilo_order_id
|
||||||
|
|
||||||
|
if ( (int)$order['paid'] !== 1 ) return true; // not paid — nothing to sync
|
||||||
|
|
||||||
|
return $orderAdminService->syncApiloPayment( $order );
|
||||||
|
});
|
||||||
|
|
||||||
|
// 4. Apilo sync status (event-driven — enqueued by OrderAdminService)
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_SYNC_STATUS, function($payload) use ($mdb, $orderRepo, $orderAdminService) {
|
||||||
|
$order_id = (int)($payload['order_id'] ?? 0);
|
||||||
|
$status = isset($payload['status']) ? (int)$payload['status'] : null;
|
||||||
|
if ( $order_id <= 0 || $status === null ) return true;
|
||||||
|
|
||||||
|
$order = $orderRepo->findRawById( $order_id );
|
||||||
|
if ( !$order ) return true;
|
||||||
|
|
||||||
|
if ( empty($order['apilo_order_id']) ) return false; // retry — awaiting apilo_order_id
|
||||||
|
|
||||||
|
return $orderAdminService->syncApiloStatus( $order, $status );
|
||||||
|
});
|
||||||
|
|
||||||
|
// 5. Apilo product sync
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_PRODUCT_SYNC, function($payload) use ($mdb, $integrationsRepository) {
|
||||||
|
$apilo_settings = $integrationsRepository->getSettings('apilo');
|
||||||
|
if ( !$apilo_settings['enabled'] || !$apilo_settings['sync_products'] || !$apilo_settings['access-token'] ) return true;
|
||||||
|
|
||||||
|
$stmt = $mdb->query( 'SELECT id, apilo_product_id, apilo_get_data_date, apilo_product_name FROM pp_shop_products WHERE apilo_product_id IS NOT NULL AND apilo_product_id != 0 AND ( apilo_get_data_date IS NULL OR apilo_get_data_date <= \'' . date( 'Y-m-d H:i:s', strtotime( '-10 minutes', time() ) ) . '\' ) ORDER BY apilo_get_data_date ASC LIMIT 1' );
|
||||||
|
$result = $stmt ? $stmt->fetch( \PDO::FETCH_ASSOC ) : null;
|
||||||
|
if ( !$result ) return true;
|
||||||
|
|
||||||
|
$access_token = $integrationsRepository->apiloGetAccessToken();
|
||||||
|
$url = 'https://projectpro.apilo.com/rest/api/warehouse/product/' . $result['apilo_product_id'] . '/';
|
||||||
|
$curl = curl_init( $url );
|
||||||
|
curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
|
||||||
|
curl_setopt( $curl, CURLOPT_HTTPHEADER, [
|
||||||
|
"Authorization: Bearer " . $access_token,
|
||||||
|
"Accept: application/json"
|
||||||
|
] );
|
||||||
|
|
||||||
|
$response = curl_exec( $curl );
|
||||||
|
if ( $response === false ) return false;
|
||||||
|
|
||||||
|
$responseData = json_decode( $response, true );
|
||||||
|
if ( !is_array( $responseData ) || !isset( $responseData['quantity'] ) ) return false;
|
||||||
|
|
||||||
|
$mdb->update( 'pp_shop_products', [ 'quantity' => $responseData['quantity'] ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
||||||
|
$mdb->update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithoutTax'], 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithTax'], 2 ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
||||||
|
$mdb->update( 'pp_shop_products', [ 'apilo_get_data_date' => date( 'Y-m-d H:i:s' ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
|
||||||
|
\Shared\Helpers\Helpers::clear_product_cache( (int)$result['id'] );
|
||||||
|
|
||||||
|
echo '<p>Zaktualizowałem dane produktu (APILO) <b>' . $result['apilo_product_name'] . ' #' . $result['id'] . '</b></p>';
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 6. Apilo pricelist sync
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_PRICELIST_SYNC, function($payload) use ($mdb, $integrationsRepository) {
|
||||||
|
$apilo_settings = $integrationsRepository->getSettings('apilo');
|
||||||
|
if ( !$apilo_settings['enabled'] || !$apilo_settings['access-token'] ) return true;
|
||||||
|
|
||||||
|
$access_token = $integrationsRepository->apiloGetAccessToken();
|
||||||
|
$url = 'https://projectpro.apilo.com/rest/api/warehouse/price-calculated/?price=' . $apilo_settings['pricelist_id'];
|
||||||
|
|
||||||
|
$curl = curl_init( $url );
|
||||||
|
curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
|
||||||
|
curl_setopt( $curl, CURLOPT_CUSTOMREQUEST, "GET" );
|
||||||
|
curl_setopt( $curl, CURLOPT_HTTPHEADER, [
|
||||||
|
"Authorization: Bearer " . $access_token,
|
||||||
|
"Accept: application/json",
|
||||||
|
"Content-Type: application/json"
|
||||||
|
] );
|
||||||
|
|
||||||
|
$response = curl_exec( $curl );
|
||||||
|
if ( $response === false ) return false;
|
||||||
|
|
||||||
|
$responseData = json_decode( $response, true );
|
||||||
|
if ( !is_array( $responseData ) ) return false;
|
||||||
|
|
||||||
|
if ( isset($responseData['list']) && $responseData['list'] )
|
||||||
|
{
|
||||||
|
foreach ( $responseData['list'] as $product_price )
|
||||||
|
{
|
||||||
|
if ( $product_price['customPriceWithTax'] )
|
||||||
|
{
|
||||||
|
$price_brutto = $product_price['customPriceWithTax'];
|
||||||
|
$vat = $mdb->get( 'pp_shop_products', 'vat', [ 'apilo_product_id' => $product_price['product'] ] );
|
||||||
|
$price_netto = $price_brutto / ( ( 100 + $vat ) / 100 );
|
||||||
|
|
||||||
|
$mdb->update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $price_netto, 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $price_brutto, 2 ) ], [ 'apilo_product_id' => $product_price['product'] ] );
|
||||||
|
$product_id = $mdb->get( 'pp_shop_products', 'id', [ 'apilo_product_id' => $product_price['product'] ] );
|
||||||
|
|
||||||
|
( new \Domain\Product\ProductRepository( $mdb ) )->updateCombinationPricesFromBase( (int)$product_id, $price_brutto, $vat, null );
|
||||||
|
\Shared\Helpers\Helpers::clear_product_cache( (int)$product_id );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$integrationsRepository->saveSetting( 'apilo', 'pricelist_update_date', date( 'Y-m-d H:i:s' ) );
|
||||||
|
echo '<p>Zaktualizowałem ceny produktów (APILO)</p>';
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 7. Apilo status poll
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::APILO_STATUS_POLL, function($payload) use ($mdb, $integrationsRepository, $orderRepo, $orderAdminService) {
|
||||||
|
$apilo_settings = $integrationsRepository->getSettings('apilo');
|
||||||
|
if ( !$apilo_settings['enabled'] || !$apilo_settings['sync_orders'] || !$apilo_settings['access-token'] ) return true;
|
||||||
|
|
||||||
|
$stmt = $mdb->query( 'SELECT id, apilo_order_id, apilo_order_status_date, number FROM pp_shop_orders WHERE apilo_order_id IS NOT NULL AND ( status != 6 AND status != 8 AND status != 9 ) AND ( apilo_order_status_date IS NULL OR apilo_order_status_date <= \'' . date( 'Y-m-d H:i:s', strtotime( '-10 minutes', time() ) ) . '\' ) ORDER BY apilo_order_status_date ASC LIMIT 5' );
|
||||||
|
$orders = $stmt ? $stmt->fetchAll( \PDO::FETCH_ASSOC ) : [];
|
||||||
|
|
||||||
// sprawdzanie statusów zamówień w apilo.com jeżeli zamówienie nie jest zrealizowane, anulowane lub nieodebrane
|
|
||||||
if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_settings['access-token'] and $apilo_settings['sync_orders_date_start'] <= date( 'Y-m-d H:i:s' ) )
|
|
||||||
{
|
|
||||||
$orders = $mdb -> query( 'SELECT id, apilo_order_id, apilo_order_status_date, number FROM pp_shop_orders WHERE apilo_order_id IS NOT NULL AND ( status != 6 AND status != 8 AND status != 9 ) AND ( apilo_order_status_date IS NULL OR apilo_order_status_date <= \'' . date( 'Y-m-d H:i:s', strtotime( '-10 minutes', time() ) ) . '\' ) ORDER BY apilo_order_status_date ASC LIMIT 5' ) -> fetchAll( \PDO::FETCH_ASSOC );
|
|
||||||
foreach ( $orders as $order )
|
foreach ( $orders as $order )
|
||||||
{
|
{
|
||||||
if ( $order['apilo_order_id'] )
|
if ( $order['apilo_order_id'] )
|
||||||
{
|
{
|
||||||
$access_token = $integrationsRepository -> apiloGetAccessToken();
|
$access_token = $integrationsRepository->apiloGetAccessToken();
|
||||||
$url = 'https://projectpro.apilo.com/rest/api/orders/' . $order['apilo_order_id'] . '/';
|
$url = 'https://projectpro.apilo.com/rest/api/orders/' . $order['apilo_order_id'] . '/';
|
||||||
|
|
||||||
$ch = curl_init( $url );
|
$ch = curl_init( $url );
|
||||||
@@ -565,70 +653,103 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
|
|||||||
$http_code_poll = (int)curl_getinfo( $ch, CURLINFO_HTTP_CODE );
|
$http_code_poll = (int)curl_getinfo( $ch, CURLINFO_HTTP_CODE );
|
||||||
$responseData = json_decode( $response, true );
|
$responseData = json_decode( $response, true );
|
||||||
|
|
||||||
if ( $responseData['id'] and $responseData['status'] )
|
if ( isset($responseData['id']) && $responseData['id'] && isset($responseData['status']) && $responseData['status'] )
|
||||||
{
|
{
|
||||||
$shop_status_id = ( new \Domain\ShopStatus\ShopStatusRepository( $mdb ) )->getByIntegrationStatusId( 'apilo', (int)$responseData['status'] );
|
$shop_status_id = ( new \Domain\ShopStatus\ShopStatusRepository( $mdb ) )->getByIntegrationStatusId( 'apilo', (int)$responseData['status'] );
|
||||||
|
|
||||||
if ( $shop_status_id )
|
if ( $shop_status_id )
|
||||||
$orderAdminService->changeStatus( (int)$order['id'], $shop_status_id, false );
|
$orderAdminService->changeStatus( (int)$order['id'], $shop_status_id, false );
|
||||||
|
|
||||||
\Domain\Integrations\ApiloLogger::log( $mdb, 'status_poll', (int)$order['id'], 'Status pobrany z Apilo (apilo_status: ' . $responseData['status'] . ', shop_status: ' . ($shop_status_id ?: 'brak mapowania') . ')', [ 'apilo_order_id' => $order['apilo_order_id'], 'http_code' => $http_code_poll, 'response' => $responseData ] );
|
\Domain\Integrations\ApiloLogger::log( $mdb, 'status_poll', (int)$order['id'], 'Status pobrany z Apilo (apilo_status: ' . $responseData['status'] . ', shop_status: ' . ($shop_status_id ? $shop_status_id : 'brak mapowania') . ')', [ 'apilo_order_id' => $order['apilo_order_id'], 'http_code' => $http_code_poll, 'response' => $responseData ] );
|
||||||
|
|
||||||
$orderRepo->updateApiloStatusDate( (int)$order['id'], date( 'Y-m-d H:i:s' ) );
|
$orderRepo->updateApiloStatusDate( (int)$order['id'], date( 'Y-m-d H:i:s' ) );
|
||||||
echo '<p>Zaktualizowałem status zamówienia <b>' . $order['number'] . '</b></p>';
|
echo '<p>Zaktualizowałem status zamówienia <b>' . $order['number'] . '</b></p>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
/* zapisywanie historii cen produktów */
|
// 8. Price history
|
||||||
$results = $mdb -> select( 'pp_shop_products', [ 'id', 'price_brutto', 'price_brutto_promo' ], [ 'OR' => [ 'price_history_date[!]' => date( 'Y-m-d' ), 'price_history_date' => null ], 'ORDER' => [ 'price_history_date' => 'ASC' ], 'LIMIT' => 100 ] );
|
$processor->registerHandler( \Domain\CronJob\CronJobType::PRICE_HISTORY, function($payload) use ($mdb) {
|
||||||
foreach ( $results as $row )
|
$results = $mdb->select( 'pp_shop_products', [ 'id', 'price_brutto', 'price_brutto_promo' ], [ 'OR' => [ 'price_history_date[!]' => date( 'Y-m-d' ), 'price_history_date' => null ], 'ORDER' => [ 'price_history_date' => 'ASC' ], 'LIMIT' => 100 ] );
|
||||||
{
|
|
||||||
if ( $price )
|
foreach ( $results as $row )
|
||||||
{
|
{
|
||||||
$mdb -> insert( 'pp_shop_product_price_history', [
|
$price = $row['price_brutto_promo'] > 0 ? $row['price_brutto_promo'] : $row['price_brutto'];
|
||||||
'id_product' => $row['id'],
|
if ( $price )
|
||||||
'price' => $row['price_brutto_promo'] > 0 ? $row['price_brutto_promo'] : $row['price_brutto'],
|
{
|
||||||
'date' => date( 'Y-m-d' )
|
$mdb->insert( 'pp_shop_product_price_history', [
|
||||||
] );
|
'id_product' => $row['id'],
|
||||||
|
'price' => $price,
|
||||||
|
'date' => date( 'Y-m-d' )
|
||||||
|
] );
|
||||||
|
}
|
||||||
|
|
||||||
|
$mdb->update( 'pp_shop_products', [ 'price_history_date' => date( 'Y-m-d' ) ], [ 'id' => $row['id'] ] );
|
||||||
|
$mdb->delete( 'pp_shop_product_price_history', [ 'date[<=]' => date( 'Y-m-d', strtotime( '-31 days', time() ) ) ] );
|
||||||
|
echo '<p>Zapisuję historyczną cenę dla produktu <b>#' . $row['id'] . '</b></p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$mdb -> update( 'pp_shop_products', [ 'price_history_date' => date( 'Y-m-d' ) ], [ 'id' => $row['id'] ] );
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
$mdb -> delete( 'pp_shop_product_price_history', [ 'date[<=]' => date( 'Y-m-d', strtotime( '-31 days', time() ) ) ] );
|
// 9. Order analysis
|
||||||
echo '<p>Zapisuję historyczną cenę dla produktu <b>#' . $row['id'] . '</b></p>';
|
$processor->registerHandler( \Domain\CronJob\CronJobType::ORDER_ANALYSIS, function($payload) use ($mdb) {
|
||||||
}
|
$orders = $mdb->select( 'pp_shop_orders', 'id', [ 'parsed' => 0, 'LIMIT' => 1 ] );
|
||||||
|
foreach ( $orders as $order )
|
||||||
/* parsowanie zamówień m.in. pod kątem najczęściej sprzedawanych razem produktów */
|
|
||||||
$orders = $mdb -> select( 'pp_shop_orders', 'id', [ 'parsed' => 0, 'LIMIT' => 1 ] );
|
|
||||||
foreach ( $orders as $order )
|
|
||||||
{
|
|
||||||
$products = $mdb -> select( 'pp_shop_order_products', 'product_id', [ 'order_id' => $order ] );
|
|
||||||
foreach ( $products as $product1 )
|
|
||||||
{
|
{
|
||||||
if ( $parent_id = $mdb -> get( 'pp_shop_products', 'parent_id', [ 'id' => $product1 ] ) )
|
$products = $mdb->select( 'pp_shop_order_products', 'product_id', [ 'order_id' => $order ] );
|
||||||
$product1 = $parent_id;
|
foreach ( $products as $product1 )
|
||||||
|
|
||||||
foreach ( $products as $product2 )
|
|
||||||
{
|
{
|
||||||
if ( $parent_id = $mdb -> get( 'pp_shop_products', 'parent_id', [ 'id' => $product2 ] ) )
|
if ( $parent_id = $mdb->get( 'pp_shop_products', 'parent_id', [ 'id' => $product1 ] ) )
|
||||||
$product2 = $parent_id;
|
$product1 = $parent_id;
|
||||||
|
|
||||||
if ( $product1 != $product2 )
|
foreach ( $products as $product2 )
|
||||||
{
|
{
|
||||||
$intersection_id = $mdb -> query( 'SELECT * FROM pp_shop_orders_products_intersection WHERE product_1_id = :product_1_id AND product_2_id = :product_2_id OR product_1_id = :product_2_id AND product_2_id = :product_1_id', [ 'product_1_id' => (int)$product1, 'product_2_id' => (int)$product2 ] ) -> fetch( \PDO::FETCH_ASSOC );
|
if ( $parent_id = $mdb->get( 'pp_shop_products', 'parent_id', [ 'id' => $product2 ] ) )
|
||||||
if ( $intersection_id )
|
$product2 = $parent_id;
|
||||||
|
|
||||||
|
if ( $product1 != $product2 )
|
||||||
{
|
{
|
||||||
$mdb -> update( 'pp_shop_orders_products_intersection', [ 'count' => $intersection_id['count'] + 1 ], [ 'id' => $intersection_id['id'] ] );
|
$stmt = $mdb->query( 'SELECT * FROM pp_shop_orders_products_intersection WHERE product_1_id = :product_1_id AND product_2_id = :product_2_id OR product_1_id = :product_2_id AND product_2_id = :product_1_id', [ 'product_1_id' => (int)$product1, 'product_2_id' => (int)$product2 ] );
|
||||||
}
|
$intersection_id = $stmt ? $stmt->fetch( \PDO::FETCH_ASSOC ) : null;
|
||||||
else
|
if ( $intersection_id )
|
||||||
{
|
{
|
||||||
$mdb -> insert( 'pp_shop_orders_products_intersection', [ 'product_1_id' => (int)$product1, 'product_2_id' => (int)$product2, 'count' => 1 ] );
|
$mdb->update( 'pp_shop_orders_products_intersection', [ 'count' => $intersection_id['count'] + 1 ], [ 'id' => $intersection_id['id'] ] );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$mdb->insert( 'pp_shop_orders_products_intersection', [ 'product_1_id' => (int)$product1, 'product_2_id' => (int)$product2, 'count' => 1 ] );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$mdb->update( 'pp_shop_orders', [ 'parsed' => 1 ], [ 'id' => $order ] );
|
||||||
|
echo '<p>Parsuję zamówienie <b>#' . $order . '</b></p>';
|
||||||
}
|
}
|
||||||
$mdb -> update( 'pp_shop_orders', [ 'parsed' => 1 ], [ 'id' => $order ] );
|
return true;
|
||||||
echo '<p>Parsuję zamówienie <b>#' . $order . '</b></p>';
|
});
|
||||||
}
|
|
||||||
|
// 10. Google XML feed
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::GOOGLE_XML_FEED, function($payload) use ($mdb) {
|
||||||
|
( new \Domain\Product\ProductRepository( $mdb ) )->generateGoogleFeedXml();
|
||||||
|
echo '<p>Wygenerowano Google XML Feed</p>';
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 11. TrustMate invitation — handled by separate cron-turstmate.php (requires browser context)
|
||||||
|
$processor->registerHandler( \Domain\CronJob\CronJobType::TRUSTMATE_INVITATION, function($payload) use ($config) {
|
||||||
|
if ( !isset($config['trustmate']['enabled']) || !$config['trustmate']['enabled'] ) return true;
|
||||||
|
// TrustMate requires browser context (JavaScript). Handled by cron-turstmate.php.
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// =========================================================================
|
||||||
|
// Run processor
|
||||||
|
// =========================================================================
|
||||||
|
|
||||||
|
$result = $processor->run( 20 );
|
||||||
|
|
||||||
|
echo '<hr>';
|
||||||
|
echo '<p><small>CronJob stats: scheduled=' . $result['scheduled'] . ', processed=' . $result['processed'] . ', succeeded=' . $result['succeeded'] . ', failed=' . $result['failed'] . ', skipped=' . $result['skipped'] . '</small></p>';
|
||||||
|
|||||||
73
docs/API.md
73
docs/API.md
@@ -219,6 +219,7 @@ Odpowiedz:
|
|||||||
"set_id": null,
|
"set_id": null,
|
||||||
"product_unit_id": 1,
|
"product_unit_id": 1,
|
||||||
"producer_id": 3,
|
"producer_id": 3,
|
||||||
|
"producer_name": "Nike",
|
||||||
"date_add": "2026-01-15 10:00:00",
|
"date_add": "2026-01-15 10:00:00",
|
||||||
"date_modify": "2026-02-19 12:00:00",
|
"date_modify": "2026-02-19 12:00:00",
|
||||||
"languages": {
|
"languages": {
|
||||||
@@ -237,7 +238,8 @@ Odpowiedz:
|
|||||||
"tab_description_1": null,
|
"tab_description_1": null,
|
||||||
"tab_name_2": null,
|
"tab_name_2": null,
|
||||||
"tab_description_2": null,
|
"tab_description_2": null,
|
||||||
"canonical": null
|
"canonical": null,
|
||||||
|
"security_information": null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"images": [
|
"images": [
|
||||||
@@ -253,6 +255,9 @@ Odpowiedz:
|
|||||||
"value_names": {"pl": "Czerwony", "en": "Red"}
|
"value_names": {"pl": "Czerwony", "en": "Red"}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"custom_fields": [
|
||||||
|
{"name": "Napis na koszulce", "type": "text", "is_required": 1}
|
||||||
|
],
|
||||||
"variants": [
|
"variants": [
|
||||||
{
|
{
|
||||||
"id": 101,
|
"id": 101,
|
||||||
@@ -297,11 +302,15 @@ Content-Type: application/json
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"categories": [1, 5],
|
"categories": [1, 5],
|
||||||
"products_related": [10, 20]
|
"products_related": [10, 20],
|
||||||
|
"custom_fields": [
|
||||||
|
{"name": "Napis na koszulce", "type": "text", "is_required": 1}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Wymagane: `languages` (min. 1 jezyk z `name`) oraz `price_brutto`.
|
Wymagane: `languages` (min. 1 jezyk z `name`) oraz `price_brutto`.
|
||||||
|
`custom_fields` — opcjonalne; kazdy element wymaga `name`, `type` (domyslnie `text`), `is_required` (0/1).
|
||||||
|
|
||||||
Odpowiedz (HTTP 201):
|
Odpowiedz (HTTP 201):
|
||||||
```json
|
```json
|
||||||
@@ -431,6 +440,38 @@ Odpowiedz:
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Kategorie
|
||||||
|
|
||||||
|
#### Lista kategorii
|
||||||
|
```
|
||||||
|
GET api.php?endpoint=categories&action=list
|
||||||
|
```
|
||||||
|
|
||||||
|
Zwraca plaska liste wszystkich aktywnych kategorii w domyslnym jezyku sklepu.
|
||||||
|
|
||||||
|
Odpowiedz:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"status": "ok",
|
||||||
|
"data": {
|
||||||
|
"categories": [
|
||||||
|
{"id": 1, "parent_id": null, "title": "Kategoria glowna"},
|
||||||
|
{"id": 3, "parent_id": 1, "title": "Podkategoria A"},
|
||||||
|
{"id": 5, "parent_id": 1, "title": "Podkategoria B"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Pola odpowiedzi:
|
||||||
|
| Pole | Typ | Opis |
|
||||||
|
|------|-----|------|
|
||||||
|
| `id` | int | ID kategorii |
|
||||||
|
| `parent_id` | int\|null | ID kategorii nadrzednej (null = kategoria glowna) |
|
||||||
|
| `title` | string | Nazwa w domyslnym jezyku; fallback na inny jezyk jesli brak tlumaczenia |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
### Slowniki
|
### Slowniki
|
||||||
|
|
||||||
#### Lista statusow zamowien
|
#### Lista statusow zamowien
|
||||||
@@ -468,6 +509,31 @@ GET api.php?endpoint=dictionaries&action=attributes
|
|||||||
|
|
||||||
Zwraca aktywne atrybuty z wartosciami i wielojezycznymi nazwami.
|
Zwraca aktywne atrybuty z wartosciami i wielojezycznymi nazwami.
|
||||||
|
|
||||||
|
#### Znajdz lub utworz producenta
|
||||||
|
```
|
||||||
|
POST api.php?endpoint=dictionaries&action=ensure_producer
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Nike"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Zwraca istniejacego producenta po nazwie lub tworzy nowego. Uzyc przed tworzeniem produktu, jesli producent moze nie istniec.
|
||||||
|
|
||||||
|
Odpowiedz:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"status": "ok",
|
||||||
|
"data": {
|
||||||
|
"id": 5,
|
||||||
|
"created": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`created: true` gdy producent zostal nowo dodany, `false` gdy juz istnial.
|
||||||
|
|
||||||
Odpowiedz:
|
Odpowiedz:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
@@ -514,4 +580,5 @@ UPDATE pp_settings SET value = 'twoj-klucz-api' WHERE param = 'api_key';
|
|||||||
- Kontrolery: `autoload/api/Controllers/`
|
- Kontrolery: `autoload/api/Controllers/`
|
||||||
- `OrdersApiController` — zamowienia (5 akcji)
|
- `OrdersApiController` — zamowienia (5 akcji)
|
||||||
- `ProductsApiController` — produkty (8 akcji: list, get, create, update, variants, create_variant, update_variant, delete_variant)
|
- `ProductsApiController` — produkty (8 akcji: list, get, create, update, variants, create_variant, update_variant, delete_variant)
|
||||||
- `DictionariesApiController` — slowniki (4 akcje: statuses, transports, payment_methods, attributes)
|
- `DictionariesApiController` — slowniki (5 akcji: statuses, transports, payment_methods, attributes, ensure_producer)
|
||||||
|
- `CategoriesApiController` — kategorie (1 akcja: list)
|
||||||
|
|||||||
@@ -4,6 +4,87 @@ Logi zmian z migracji na Domain-Driven Architecture. Najnowsze na gorze.
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## ver. 0.326 (2026-02-27) - API: endpoint categories/list
|
||||||
|
|
||||||
|
- **NEW**: `api\Controllers\CategoriesApiController` — nowy kontroler API z akcją `list`
|
||||||
|
- **NEW**: Endpoint `GET api.php?endpoint=categories&action=list` — zwraca płaską listę aktywnych kategorii (id, parent_id, title) w domyślnym języku sklepu
|
||||||
|
- **FIX**: Usunięto zbędny parametr w `CategoryRepository`, eliminacja N+1 queries w categories/list przez bulk-fetch tytułów
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.325 (2026-02-27) - Fix changelog encoding + limit wyświetlania
|
||||||
|
|
||||||
|
- **FIX**: `updates/changelog.php` — naprawione krzaczki (mojibake) w polskich znakach; dane odbudowane z plików manifest
|
||||||
|
- **NEW**: `updates/changelog-data.html` — czyste dane changelog oddzielone od logiki PHP
|
||||||
|
- **REFACTOR**: `updates/changelog.php` — konwersja ze statycznego HTML na skrypt PHP: `Content-Type: utf-8`, parsowanie wpisów, filtrowanie po wersji
|
||||||
|
- **NEW**: Parametr `?ver=X.XXX` — ogranicza changelog do 5 wersji wstecz od wersji instancji
|
||||||
|
- **UPDATE**: `admin/templates/update/main-view.php` — przekazuje `?ver=` do URL changelog
|
||||||
|
- **UPDATE**: `build-update.ps1` — nowe wpisy dopisywane do `changelog-data.html` zamiast `changelog.php`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.324 (2026-02-27) - System kolejki zadań cron
|
||||||
|
|
||||||
|
- **NEW**: `Domain\CronJob\CronJobType` — stałe typów zadań, priorytetów, statusów, exponential backoff
|
||||||
|
- **NEW**: `Domain\CronJob\CronJobRepository` — CRUD na `pp_cron_jobs` + `pp_cron_schedules` (enqueue, fetchNext, markCompleted, markFailed, hasPendingJob, cleanup, recoverStuck, getDueSchedules, touchSchedule)
|
||||||
|
- **NEW**: `Domain\CronJob\CronJobProcessor` — orkiestracja: rejestracja handlerów, tworzenie scheduled jobs, przetwarzanie kolejki z priorytetami i retry/backoff
|
||||||
|
- **NEW**: Tabele `pp_cron_jobs` i `pp_cron_schedules` — kolejka zadań z priorytetami, exponential backoff, harmonogram cykliczny
|
||||||
|
- **REFACTOR**: `cron.php` — zastąpienie monolitycznego ~550 linii orkiestratorem z CronJobProcessor i zarejestrowanymi handlerami
|
||||||
|
- **REFACTOR**: `OrderAdminService::queueApiloSync()` — kolejkowanie przez `CronJobRepository::enqueue()` zamiast pliku JSON
|
||||||
|
- **REFACTOR**: `OrderAdminService::syncApiloPayment()`, `syncApiloStatus()` — zmiana z private na public (używane przez handlery cron)
|
||||||
|
- **REMOVED**: `OrderAdminService::processApiloSyncQueue()`, `loadApiloSyncQueue()`, `saveApiloSyncQueue()`, `apiloSyncQueuePath()`, stała `APILO_SYNC_QUEUE_FILE`
|
||||||
|
- **NEW**: Jednorazowa migracja JSON queue → DB w cron.php (automatyczna przy pierwszym uruchomieniu)
|
||||||
|
- **SECURITY**: `cron.php` — ochrona endpointu: wymaga `$config['cron_key']` w URL (`?key=...`) lub trybu CLI
|
||||||
|
- **FIX**: `CronJobRepository::fetchNext()` — re-SELECT po UPDATE eliminuje race condition przy równoległych workerach
|
||||||
|
- **FIX**: `cron.php` — null check dla `$mdb->query()` przed `->fetch()` / `->fetchAll()` (3 miejsca)
|
||||||
|
- **FIX**: `cron.php` — walidacja odpowiedzi curl w APILO_PRODUCT_SYNC i APILO_PRICELIST_SYNC (zapobiega zapisaniu null do bazy)
|
||||||
|
- **FIX**: DI wiring — `CronJobRepository` przekazywany do `OrderAdminService` we wszystkich 4 punktach: `admin\App`, `api\ApiRouter`, `front\App`, `cron.php`
|
||||||
|
- **TESTS**: 41 nowych testów CronJob (CronJobTypeTest, CronJobRepositoryTest, CronJobProcessorTest)
|
||||||
|
- **MIGRATION**: `migrations/0.324.sql`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.323 (2026-02-24) - Import zdjęć, trwałe usuwanie, fix API upload
|
||||||
|
|
||||||
|
- **FIX**: `IntegrationsRepository::shopproImportProduct()` — kompletny refactor importu zdjęć: walidacja HTTP response, curl timeouty, bezpieczna budowa URL, szczegółowy log do `logs/shoppro-import-debug.log` i `error_log`, czytelny komunikat z wynikiem
|
||||||
|
- **FIX**: `ProductRepository::saveProduct()` — `saveCustomFields()` wywoływane tylko gdy klucz `custom_field_name` istnieje w danych (partial update przez API nie czyści custom fields)
|
||||||
|
- **FIX**: `ProductRepository::delete()` — usuwanie rekordów z `pp_shop_products_custom_fields` przy kasowaniu produktu
|
||||||
|
- **FIX**: `ProductsApiController::upload_image()` — poprawka ścieżki uploadu (`upload/` zamiast `../upload/` — api.php działa z rootu projektu)
|
||||||
|
- **NEW**: `ProductArchiveController::delete_permanent()` — trwałe usunięcie produktu z archiwum (wraz ze zdjęciami i załącznikami)
|
||||||
|
- **NEW**: Przycisk "Usuń trwale" w liście produktów archiwalnych z potwierdzeniem
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.318 (2026-02-24) - ShopPRO export produktów + API endpoints
|
||||||
|
|
||||||
|
- **NEW**: `IntegrationsRepository::shopproExportProduct()` — eksport produktu do zdalnej instancji shopPRO: pola główne, tłumaczenia, custom fields, zdjęcia przez API (base64)
|
||||||
|
- **NEW**: `IntegrationsRepository::sendImageToShopproApi()` — wysyłka zdjęć do remote API shopPRO (endpoint `upload_image`) z base64
|
||||||
|
- **REFACTOR**: `shopproImportProduct()` — wydzielono `shopproDb()` i `missingShopproSetting()` jako prywatne helpery; dodano import `security_information`, `producer_id`, custom fields i `alt` zdjęcia
|
||||||
|
- **NEW**: `AttributeRepository::ensureAttributeForApi()` i `ensureAttributeValueForApi()` — idempotent find-or-create dla atrybutów i ich wartości (integracje API)
|
||||||
|
- **NEW**: API endpoint `POST /api.php?endpoint=dictionaries&action=ensure_attribute` — utwórz lub znajdź atrybut po nazwie i typie
|
||||||
|
- **NEW**: API endpoint `POST /api.php?endpoint=dictionaries&action=ensure_attribute_value` — utwórz lub znajdź wartość atrybutu po nazwie
|
||||||
|
- **NEW**: API endpoint `POST /api.php?endpoint=products&action=upload_image` — przyjmuje zdjęcie produktu jako base64 JSON, zapisuje plik i rekord w `pp_shop_products_images`
|
||||||
|
- **NEW**: `IntegrationsController::shoppro_product_export()` — akcja admina eksportująca produkt do shopPRO
|
||||||
|
- **NEW**: Przycisk "Eksportuj do shopPRO" w liście produktów (widoczny gdy shopPRO enabled)
|
||||||
|
- **NEW**: Pole "API key" w ustawieniach integracji shopPRO (`shoppro-settings.php`)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.317 (2026-02-23) - Klucz API: przycisk generowania + fix zapisu
|
||||||
|
|
||||||
|
- **FIX**: `SettingsRepository::saveSettings()` — pole `api_key` brakowało w whiteliście zapisywanych pól, przez co wartość była tracona przy każdym zapisie (TRUNCATE + insert)
|
||||||
|
- **NEW**: Pole "Klucz API" w ustawieniach — przycisk "Generuj" do losowego 32-znakowego klucza alfanumerycznego, usunięto "(ordersPRO)" z nazwy
|
||||||
|
- **FIX**: `api.php` — routing API przeniesiony przed ładowanie globalnych settings (wczesne wyjście), obsługa błędów przez `\Throwable`
|
||||||
|
- **FIX**: `ApiRouter` — catch `\Throwable` zamiast `\Exception` dla pełniejszego łapania błędów
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ver. 0.316 (2026-02-23) - Migracja brakującej kolumny type w custom fields
|
||||||
|
|
||||||
|
- **FIX**: Dodanie brakującej kolumny `type` w tabeli `pp_shop_products_custom_fields` — kolumna była używana w kodzie od v0.277 ale nigdy nie miała migracji ALTER TABLE, przez co instancje ze starszą bazą dostawały `PDOException: Column not found: 1054 Unknown column 'type'` przy zapisie produktu
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## ver. 0.315 (2026-02-23) - Fix listowania atrybutów w admin
|
## ver. 0.315 (2026-02-23) - Fix listowania atrybutów w admin
|
||||||
|
|
||||||
- **FIX**: `AttributeRepository::listForAdmin()` — zapytanie COUNT dostawało parametr `:default_lang_id` którego nie miało w SQL, powodując `PDOException: SQLSTATE[HY093]: Invalid parameter number`. Parametr potrzebny tylko w głównym SELECT, nie w COUNT
|
- **FIX**: `AttributeRepository::listForAdmin()` — zapytanie COUNT dostawało parametr `:default_lang_id` którego nie miało w SQL, powodując `PDOException: SQLSTATE[HY093]: Invalid parameter number`. Parametr potrzebny tylko w głównym SELECT, nie w COUNT
|
||||||
|
|||||||
@@ -46,6 +46,17 @@ Zdjęcia produktów.
|
|||||||
| src | Ścieżka do pliku |
|
| src | Ścieżka do pliku |
|
||||||
| alt | Tekst alternatywny |
|
| alt | Tekst alternatywny |
|
||||||
|
|
||||||
|
## pp_shop_products_custom_fields
|
||||||
|
Dodatkowe pola produktów (custom fields).
|
||||||
|
|
||||||
|
| Kolumna | Opis |
|
||||||
|
|---------|------|
|
||||||
|
| id_additional_field | PK |
|
||||||
|
| id_product | FK do pp_shop_products |
|
||||||
|
| name | Nazwa pola |
|
||||||
|
| type | Typ pola (VARCHAR 30) |
|
||||||
|
| is_required | Czy wymagane (0/1) |
|
||||||
|
|
||||||
## pp_shop_products_categories
|
## pp_shop_products_categories
|
||||||
Przypisanie produktów do kategorii.
|
Przypisanie produktów do kategorii.
|
||||||
|
|
||||||
@@ -643,3 +654,49 @@ Tlumaczenia producentow (per jezyk). FK kaskadowe ON DELETE CASCADE.
|
|||||||
**Aktualizacja 2026-02-15 (ver. 0.273):** modul `/admin/shop_producer` korzysta z `Domain\Producer\ProducerRepository` przez `admin\Controllers\ShopProducerController`. Usunieto legacy `admin\controls\ShopProducer` i `admin\factory\ShopProducer`. `shop\Producer` dziala jako fasada do repozytorium.
|
**Aktualizacja 2026-02-15 (ver. 0.273):** modul `/admin/shop_producer` korzysta z `Domain\Producer\ProducerRepository` przez `admin\Controllers\ShopProducerController`. Usunieto legacy `admin\controls\ShopProducer` i `admin\factory\ShopProducer`. `shop\Producer` dziala jako fasada do repozytorium.
|
||||||
|
|
||||||
**Aktualizacja 2026-02-17 (ver. 0.291):** frontend `/shop_producer/*` korzysta z `Domain\Producer\ProducerRepository` przez `front\Controllers\ShopProducerController`; usunięto legacy `front\controls\ShopProducer` i `shop\Producer`.
|
**Aktualizacja 2026-02-17 (ver. 0.291):** frontend `/shop_producer/*` korzysta z `Domain\Producer\ProducerRepository` przez `front\Controllers\ShopProducerController`; usunięto legacy `front\controls\ShopProducer` i `shop\Producer`.
|
||||||
|
|
||||||
|
## pp_cron_jobs
|
||||||
|
Kolejka zadań cron z priorytetami i retry/backoff.
|
||||||
|
|
||||||
|
| Kolumna | Opis |
|
||||||
|
|---------|------|
|
||||||
|
| id | PK auto increment |
|
||||||
|
| job_type | Typ zadania (VARCHAR 50) — np. apilo_send_order, price_history |
|
||||||
|
| status | ENUM: pending, processing, completed, failed, cancelled |
|
||||||
|
| priority | TINYINT — niższy = ważniejszy (10=krytyczny, 50=wysoki, 100=normalny, 200=niski) |
|
||||||
|
| payload | JSON z danymi zadania (TEXT NULL) |
|
||||||
|
| result | JSON z wynikiem (TEXT NULL) |
|
||||||
|
| attempts | Liczba prób (SMALLINT) |
|
||||||
|
| max_attempts | Maksymalna liczba prób (SMALLINT, domyślnie 10) |
|
||||||
|
| last_error | Ostatni błąd (VARCHAR 500) |
|
||||||
|
| scheduled_at | Kiedy zadanie ma być uruchomione (DATETIME) |
|
||||||
|
| started_at | Kiedy rozpoczęto przetwarzanie (DATETIME NULL) |
|
||||||
|
| completed_at | Kiedy zakończono (DATETIME NULL) |
|
||||||
|
| created_at | Data utworzenia (DATETIME) |
|
||||||
|
| updated_at | Data ostatniej modyfikacji (DATETIME, ON UPDATE) |
|
||||||
|
|
||||||
|
**Indeksy:** idx_status_priority_scheduled (status, priority, scheduled_at), idx_job_type, idx_status
|
||||||
|
|
||||||
|
**Używane w:** `Domain\CronJob\CronJobRepository`, `Domain\CronJob\CronJobProcessor`
|
||||||
|
|
||||||
|
## pp_cron_schedules
|
||||||
|
Harmonogram cyklicznych zadań cron.
|
||||||
|
|
||||||
|
| Kolumna | Opis |
|
||||||
|
|---------|------|
|
||||||
|
| id | PK auto increment |
|
||||||
|
| job_type | Typ zadania (VARCHAR 50, UNIQUE) |
|
||||||
|
| interval_seconds | Interwał uruchomienia w sekundach |
|
||||||
|
| priority | Priorytet tworzonych zadań (TINYINT) |
|
||||||
|
| max_attempts | Maks. prób dla tworzonych zadań (SMALLINT) |
|
||||||
|
| payload | Opcjonalny payload JSON (TEXT NULL) |
|
||||||
|
| enabled | Czy harmonogram aktywny (TINYINT 1) |
|
||||||
|
| last_run_at | Ostatnie uruchomienie (DATETIME NULL) |
|
||||||
|
| next_run_at | Następne planowane uruchomienie (DATETIME NULL) |
|
||||||
|
| created_at | Data utworzenia (DATETIME) |
|
||||||
|
|
||||||
|
**Indeksy:** idx_enabled_next_run (enabled, next_run_at)
|
||||||
|
|
||||||
|
**Używane w:** `Domain\CronJob\CronJobRepository`, `Domain\CronJob\CronJobProcessor`
|
||||||
|
|
||||||
|
**Dodano w wersji 0.324.**
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ Kazdy modul zawiera Repository (i opcjonalnie dodatkowe klasy). Konstruktor DI z
|
|||||||
| Category | CategoryRepository | drzewa kategorii, produkty w kategorii, Redis cache |
|
| Category | CategoryRepository | drzewa kategorii, produkty w kategorii, Redis cache |
|
||||||
| Client | ClientRepository | CRUD, auth, adresy, zamowienia |
|
| Client | ClientRepository | CRUD, auth, adresy, zamowienia |
|
||||||
| Coupon | CouponRepository | kupony rabatowe, walidacja, uzycie |
|
| Coupon | CouponRepository | kupony rabatowe, walidacja, uzycie |
|
||||||
|
| CronJob | CronJobType, CronJobRepository, CronJobProcessor | kolejka zadan cron (DB), priorytety, retry/backoff, harmonogram |
|
||||||
| Dashboard | DashboardRepository | statystyki admin, Redis cache |
|
| Dashboard | DashboardRepository | statystyki admin, Redis cache |
|
||||||
| Dictionaries | DictionariesRepository | slowniki admin |
|
| Dictionaries | DictionariesRepository | slowniki admin |
|
||||||
| Integrations | IntegrationsRepository | Apilo sync, ustawienia |
|
| Integrations | IntegrationsRepository | Apilo sync, ustawienia |
|
||||||
@@ -84,6 +85,7 @@ REST API dla ordersPRO. Entry point: `api.php`. Stateless (bez sesji), autentyka
|
|||||||
- `OrdersApiController` — lista, szczegoly, zmiana statusu, platnosc (5 akcji)
|
- `OrdersApiController` — lista, szczegoly, zmiana statusu, platnosc (5 akcji)
|
||||||
- `ProductsApiController` — lista, szczegoly, tworzenie, aktualizacja produktow (4 akcje)
|
- `ProductsApiController` — lista, szczegoly, tworzenie, aktualizacja produktow (4 akcje)
|
||||||
- `DictionariesApiController` — statusy, transporty, metody platnosci (3 akcje)
|
- `DictionariesApiController` — statusy, transporty, metody platnosci (3 akcje)
|
||||||
|
- `CategoriesApiController` — lista aktywnych kategorii (1 akcja)
|
||||||
|
|
||||||
Dokumentacja: `docs/API.md`
|
Dokumentacja: `docs/API.md`
|
||||||
|
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ composer test # standard
|
|||||||
## Aktualny stan
|
## Aktualny stan
|
||||||
|
|
||||||
```text
|
```text
|
||||||
OK (758 tests, 2135 assertions)
|
OK (805 tests, 2253 assertions)
|
||||||
```
|
```
|
||||||
|
|
||||||
Zweryfikowano: 2026-02-22 (ver. 0.304)
|
Zweryfikowano: 2026-02-24 (ver. 0.318)
|
||||||
|
|
||||||
## Konfiguracja
|
## Konfiguracja
|
||||||
|
|
||||||
@@ -52,6 +52,9 @@ tests/
|
|||||||
| | |-- Cache/CacheRepositoryTest.php
|
| | |-- Cache/CacheRepositoryTest.php
|
||||||
| | |-- Category/CategoryRepositoryTest.php
|
| | |-- Category/CategoryRepositoryTest.php
|
||||||
| | |-- Coupon/CouponRepositoryTest.php
|
| | |-- Coupon/CouponRepositoryTest.php
|
||||||
|
| | |-- CronJob/CronJobTypeTest.php
|
||||||
|
| | |-- CronJob/CronJobRepositoryTest.php
|
||||||
|
| | |-- CronJob/CronJobProcessorTest.php
|
||||||
| | |-- Dictionaries/DictionariesRepositoryTest.php
|
| | |-- Dictionaries/DictionariesRepositoryTest.php
|
||||||
| | |-- Integrations/IntegrationsRepositoryTest.php
|
| | |-- Integrations/IntegrationsRepositoryTest.php
|
||||||
| | |-- Languages/LanguagesRepositoryTest.php
|
| | |-- Languages/LanguagesRepositoryTest.php
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
1. Dodać przycisk kopiowania przy atrybutach produktu w zamówieniu
|
||||||
|
2. Poprawić htaccess, żeby w nim nie było w ogóle adresów strona wszystko z bazy.
|
||||||
|
3. Dodać uwierzytelnienie dwuskładnikowe za pomocą aplikacji.
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
2024-01-05 08:31:37 | 157 | 2024/01/001 | 12.30 | pyziak84@gmail.com
|
|
||||||
<pre></pre>
|
|
||||||
|
|
||||||
2024-01-05 08:36:54 | 157 | 2024/01/001 | 12.30 | pyziak84@gmail.com
|
|
||||||
{"id":516}
|
|
||||||
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
2024-08-20 19:28:32 | 159 | 2024/08/002 | 70.99 | pyziak84@gmail.com
|
|
||||||
[]
|
|
||||||
|
|
||||||
2024-08-20 19:42:45 | 160 | 2024/08/003 | 59.99 | pyziak84@gmail.com
|
|
||||||
{"updates":1}
|
|
||||||
|
|
||||||
1
migrations/0.316.sql
Normal file
1
migrations/0.316.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE `pp_shop_products_custom_fields` ADD COLUMN `type` VARCHAR(30) NOT NULL DEFAULT '' AFTER `name`;
|
||||||
48
migrations/0.324.sql
Normal file
48
migrations/0.324.sql
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
-- System kolejki zadań cron
|
||||||
|
-- Wersja: 0.324
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS pp_cron_jobs (
|
||||||
|
id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
job_type VARCHAR(50) NOT NULL,
|
||||||
|
status ENUM('pending','processing','completed','failed','cancelled') NOT NULL DEFAULT 'pending',
|
||||||
|
priority TINYINT UNSIGNED NOT NULL DEFAULT 100,
|
||||||
|
payload TEXT NULL,
|
||||||
|
result TEXT NULL,
|
||||||
|
attempts SMALLINT UNSIGNED NOT NULL DEFAULT 0,
|
||||||
|
max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 10,
|
||||||
|
last_error VARCHAR(500) NULL,
|
||||||
|
scheduled_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
started_at DATETIME NULL,
|
||||||
|
completed_at DATETIME NULL,
|
||||||
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||||
|
INDEX idx_status_priority_scheduled (status, priority, scheduled_at),
|
||||||
|
INDEX idx_job_type (job_type),
|
||||||
|
INDEX idx_status (status)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS pp_cron_schedules (
|
||||||
|
id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
job_type VARCHAR(50) NOT NULL UNIQUE,
|
||||||
|
interval_seconds INT UNSIGNED NOT NULL,
|
||||||
|
priority TINYINT UNSIGNED NOT NULL DEFAULT 100,
|
||||||
|
max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 3,
|
||||||
|
payload TEXT NULL,
|
||||||
|
enabled TINYINT(1) NOT NULL DEFAULT 1,
|
||||||
|
last_run_at DATETIME NULL,
|
||||||
|
next_run_at DATETIME NULL,
|
||||||
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
INDEX idx_enabled_next_run (enabled, next_run_at)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
|
-- Harmonogramy zadań
|
||||||
|
INSERT INTO pp_cron_schedules (job_type, interval_seconds, priority, max_attempts) VALUES
|
||||||
|
('apilo_token_keepalive', 240, 10, 3),
|
||||||
|
('apilo_send_order', 60, 40, 10),
|
||||||
|
('apilo_product_sync', 600, 100, 3),
|
||||||
|
('apilo_pricelist_sync', 3600, 100, 3),
|
||||||
|
('apilo_status_poll', 600, 100, 3),
|
||||||
|
('price_history', 86400, 100, 3),
|
||||||
|
('order_analysis', 600, 100, 3),
|
||||||
|
('trustmate_invitation', 600, 200, 3),
|
||||||
|
('google_xml_feed', 3600, 200, 3);
|
||||||
BIN
templates/.DS_Store
vendored
BIN
templates/.DS_Store
vendored
Binary file not shown.
301
tests/Unit/Domain/CronJob/CronJobProcessorTest.php
Normal file
301
tests/Unit/Domain/CronJob/CronJobProcessorTest.php
Normal file
@@ -0,0 +1,301 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Unit\Domain\CronJob;
|
||||||
|
|
||||||
|
use Domain\CronJob\CronJobProcessor;
|
||||||
|
use Domain\CronJob\CronJobRepository;
|
||||||
|
use Domain\CronJob\CronJobType;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class CronJobProcessorTest extends TestCase
|
||||||
|
{
|
||||||
|
/** @var \PHPUnit\Framework\MockObject\MockObject|CronJobRepository */
|
||||||
|
private $mockRepo;
|
||||||
|
|
||||||
|
/** @var CronJobProcessor */
|
||||||
|
private $processor;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo = $this->createMock(CronJobRepository::class);
|
||||||
|
$this->processor = new CronJobProcessor($this->mockRepo);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- registerHandler ---
|
||||||
|
|
||||||
|
public function testRegisterHandlerAndProcessJob(): void
|
||||||
|
{
|
||||||
|
$handlerCalled = false;
|
||||||
|
|
||||||
|
$this->processor->registerHandler('test_job', function ($payload) use (&$handlerCalled) {
|
||||||
|
$handlerCalled = true;
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 1, 'job_type' => 'test_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('markCompleted')->with(1, null);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertTrue($handlerCalled);
|
||||||
|
$this->assertSame(1, $stats['processed']);
|
||||||
|
$this->assertSame(1, $stats['succeeded']);
|
||||||
|
$this->assertSame(0, $stats['failed']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- processQueue ---
|
||||||
|
|
||||||
|
public function testProcessQueueReturnsEmptyStatsWhenNoJobs(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([]);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(5);
|
||||||
|
|
||||||
|
$this->assertSame(0, $stats['processed']);
|
||||||
|
$this->assertSame(0, $stats['succeeded']);
|
||||||
|
$this->assertSame(0, $stats['failed']);
|
||||||
|
$this->assertSame(0, $stats['skipped']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueueHandlerReturnsFalse(): void
|
||||||
|
{
|
||||||
|
$this->processor->registerHandler('fail_job', function ($payload) {
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 2, 'job_type' => 'fail_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('markFailed')
|
||||||
|
->with(2, 'Handler returned false', 1);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertSame(1, $stats['failed']);
|
||||||
|
$this->assertSame(0, $stats['succeeded']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueueHandlerThrowsException(): void
|
||||||
|
{
|
||||||
|
$this->processor->registerHandler('error_job', function ($payload) {
|
||||||
|
throw new \RuntimeException('Connection failed');
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 3, 'job_type' => 'error_job', 'payload' => null, 'attempts' => 2],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('markFailed')
|
||||||
|
->with(3, 'Connection failed', 2);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertSame(1, $stats['failed']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueueNoHandlerRegistered(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 4, 'job_type' => 'unknown_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('markFailed')
|
||||||
|
->with(4, $this->stringContains('No handler registered'), 1);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertSame(1, $stats['skipped']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueueHandlerReturnsArray(): void
|
||||||
|
{
|
||||||
|
$resultData = ['synced' => true, 'items' => 5];
|
||||||
|
|
||||||
|
$this->processor->registerHandler('array_job', function ($payload) use ($resultData) {
|
||||||
|
return $resultData;
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 5, 'job_type' => 'array_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('markCompleted')
|
||||||
|
->with(5, $resultData);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertSame(1, $stats['succeeded']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueuePassesPayloadToHandler(): void
|
||||||
|
{
|
||||||
|
$receivedPayload = null;
|
||||||
|
|
||||||
|
$this->processor->registerHandler('payload_job', function ($payload) use (&$receivedPayload) {
|
||||||
|
$receivedPayload = $payload;
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 6, 'job_type' => 'payload_job', 'payload' => ['order_id' => 42], 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->method('markCompleted');
|
||||||
|
|
||||||
|
$this->processor->processQueue(1);
|
||||||
|
|
||||||
|
$this->assertSame(['order_id' => 42], $receivedPayload);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProcessQueueMultipleJobs(): void
|
||||||
|
{
|
||||||
|
$this->processor->registerHandler('ok_job', function ($payload) {
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
$this->processor->registerHandler('fail_job', function ($payload) {
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([
|
||||||
|
['id' => 10, 'job_type' => 'ok_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
['id' => 11, 'job_type' => 'fail_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
['id' => 12, 'job_type' => 'ok_job', 'payload' => null, 'attempts' => 1],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stats = $this->processor->processQueue(10);
|
||||||
|
|
||||||
|
$this->assertSame(3, $stats['processed']);
|
||||||
|
$this->assertSame(2, $stats['succeeded']);
|
||||||
|
$this->assertSame(1, $stats['failed']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- createScheduledJobs ---
|
||||||
|
|
||||||
|
public function testCreateScheduledJobsFromDueSchedules(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([
|
||||||
|
[
|
||||||
|
'id' => 1,
|
||||||
|
'job_type' => 'price_history',
|
||||||
|
'interval_seconds' => 86400,
|
||||||
|
'priority' => 100,
|
||||||
|
'max_attempts' => 3,
|
||||||
|
'payload' => null,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->method('hasPendingJob')->willReturn(false);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('enqueue')
|
||||||
|
->with('price_history', null, 100, 3);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('touchSchedule')
|
||||||
|
->with(1, 86400);
|
||||||
|
|
||||||
|
$created = $this->processor->createScheduledJobs();
|
||||||
|
$this->assertSame(1, $created);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateScheduledJobsSkipsDuplicates(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([
|
||||||
|
[
|
||||||
|
'id' => 2,
|
||||||
|
'job_type' => 'apilo_send_order',
|
||||||
|
'interval_seconds' => 60,
|
||||||
|
'priority' => 50,
|
||||||
|
'max_attempts' => 10,
|
||||||
|
'payload' => null,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->method('hasPendingJob')->willReturn(true);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->never())->method('enqueue');
|
||||||
|
// touchSchedule still called to prevent re-checking
|
||||||
|
$this->mockRepo->expects($this->once())->method('touchSchedule');
|
||||||
|
|
||||||
|
$created = $this->processor->createScheduledJobs();
|
||||||
|
$this->assertSame(0, $created);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateScheduledJobsWithPayload(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([
|
||||||
|
[
|
||||||
|
'id' => 3,
|
||||||
|
'job_type' => 'custom_job',
|
||||||
|
'interval_seconds' => 600,
|
||||||
|
'priority' => 100,
|
||||||
|
'max_attempts' => 3,
|
||||||
|
'payload' => '{"key":"value"}',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->method('hasPendingJob')->willReturn(false);
|
||||||
|
|
||||||
|
$this->mockRepo->expects($this->once())->method('enqueue')
|
||||||
|
->with('custom_job', ['key' => 'value'], 100, 3);
|
||||||
|
|
||||||
|
$this->processor->createScheduledJobs();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateScheduledJobsReturnsZeroWhenNoSchedules(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([]);
|
||||||
|
|
||||||
|
$created = $this->processor->createScheduledJobs();
|
||||||
|
$this->assertSame(0, $created);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- run ---
|
||||||
|
|
||||||
|
public function testRunExecutesFullPipeline(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->expects($this->once())->method('recoverStuck')->with(30);
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([]);
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([]);
|
||||||
|
$this->mockRepo->expects($this->once())->method('cleanup')->with(30);
|
||||||
|
|
||||||
|
$stats = $this->processor->run(20);
|
||||||
|
|
||||||
|
$this->assertArrayHasKey('scheduled', $stats);
|
||||||
|
$this->assertArrayHasKey('processed', $stats);
|
||||||
|
$this->assertArrayHasKey('succeeded', $stats);
|
||||||
|
$this->assertArrayHasKey('failed', $stats);
|
||||||
|
$this->assertArrayHasKey('skipped', $stats);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRunReturnsScheduledCount(): void
|
||||||
|
{
|
||||||
|
$this->mockRepo->method('getDueSchedules')->willReturn([
|
||||||
|
[
|
||||||
|
'id' => 1,
|
||||||
|
'job_type' => 'job_a',
|
||||||
|
'interval_seconds' => 60,
|
||||||
|
'priority' => 100,
|
||||||
|
'max_attempts' => 3,
|
||||||
|
'payload' => null,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'id' => 2,
|
||||||
|
'job_type' => 'job_b',
|
||||||
|
'interval_seconds' => 120,
|
||||||
|
'priority' => 100,
|
||||||
|
'max_attempts' => 3,
|
||||||
|
'payload' => null,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockRepo->method('hasPendingJob')->willReturn(false);
|
||||||
|
$this->mockRepo->method('fetchNext')->willReturn([]);
|
||||||
|
|
||||||
|
$stats = $this->processor->run(20);
|
||||||
|
|
||||||
|
$this->assertSame(2, $stats['scheduled']);
|
||||||
|
}
|
||||||
|
}
|
||||||
385
tests/Unit/Domain/CronJob/CronJobRepositoryTest.php
Normal file
385
tests/Unit/Domain/CronJob/CronJobRepositoryTest.php
Normal file
@@ -0,0 +1,385 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Unit\Domain\CronJob;
|
||||||
|
|
||||||
|
use Domain\CronJob\CronJobRepository;
|
||||||
|
use Domain\CronJob\CronJobType;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class CronJobRepositoryTest extends TestCase
|
||||||
|
{
|
||||||
|
/** @var \PHPUnit\Framework\MockObject\MockObject|\medoo */
|
||||||
|
private $mockDb;
|
||||||
|
|
||||||
|
/** @var CronJobRepository */
|
||||||
|
private $repo;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$this->mockDb = $this->createMock(\medoo::class);
|
||||||
|
$this->repo = new CronJobRepository($this->mockDb);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- enqueue ---
|
||||||
|
|
||||||
|
public function testEnqueueInsertsJobAndReturnsId(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('insert')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['job_type'] === 'apilo_send_order'
|
||||||
|
&& $data['status'] === 'pending'
|
||||||
|
&& $data['priority'] === 50
|
||||||
|
&& $data['max_attempts'] === 10
|
||||||
|
&& isset($data['scheduled_at']);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->mockDb->method('id')->willReturn('42');
|
||||||
|
|
||||||
|
$id = $this->repo->enqueue('apilo_send_order', null, CronJobType::PRIORITY_HIGH);
|
||||||
|
|
||||||
|
$this->assertSame(42, $id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnqueueWithPayloadEncodesJson(): void
|
||||||
|
{
|
||||||
|
$payload = ['order_id' => 123, 'action' => 'sync'];
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('insert')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) use ($payload) {
|
||||||
|
return $data['payload'] === json_encode($payload);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->mockDb->method('id')->willReturn('1');
|
||||||
|
|
||||||
|
$this->repo->enqueue('apilo_sync_payment', $payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnqueueWithoutPayloadDoesNotSetPayloadKey(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('insert')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return !array_key_exists('payload', $data);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->mockDb->method('id')->willReturn('1');
|
||||||
|
|
||||||
|
$this->repo->enqueue('price_history');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnqueueWithScheduledAt(): void
|
||||||
|
{
|
||||||
|
$scheduled = '2026-03-01 10:00:00';
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('insert')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) use ($scheduled) {
|
||||||
|
return $data['scheduled_at'] === $scheduled;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->mockDb->method('id')->willReturn('1');
|
||||||
|
|
||||||
|
$this->repo->enqueue('price_history', null, CronJobType::PRIORITY_NORMAL, 10, $scheduled);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnqueueReturnsNullOnFailure(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->method('insert');
|
||||||
|
$this->mockDb->method('id')->willReturn(null);
|
||||||
|
|
||||||
|
$id = $this->repo->enqueue('test_job');
|
||||||
|
$this->assertNull($id);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- fetchNext ---
|
||||||
|
|
||||||
|
public function testFetchNextReturnsEmptyArrayWhenNoJobs(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->method('select')->willReturn([]);
|
||||||
|
|
||||||
|
$result = $this->repo->fetchNext(5);
|
||||||
|
$this->assertSame([], $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFetchNextUpdatesStatusToProcessing(): void
|
||||||
|
{
|
||||||
|
$pendingJobs = [
|
||||||
|
['id' => 1, 'job_type' => 'test', 'status' => 'pending', 'payload' => null],
|
||||||
|
['id' => 2, 'job_type' => 'test2', 'status' => 'pending', 'payload' => '{"x":1}'],
|
||||||
|
];
|
||||||
|
$claimedJobs = [
|
||||||
|
['id' => 1, 'job_type' => 'test', 'status' => 'processing', 'payload' => null],
|
||||||
|
['id' => 2, 'job_type' => 'test2', 'status' => 'processing', 'payload' => '{"x":1}'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->mockDb->method('select')
|
||||||
|
->willReturnOnConsecutiveCalls($pendingJobs, $claimedJobs);
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['status'] === 'processing'
|
||||||
|
&& isset($data['started_at']);
|
||||||
|
}),
|
||||||
|
$this->callback(function ($where) {
|
||||||
|
return $where['id'] === [1, 2]
|
||||||
|
&& $where['status'] === 'pending';
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$result = $this->repo->fetchNext(5);
|
||||||
|
|
||||||
|
$this->assertCount(2, $result);
|
||||||
|
$this->assertSame('processing', $result[0]['status']);
|
||||||
|
$this->assertSame('processing', $result[1]['status']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFetchNextDecodesPayloadJson(): void
|
||||||
|
{
|
||||||
|
$jobs = [
|
||||||
|
['id' => 1, 'job_type' => 'test', 'status' => 'pending', 'payload' => '{"order_id":99}'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->mockDb->method('select')->willReturn($jobs);
|
||||||
|
$this->mockDb->method('update');
|
||||||
|
|
||||||
|
$result = $this->repo->fetchNext(1);
|
||||||
|
|
||||||
|
$this->assertSame(['order_id' => 99], $result[0]['payload']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- markCompleted ---
|
||||||
|
|
||||||
|
public function testMarkCompletedUpdatesStatus(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['status'] === 'completed'
|
||||||
|
&& isset($data['completed_at']);
|
||||||
|
}),
|
||||||
|
['id' => 5]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->markCompleted(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMarkCompletedWithResult(): void
|
||||||
|
{
|
||||||
|
$result = ['synced' => true, 'count' => 3];
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) use ($result) {
|
||||||
|
return $data['result'] === json_encode($result);
|
||||||
|
}),
|
||||||
|
['id' => 7]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->markCompleted(7, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- markFailed ---
|
||||||
|
|
||||||
|
public function testMarkFailedWithRetriesLeft(): void
|
||||||
|
{
|
||||||
|
// Job with attempts < max_attempts → reschedule with backoff
|
||||||
|
$this->mockDb->method('get')->willReturn([
|
||||||
|
'max_attempts' => 10,
|
||||||
|
'attempts' => 2,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['status'] === 'pending'
|
||||||
|
&& isset($data['scheduled_at'])
|
||||||
|
&& isset($data['last_error']);
|
||||||
|
}),
|
||||||
|
['id' => 3]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->markFailed(3, 'Connection timeout', 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMarkFailedWhenMaxAttemptsReached(): void
|
||||||
|
{
|
||||||
|
// Job with attempts >= max_attempts → permanent failure
|
||||||
|
$this->mockDb->method('get')->willReturn([
|
||||||
|
'max_attempts' => 3,
|
||||||
|
'attempts' => 3,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['status'] === 'failed'
|
||||||
|
&& isset($data['completed_at']);
|
||||||
|
}),
|
||||||
|
['id' => 4]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->markFailed(4, 'Max retries exceeded');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMarkFailedTruncatesErrorTo500Chars(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->method('get')->willReturn([
|
||||||
|
'max_attempts' => 10,
|
||||||
|
'attempts' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$longError = str_repeat('x', 600);
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return mb_strlen($data['last_error']) <= 500;
|
||||||
|
}),
|
||||||
|
['id' => 1]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->markFailed(1, $longError);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- hasPendingJob ---
|
||||||
|
|
||||||
|
public function testHasPendingJobReturnsTrueWhenExists(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->method('count')
|
||||||
|
->with('pp_cron_jobs', $this->callback(function ($where) {
|
||||||
|
return $where['job_type'] === 'apilo_sync_payment'
|
||||||
|
&& $where['status'] === ['pending', 'processing'];
|
||||||
|
}))
|
||||||
|
->willReturn(1);
|
||||||
|
|
||||||
|
$this->assertTrue($this->repo->hasPendingJob('apilo_sync_payment'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testHasPendingJobReturnsFalseWhenNone(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->method('count')->willReturn(0);
|
||||||
|
|
||||||
|
$this->assertFalse($this->repo->hasPendingJob('apilo_sync_payment'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testHasPendingJobWithPayloadMatch(): void
|
||||||
|
{
|
||||||
|
$payload = ['order_id' => 42];
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('count')
|
||||||
|
->with('pp_cron_jobs', $this->callback(function ($where) use ($payload) {
|
||||||
|
return $where['payload'] === json_encode($payload);
|
||||||
|
}))
|
||||||
|
->willReturn(1);
|
||||||
|
|
||||||
|
$this->assertTrue($this->repo->hasPendingJob('apilo_sync_payment', $payload));
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- cleanup ---
|
||||||
|
|
||||||
|
public function testCleanupDeletesOldCompletedJobs(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('delete')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($where) {
|
||||||
|
return $where['status'] === ['completed', 'failed', 'cancelled']
|
||||||
|
&& isset($where['updated_at[<]']);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->cleanup(30);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- recoverStuck ---
|
||||||
|
|
||||||
|
public function testRecoverStuckResetsProcessingJobs(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_jobs',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return $data['status'] === 'pending'
|
||||||
|
&& $data['started_at'] === null;
|
||||||
|
}),
|
||||||
|
$this->callback(function ($where) {
|
||||||
|
return $where['status'] === 'processing'
|
||||||
|
&& isset($where['started_at[<]']);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->recoverStuck(30);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- getDueSchedules ---
|
||||||
|
|
||||||
|
public function testGetDueSchedulesReturnsEnabledSchedules(): void
|
||||||
|
{
|
||||||
|
$schedules = [
|
||||||
|
['id' => 1, 'job_type' => 'price_history', 'interval_seconds' => 86400],
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('select')
|
||||||
|
->with(
|
||||||
|
'pp_cron_schedules',
|
||||||
|
'*',
|
||||||
|
$this->callback(function ($where) {
|
||||||
|
return $where['enabled'] === 1
|
||||||
|
&& isset($where['OR']);
|
||||||
|
})
|
||||||
|
)
|
||||||
|
->willReturn($schedules);
|
||||||
|
|
||||||
|
$result = $this->repo->getDueSchedules();
|
||||||
|
$this->assertCount(1, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- touchSchedule ---
|
||||||
|
|
||||||
|
public function testTouchScheduleUpdatesTimestamps(): void
|
||||||
|
{
|
||||||
|
$this->mockDb->expects($this->once())
|
||||||
|
->method('update')
|
||||||
|
->with(
|
||||||
|
'pp_cron_schedules',
|
||||||
|
$this->callback(function ($data) {
|
||||||
|
return isset($data['last_run_at'])
|
||||||
|
&& isset($data['next_run_at']);
|
||||||
|
}),
|
||||||
|
['id' => 5]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->repo->touchSchedule(5, 3600);
|
||||||
|
}
|
||||||
|
}
|
||||||
97
tests/Unit/Domain/CronJob/CronJobTypeTest.php
Normal file
97
tests/Unit/Domain/CronJob/CronJobTypeTest.php
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Unit\Domain\CronJob;
|
||||||
|
|
||||||
|
use Domain\CronJob\CronJobType;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class CronJobTypeTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testAllTypesReturnsAllJobTypes(): void
|
||||||
|
{
|
||||||
|
$types = CronJobType::allTypes();
|
||||||
|
|
||||||
|
$this->assertContains('apilo_token_keepalive', $types);
|
||||||
|
$this->assertContains('apilo_send_order', $types);
|
||||||
|
$this->assertContains('apilo_sync_payment', $types);
|
||||||
|
$this->assertContains('apilo_sync_status', $types);
|
||||||
|
$this->assertContains('apilo_product_sync', $types);
|
||||||
|
$this->assertContains('apilo_pricelist_sync', $types);
|
||||||
|
$this->assertContains('apilo_status_poll', $types);
|
||||||
|
$this->assertContains('price_history', $types);
|
||||||
|
$this->assertContains('order_analysis', $types);
|
||||||
|
$this->assertContains('trustmate_invitation', $types);
|
||||||
|
$this->assertContains('google_xml_feed', $types);
|
||||||
|
$this->assertCount(11, $types);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAllStatusesReturnsAllStatuses(): void
|
||||||
|
{
|
||||||
|
$statuses = CronJobType::allStatuses();
|
||||||
|
|
||||||
|
$this->assertContains('pending', $statuses);
|
||||||
|
$this->assertContains('processing', $statuses);
|
||||||
|
$this->assertContains('completed', $statuses);
|
||||||
|
$this->assertContains('failed', $statuses);
|
||||||
|
$this->assertContains('cancelled', $statuses);
|
||||||
|
$this->assertCount(5, $statuses);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testPriorityConstants(): void
|
||||||
|
{
|
||||||
|
$this->assertSame(10, CronJobType::PRIORITY_CRITICAL);
|
||||||
|
$this->assertSame(40, CronJobType::PRIORITY_SEND_ORDER);
|
||||||
|
$this->assertSame(50, CronJobType::PRIORITY_HIGH);
|
||||||
|
$this->assertSame(100, CronJobType::PRIORITY_NORMAL);
|
||||||
|
$this->assertSame(200, CronJobType::PRIORITY_LOW);
|
||||||
|
|
||||||
|
// Lower value = higher priority
|
||||||
|
$this->assertLessThan(CronJobType::PRIORITY_SEND_ORDER, CronJobType::PRIORITY_CRITICAL);
|
||||||
|
$this->assertLessThan(CronJobType::PRIORITY_HIGH, CronJobType::PRIORITY_SEND_ORDER);
|
||||||
|
$this->assertLessThan(CronJobType::PRIORITY_NORMAL, CronJobType::PRIORITY_HIGH);
|
||||||
|
$this->assertLessThan(CronJobType::PRIORITY_LOW, CronJobType::PRIORITY_NORMAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCalculateBackoffExponential(): void
|
||||||
|
{
|
||||||
|
// Attempt 1: 60s
|
||||||
|
$this->assertSame(60, CronJobType::calculateBackoff(1));
|
||||||
|
// Attempt 2: 120s
|
||||||
|
$this->assertSame(120, CronJobType::calculateBackoff(2));
|
||||||
|
// Attempt 3: 240s
|
||||||
|
$this->assertSame(240, CronJobType::calculateBackoff(3));
|
||||||
|
// Attempt 4: 480s
|
||||||
|
$this->assertSame(480, CronJobType::calculateBackoff(4));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCalculateBackoffCapsAtMax(): void
|
||||||
|
{
|
||||||
|
// Very high attempt should cap at MAX_BACKOFF_SECONDS (3600)
|
||||||
|
$this->assertSame(3600, CronJobType::calculateBackoff(10));
|
||||||
|
$this->assertSame(3600, CronJobType::calculateBackoff(20));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testJobTypeConstantsMatchStrings(): void
|
||||||
|
{
|
||||||
|
$this->assertSame('apilo_token_keepalive', CronJobType::APILO_TOKEN_KEEPALIVE);
|
||||||
|
$this->assertSame('apilo_send_order', CronJobType::APILO_SEND_ORDER);
|
||||||
|
$this->assertSame('apilo_sync_payment', CronJobType::APILO_SYNC_PAYMENT);
|
||||||
|
$this->assertSame('apilo_sync_status', CronJobType::APILO_SYNC_STATUS);
|
||||||
|
$this->assertSame('apilo_product_sync', CronJobType::APILO_PRODUCT_SYNC);
|
||||||
|
$this->assertSame('apilo_pricelist_sync', CronJobType::APILO_PRICELIST_SYNC);
|
||||||
|
$this->assertSame('apilo_status_poll', CronJobType::APILO_STATUS_POLL);
|
||||||
|
$this->assertSame('price_history', CronJobType::PRICE_HISTORY);
|
||||||
|
$this->assertSame('order_analysis', CronJobType::ORDER_ANALYSIS);
|
||||||
|
$this->assertSame('trustmate_invitation', CronJobType::TRUSTMATE_INVITATION);
|
||||||
|
$this->assertSame('google_xml_feed', CronJobType::GOOGLE_XML_FEED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatusConstantsMatchStrings(): void
|
||||||
|
{
|
||||||
|
$this->assertSame('pending', CronJobType::STATUS_PENDING);
|
||||||
|
$this->assertSame('processing', CronJobType::STATUS_PROCESSING);
|
||||||
|
$this->assertSame('completed', CronJobType::STATUS_COMPLETED);
|
||||||
|
$this->assertSame('failed', CronJobType::STATUS_FAILED);
|
||||||
|
$this->assertSame('cancelled', CronJobType::STATUS_CANCELLED);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,8 @@ use Domain\Order\OrderRepository;
|
|||||||
use Domain\Product\ProductRepository;
|
use Domain\Product\ProductRepository;
|
||||||
use Domain\Settings\SettingsRepository;
|
use Domain\Settings\SettingsRepository;
|
||||||
use Domain\Transport\TransportRepository;
|
use Domain\Transport\TransportRepository;
|
||||||
|
use Domain\CronJob\CronJobRepository;
|
||||||
|
use Domain\CronJob\CronJobType;
|
||||||
|
|
||||||
class OrderAdminServiceTest extends TestCase
|
class OrderAdminServiceTest extends TestCase
|
||||||
{
|
{
|
||||||
@@ -229,108 +231,14 @@ class OrderAdminServiceTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// processApiloSyncQueue — awaiting apilo_order_id
|
// queueApiloSync — DB-based via CronJobRepository
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
private function getQueuePath(): string
|
public function testConstructorAcceptsCronJobRepo(): void
|
||||||
{
|
{
|
||||||
// Musi odpowiadać ścieżce w OrderAdminService::apiloSyncQueuePath()
|
|
||||||
// dirname(autoload/Domain/Order/, 2) = autoload/
|
|
||||||
return dirname(__DIR__, 4) . '/autoload/temp/apilo-sync-queue.json';
|
|
||||||
}
|
|
||||||
|
|
||||||
private function writeQueue(array $queue): void
|
|
||||||
{
|
|
||||||
$path = $this->getQueuePath();
|
|
||||||
$dir = dirname($path);
|
|
||||||
if (!is_dir($dir)) {
|
|
||||||
mkdir($dir, 0777, true);
|
|
||||||
}
|
|
||||||
file_put_contents($path, json_encode($queue, JSON_PRETTY_PRINT));
|
|
||||||
}
|
|
||||||
|
|
||||||
private function readQueue(): array
|
|
||||||
{
|
|
||||||
$path = $this->getQueuePath();
|
|
||||||
if (!file_exists($path)) return [];
|
|
||||||
$content = file_get_contents($path);
|
|
||||||
return $content ? json_decode($content, true) : [];
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function tearDown(): void
|
|
||||||
{
|
|
||||||
$path = $this->getQueuePath();
|
|
||||||
if (file_exists($path)) {
|
|
||||||
unlink($path);
|
|
||||||
}
|
|
||||||
parent::tearDown();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testProcessApiloSyncQueueKeepsTaskWhenApiloOrderIdIsNull(): void
|
|
||||||
{
|
|
||||||
// Zamówienie bez apilo_order_id — task powinien zostać w kolejce
|
|
||||||
$this->writeQueue([
|
|
||||||
'42' => [
|
|
||||||
'order_id' => 42,
|
|
||||||
'payment' => 1,
|
|
||||||
'status' => null,
|
|
||||||
'attempts' => 0,
|
|
||||||
'last_error' => 'awaiting_apilo_order',
|
|
||||||
'updated_at' => '2026-01-01 00:00:00',
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
|
|
||||||
$orderRepo = $this->createMock(OrderRepository::class);
|
$orderRepo = $this->createMock(OrderRepository::class);
|
||||||
$orderRepo->method('findRawById')
|
$cronJobRepo = $this->createMock(CronJobRepository::class);
|
||||||
->with(42)
|
$service = new OrderAdminService($orderRepo, null, null, null, $cronJobRepo);
|
||||||
->willReturn([
|
$this->assertInstanceOf(OrderAdminService::class, $service);
|
||||||
'id' => 42,
|
|
||||||
'apilo_order_id' => null,
|
|
||||||
'paid' => 1,
|
|
||||||
'summary' => '100.00',
|
|
||||||
]);
|
|
||||||
|
|
||||||
$service = new OrderAdminService($orderRepo);
|
|
||||||
$processed = $service->processApiloSyncQueue(10);
|
|
||||||
|
|
||||||
$this->assertSame(1, $processed);
|
|
||||||
|
|
||||||
$queue = $this->readQueue();
|
|
||||||
$this->assertArrayHasKey('42', $queue);
|
|
||||||
$this->assertSame('awaiting_apilo_order', $queue['42']['last_error']);
|
|
||||||
$this->assertSame(1, $queue['42']['attempts']);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testProcessApiloSyncQueueRemovesTaskAfterMaxAttempts(): void
|
|
||||||
{
|
|
||||||
// Task z 49 próbami — limit to 50, więc powinien zostać usunięty
|
|
||||||
$this->writeQueue([
|
|
||||||
'42' => [
|
|
||||||
'order_id' => 42,
|
|
||||||
'payment' => 1,
|
|
||||||
'status' => null,
|
|
||||||
'attempts' => 49,
|
|
||||||
'last_error' => 'awaiting_apilo_order',
|
|
||||||
'updated_at' => '2026-01-01 00:00:00',
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
|
|
||||||
$orderRepo = $this->createMock(OrderRepository::class);
|
|
||||||
$orderRepo->method('findRawById')
|
|
||||||
->with(42)
|
|
||||||
->willReturn([
|
|
||||||
'id' => 42,
|
|
||||||
'apilo_order_id' => null,
|
|
||||||
'paid' => 1,
|
|
||||||
'summary' => '100.00',
|
|
||||||
]);
|
|
||||||
|
|
||||||
$service = new OrderAdminService($orderRepo);
|
|
||||||
$processed = $service->processApiloSyncQueue(10);
|
|
||||||
|
|
||||||
$this->assertSame(1, $processed);
|
|
||||||
|
|
||||||
$queue = $this->readQueue();
|
|
||||||
$this->assertArrayNotHasKey('42', $queue);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace Tests\Unit\api\Controllers;
|
|||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use api\Controllers\DictionariesApiController;
|
use api\Controllers\DictionariesApiController;
|
||||||
use Domain\Attribute\AttributeRepository;
|
use Domain\Attribute\AttributeRepository;
|
||||||
|
use Domain\Producer\ProducerRepository;
|
||||||
use Domain\ShopStatus\ShopStatusRepository;
|
use Domain\ShopStatus\ShopStatusRepository;
|
||||||
use Domain\Transport\TransportRepository;
|
use Domain\Transport\TransportRepository;
|
||||||
use Domain\PaymentMethod\PaymentMethodRepository;
|
use Domain\PaymentMethod\PaymentMethodRepository;
|
||||||
@@ -14,6 +15,7 @@ class DictionariesApiControllerTest extends TestCase
|
|||||||
private $mockTransportRepo;
|
private $mockTransportRepo;
|
||||||
private $mockPaymentRepo;
|
private $mockPaymentRepo;
|
||||||
private $mockAttrRepo;
|
private $mockAttrRepo;
|
||||||
|
private $mockProducerRepo;
|
||||||
private $controller;
|
private $controller;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
@@ -22,12 +24,14 @@ class DictionariesApiControllerTest extends TestCase
|
|||||||
$this->mockTransportRepo = $this->createMock(TransportRepository::class);
|
$this->mockTransportRepo = $this->createMock(TransportRepository::class);
|
||||||
$this->mockPaymentRepo = $this->createMock(PaymentMethodRepository::class);
|
$this->mockPaymentRepo = $this->createMock(PaymentMethodRepository::class);
|
||||||
$this->mockAttrRepo = $this->createMock(AttributeRepository::class);
|
$this->mockAttrRepo = $this->createMock(AttributeRepository::class);
|
||||||
|
$this->mockProducerRepo = $this->createMock(ProducerRepository::class);
|
||||||
|
|
||||||
$this->controller = new DictionariesApiController(
|
$this->controller = new DictionariesApiController(
|
||||||
$this->mockStatusRepo,
|
$this->mockStatusRepo,
|
||||||
$this->mockTransportRepo,
|
$this->mockTransportRepo,
|
||||||
$this->mockPaymentRepo,
|
$this->mockPaymentRepo,
|
||||||
$this->mockAttrRepo
|
$this->mockAttrRepo,
|
||||||
|
$this->mockProducerRepo
|
||||||
);
|
);
|
||||||
|
|
||||||
$_SERVER['REQUEST_METHOD'] = 'GET';
|
$_SERVER['REQUEST_METHOD'] = 'GET';
|
||||||
@@ -186,4 +190,52 @@ class DictionariesApiControllerTest extends TestCase
|
|||||||
|
|
||||||
$this->assertSame(405, http_response_code());
|
$this->assertSame(405, http_response_code());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testEnsureAttributeRejectsGetMethod(): void
|
||||||
|
{
|
||||||
|
$_SERVER['REQUEST_METHOD'] = 'GET';
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
$this->controller->ensure_attribute();
|
||||||
|
ob_get_clean();
|
||||||
|
|
||||||
|
$this->assertSame(405, http_response_code());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnsureAttributeReturns400WhenNoBody(): void
|
||||||
|
{
|
||||||
|
$_SERVER['REQUEST_METHOD'] = 'POST';
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
$this->controller->ensure_attribute();
|
||||||
|
$output = ob_get_clean();
|
||||||
|
|
||||||
|
$this->assertSame(400, http_response_code());
|
||||||
|
$json = json_decode($output, true);
|
||||||
|
$this->assertSame('BAD_REQUEST', $json['code']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnsureAttributeValueRejectsGetMethod(): void
|
||||||
|
{
|
||||||
|
$_SERVER['REQUEST_METHOD'] = 'GET';
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
$this->controller->ensure_attribute_value();
|
||||||
|
ob_get_clean();
|
||||||
|
|
||||||
|
$this->assertSame(405, http_response_code());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnsureAttributeValueReturns400WhenNoBody(): void
|
||||||
|
{
|
||||||
|
$_SERVER['REQUEST_METHOD'] = 'POST';
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
$this->controller->ensure_attribute_value();
|
||||||
|
$output = ob_get_clean();
|
||||||
|
|
||||||
|
$this->assertSame(400, http_response_code());
|
||||||
|
$json = json_decode($output, true);
|
||||||
|
$this->assertSame('BAD_REQUEST', $json['code']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -351,6 +351,19 @@ class ProductsApiControllerTest extends TestCase
|
|||||||
$this->assertSame('5901234123457', $result['ean']);
|
$this->assertSame('5901234123457', $result['ean']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testMapApiToFormDataPreservesZeroBasePriceForSaveProduct(): void
|
||||||
|
{
|
||||||
|
$method = new \ReflectionMethod(ProductsApiController::class, 'mapApiToFormData');
|
||||||
|
$method->setAccessible(true);
|
||||||
|
|
||||||
|
$result = $method->invoke($this->controller, [
|
||||||
|
'price_brutto' => 0.0,
|
||||||
|
'languages' => ['pl' => ['name' => 'Zero']],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame('0', $result['price_brutto']);
|
||||||
|
}
|
||||||
|
|
||||||
public function testMapApiToFormDataMapsCategories(): void
|
public function testMapApiToFormDataMapsCategories(): void
|
||||||
{
|
{
|
||||||
$method = new \ReflectionMethod(ProductsApiController::class, 'mapApiToFormData');
|
$method = new \ReflectionMethod(ProductsApiController::class, 'mapApiToFormData');
|
||||||
|
|||||||
BIN
updates/0.30/ver_0.315.zip
Normal file
BIN
updates/0.30/ver_0.315.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.315_manifest.json
Normal file
23
updates/0.30/ver_0.315_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - PDOException w listowaniu atrybutow admin (SQLSTATE HY093)",
|
||||||
|
"version": "0.315",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Attribute/AttributeRepository.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:cfe6eb7dfad896c4ea885c2f9a52c6a389d4e38379a0bf64f5d429910d87e55f",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-23",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.316.zip
Normal file
BIN
updates/0.30/ver_0.316.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.316_manifest.json
Normal file
23
updates/0.30/ver_0.316_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields",
|
||||||
|
"version": "0.316",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:654a3683c0add19d0cb2f87db6f6a45cd4ce08799dd3692c6adacc07666f13b1",
|
||||||
|
"sql": [
|
||||||
|
"ALTER TABLE `pp_shop_products_custom_fields` ADD COLUMN `type` VARCHAR(30) NOT NULL DEFAULT \u0027\u0027 AFTER `name`;"
|
||||||
|
],
|
||||||
|
"date": "2026-02-23",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.317.zip
Normal file
BIN
updates/0.30/ver_0.317.zip
Normal file
Binary file not shown.
26
updates/0.30/ver_0.317_manifest.json
Normal file
26
updates/0.30/ver_0.317_manifest.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - klucz API: fix zapisu (brakowalo w whiteliście), przycisk Generuj losowy klucz, ulepszony routing API",
|
||||||
|
"version": "0.317",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"api.php",
|
||||||
|
"autoload/Domain/Settings/SettingsRepository.php",
|
||||||
|
"autoload/admin/Controllers/SettingsController.php",
|
||||||
|
"autoload/api/ApiRouter.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:130e5f4fd15b635bb277dc639d528e017de866fbaada5db2d08d9426251824b3",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-23",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.318.zip
Normal file
BIN
updates/0.30/ver_0.318.zip
Normal file
Binary file not shown.
30
updates/0.30/ver_0.318_manifest.json
Normal file
30
updates/0.30/ver_0.318_manifest.json
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"changelog": "NEW - shopPRO export produktów + API endpoints (ensure_attribute, ensure_attribute_value, upload_image)",
|
||||||
|
"version": "0.318",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"admin/templates/integrations/shoppro-settings.php",
|
||||||
|
"autoload/Domain/Attribute/AttributeRepository.php",
|
||||||
|
"autoload/Domain/Integrations/IntegrationsRepository.php",
|
||||||
|
"autoload/Domain/Product/ProductRepository.php",
|
||||||
|
"autoload/admin/Controllers/IntegrationsController.php",
|
||||||
|
"autoload/admin/Controllers/ShopProductController.php",
|
||||||
|
"autoload/api/Controllers/DictionariesApiController.php",
|
||||||
|
"autoload/api/Controllers/ProductsApiController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:6a7eba1b390db94ccda210a5f2cbcd33f17f43d9f34031c4d0793d224df5d541",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.319.zip
Normal file
BIN
updates/0.30/ver_0.319.zip
Normal file
Binary file not shown.
26
updates/0.30/ver_0.319_manifest.json
Normal file
26
updates/0.30/ver_0.319_manifest.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - usunięcie shopPRO eksportu produktów; API produktu: dodano custom_fields i security_information",
|
||||||
|
"version": "0.319",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Integrations/IntegrationsRepository.php",
|
||||||
|
"autoload/Domain/Product/ProductRepository.php",
|
||||||
|
"autoload/admin/Controllers/IntegrationsController.php",
|
||||||
|
"autoload/admin/Controllers/ShopProductController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:99e07eb85aeca1c96607e95c90408bfbc166d97c0b999cc9eb033c6a4f208b97",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.320.zip
Normal file
BIN
updates/0.30/ver_0.320.zip
Normal file
Binary file not shown.
26
updates/0.30/ver_0.320_manifest.json
Normal file
26
updates/0.30/ver_0.320_manifest.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"changelog": "NEW - API: endpoint ensure_producer (znajdź lub utwórz producenta); GET product zwraca producer_name",
|
||||||
|
"version": "0.320",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Producer/ProducerRepository.php",
|
||||||
|
"autoload/Domain/Product/ProductRepository.php",
|
||||||
|
"autoload/api/ApiRouter.php",
|
||||||
|
"autoload/api/Controllers/DictionariesApiController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:eb38b6f260768c25d331de60098eba647a897972c211b37b39314c8a3f954bf3",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.321.zip
Normal file
BIN
updates/0.30/ver_0.321.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.321_manifest.json
Normal file
23
updates/0.30/ver_0.321_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"changelog": "NEW - API: obsługa custom_fields w create/update produktu",
|
||||||
|
"version": "0.321",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/api/Controllers/ProductsApiController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:a04ac9975618bc3b21d80a8e449f98e5bc825ce49a37142e1e621a2ef34a19f1",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.322.zip
Normal file
BIN
updates/0.30/ver_0.322.zip
Normal file
Binary file not shown.
24
updates/0.30/ver_0.322_manifest.json
Normal file
24
updates/0.30/ver_0.322_manifest.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - custom_fields: jawne mapowanie kluczy w ProductRepository, spójne !empty w ProductsApiController",
|
||||||
|
"version": "0.322",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Product/ProductRepository.php",
|
||||||
|
"autoload/api/Controllers/ProductsApiController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:7c6e04cc393fdcd94e6fc9d2ea7a85f9c078e4beb9075d490be90675e4f6eae7",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.323.zip
Normal file
BIN
updates/0.30/ver_0.323.zip
Normal file
Binary file not shown.
26
updates/0.30/ver_0.323_manifest.json
Normal file
26
updates/0.30/ver_0.323_manifest.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - refactor importu zdjec w shopPRO import (walidacja HTTP, curl timeouty, logi), FIX - saveCustomFields tylko przy jawnym podaniu, FIX - delete() czysci custom_fields, FIX - sciezka upload w API, NEW - trwale usuwanie produktow z archiwum",
|
||||||
|
"version": "0.323",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Integrations/IntegrationsRepository.php",
|
||||||
|
"autoload/Domain/Product/ProductRepository.php",
|
||||||
|
"autoload/admin/Controllers/ProductArchiveController.php",
|
||||||
|
"autoload/api/Controllers/ProductsApiController.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:8e779c9b2ad63bbfb478692d20a5327eeb9dc51f83d5da0ec6efe1a61917e8a5",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-24",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
updates/0.30/ver_0.324.zip
Normal file
BIN
updates/0.30/ver_0.324.zip
Normal file
Binary file not shown.
7
updates/0.30/ver_0.324_files.txt
Normal file
7
updates/0.30/ver_0.324_files.txt
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
F: ../autoload/.DS_Store
|
||||||
|
F: ../autoload/front/.DS_Store
|
||||||
|
F: ../logs/2024-01-05-order-set-as-paid.txt
|
||||||
|
F: ../logs/2024-08-20-order-set-as-paid.txt
|
||||||
|
F: ../logs/apilo.txt
|
||||||
|
F: ../logs/logs-db-2024-08-31.log
|
||||||
|
F: ../templates/.DS_Store
|
||||||
37
updates/0.30/ver_0.324_manifest.json
Normal file
37
updates/0.30/ver_0.324_manifest.json
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
"changelog": "NEW - system kolejki zadań cron (DB), priorytetowe przetwarzanie, retry/backoff, ochrona endpointu cron",
|
||||||
|
"version": "0.324",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
"autoload/Domain/CronJob/CronJobProcessor.php",
|
||||||
|
"autoload/Domain/CronJob/CronJobRepository.php",
|
||||||
|
"autoload/Domain/CronJob/CronJobType.php"
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
"autoload/.DS_Store",
|
||||||
|
"autoload/front/.DS_Store",
|
||||||
|
"logs/2024-01-05-order-set-as-paid.txt",
|
||||||
|
"logs/2024-08-20-order-set-as-paid.txt",
|
||||||
|
"logs/apilo.txt",
|
||||||
|
"logs/logs-db-2024-08-31.log",
|
||||||
|
"templates/.DS_Store"
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"autoload/Domain/Order/OrderAdminService.php",
|
||||||
|
"autoload/admin/App.php",
|
||||||
|
"autoload/api/ApiRouter.php",
|
||||||
|
"autoload/front/App.php",
|
||||||
|
"cron.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:63237e6bdb2ed2c2632cebb45431b26ecd5717b129aa2180540ebce0c3bff77f",
|
||||||
|
"sql": [
|
||||||
|
"CREATE TABLE IF NOT EXISTS pp_cron_jobs ( id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, job_type VARCHAR(50) NOT NULL, status ENUM('pending','processing','completed','failed','cancelled') NOT NULL DEFAULT 'pending', priority TINYINT UNSIGNED NOT NULL DEFAULT 100, payload TEXT NULL, result TEXT NULL, attempts SMALLINT UNSIGNED NOT NULL DEFAULT 0, max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 10, last_error VARCHAR(500) NULL, scheduled_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, started_at DATETIME NULL, completed_at DATETIME NULL, created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_status_priority_scheduled (status, priority, scheduled_at), INDEX idx_job_type (job_type), INDEX idx_status (status) ) ENGINE=InnoDB DEFAULT CHARSET=utf8",
|
||||||
|
"CREATE TABLE IF NOT EXISTS pp_cron_schedules ( id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, job_type VARCHAR(50) NOT NULL UNIQUE, interval_seconds INT UNSIGNED NOT NULL, priority TINYINT UNSIGNED NOT NULL DEFAULT 100, max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 3, payload TEXT NULL, enabled TINYINT(1) NOT NULL DEFAULT 1, last_run_at DATETIME NULL, next_run_at DATETIME NULL, created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX idx_enabled_next_run (enabled, next_run_at) ) ENGINE=InnoDB DEFAULT CHARSET=utf8",
|
||||||
|
"INSERT INTO pp_cron_schedules (job_type, interval_seconds, priority, max_attempts) VALUES ('apilo_token_keepalive', 240, 10, 3), ('apilo_send_order', 60, 40, 10), ('apilo_product_sync', 600, 100, 3), ('apilo_pricelist_sync', 3600, 100, 3), ('apilo_status_poll', 600, 100, 3), ('price_history', 86400, 100, 3), ('order_analysis', 600, 100, 3), ('trustmate_invitation', 600, 200, 3), ('google_xml_feed', 3600, 200, 3)"
|
||||||
|
],
|
||||||
|
"date": "2026-02-27",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
45
updates/0.30/ver_0.324_sql.txt
Normal file
45
updates/0.30/ver_0.324_sql.txt
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
-- System kolejki zadań cron
|
||||||
|
-- Wersja: 0.324
|
||||||
|
CREATE TABLE IF NOT EXISTS pp_cron_jobs (
|
||||||
|
id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
job_type VARCHAR(50) NOT NULL,
|
||||||
|
status ENUM('pending','processing','completed','failed','cancelled') NOT NULL DEFAULT 'pending',
|
||||||
|
priority TINYINT UNSIGNED NOT NULL DEFAULT 100,
|
||||||
|
payload TEXT NULL,
|
||||||
|
result TEXT NULL,
|
||||||
|
attempts SMALLINT UNSIGNED NOT NULL DEFAULT 0,
|
||||||
|
max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 10,
|
||||||
|
last_error VARCHAR(500) NULL,
|
||||||
|
scheduled_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
started_at DATETIME NULL,
|
||||||
|
completed_at DATETIME NULL,
|
||||||
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||||
|
INDEX idx_status_priority_scheduled (status, priority, scheduled_at),
|
||||||
|
INDEX idx_job_type (job_type),
|
||||||
|
INDEX idx_status (status)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
CREATE TABLE IF NOT EXISTS pp_cron_schedules (
|
||||||
|
id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
job_type VARCHAR(50) NOT NULL UNIQUE,
|
||||||
|
interval_seconds INT UNSIGNED NOT NULL,
|
||||||
|
priority TINYINT UNSIGNED NOT NULL DEFAULT 100,
|
||||||
|
max_attempts SMALLINT UNSIGNED NOT NULL DEFAULT 3,
|
||||||
|
payload TEXT NULL,
|
||||||
|
enabled TINYINT(1) NOT NULL DEFAULT 1,
|
||||||
|
last_run_at DATETIME NULL,
|
||||||
|
next_run_at DATETIME NULL,
|
||||||
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
INDEX idx_enabled_next_run (enabled, next_run_at)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
-- Harmonogramy zadań
|
||||||
|
INSERT INTO pp_cron_schedules (job_type, interval_seconds, priority, max_attempts) VALUES
|
||||||
|
('apilo_token_keepalive', 240, 10, 3),
|
||||||
|
('apilo_send_order', 60, 40, 10),
|
||||||
|
('apilo_product_sync', 600, 100, 3),
|
||||||
|
('apilo_pricelist_sync', 3600, 100, 3),
|
||||||
|
('apilo_status_poll', 600, 100, 3),
|
||||||
|
('price_history', 86400, 100, 3),
|
||||||
|
('order_analysis', 600, 100, 3),
|
||||||
|
('trustmate_invitation', 600, 200, 3),
|
||||||
|
('google_xml_feed', 3600, 200, 3);
|
||||||
BIN
updates/0.30/ver_0.325.zip
Normal file
BIN
updates/0.30/ver_0.325.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.325_manifest.json
Normal file
23
updates/0.30/ver_0.325_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"changelog": "FIX - naprawione krzaczki (mojibake) w changelog, limit wyswietlania do 5 wersji wstecz od wersji instancji",
|
||||||
|
"version": "0.325",
|
||||||
|
"files": {
|
||||||
|
"added": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"deleted": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"modified": [
|
||||||
|
"admin/templates/update/main-view.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"checksum_zip": "sha256:2fbafb77747d60e90d511f76d1c974bd866519a3ebb4d2a7a1dda062c00572f2",
|
||||||
|
"sql": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"date": "2026-02-27",
|
||||||
|
"directories_deleted": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
819
updates/changelog-data.html
Normal file
819
updates/changelog-data.html
Normal file
@@ -0,0 +1,819 @@
|
|||||||
|
<b>ver. 0.325 - 27.02.2026</b><br />
|
||||||
|
FIX - naprawione krzaczki (mojibake) w changelog, limit wyswietlania do 5 wersji wstecz od wersji instancji
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.324 - 27.02.2026</b><br />
|
||||||
|
NEW - system kolejki zadań cron (DB), priorytetowe przetwarzanie, retry/backoff, ochrona endpointu cron
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.323 - 24.02.2026</b><br />
|
||||||
|
FIX - refactor importu zdjec w shopPRO import (walidacja HTTP, curl timeouty, logi), FIX - saveCustomFields tylko przy jawnym podaniu, FIX - delete() czysci custom_fields, FIX - sciezka upload w API, NEW - trwale usuwanie produktow z archiwum
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.322 - 24.02.2026</b><br />
|
||||||
|
FIX - custom_fields: jawne mapowanie kluczy w ProductRepository, spĂłjne !empty w ProductsApiController
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.321 - 24.02.2026</b><br />
|
||||||
|
NEW - API: obsługa custom_fields w create/update produktu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.320 - 24.02.2026</b><br />
|
||||||
|
NEW - API: endpoint ensure_producer (znajdĹş lub utwĂłrz producenta); GET product zwraca producer_name
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.319 - 24.02.2026</b><br />
|
||||||
|
FIX - usunięcie shopPRO eksportu produktów; API produktu: dodano custom_fields i security_information
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.318 - 24.02.2026</b><br />
|
||||||
|
NEW - shopPRO export produktĂłw + API endpoints (ensure_attribute, ensure_attribute_value, upload_image)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.317 - 23.02.2026</b><br />
|
||||||
|
FIX - klucz API: fix zapisu (brakowalo w whiteliście), przycisk Generuj losowy klucz, ulepszony routing API
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.316 - 23.02.2026</b><br />
|
||||||
|
FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.315 - 23.02.2026</b><br />
|
||||||
|
FIX - PDOException w listowaniu atrybutow admin (SQLSTATE HY093)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.314 - 23.02.2026</b><br />
|
||||||
|
FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamĂłwienia
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.313 - 23.02.2026</b><br />
|
||||||
|
FIX - sync płatności Apilo (int cast na apilo_order_id PPxxxxxx dawał 0) + logowanie decyzji sync do pp_log
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.312 - 23.02.2026</b><br />
|
||||||
|
FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskończona pętla wysyłki, ceny 0.00 PLN, walidacja cen
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.311 - 23.02.2026</b><br />
|
||||||
|
FIX - race condition callback płatności Apilo, persistence filtrów tabel admin, poprawki cen zamówień
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.310 - 23.02.2026</b><br />
|
||||||
|
NEW - Zakladka Logi w sekcji Integracje (podglad pp_log z paginacja, sortowaniem, filtrami)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.309 - 23.02.2026</b><br />
|
||||||
|
NEW - ApiloLogger (logowanie operacji Apilo do pp_log), cache-busting CSS/JS w admin panelu, poprawki UI listy produktow, clipboard API
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.308 - 22.02.2026</b><br />
|
||||||
|
NEW - kolorowe badge statusow zamowien, walidacja hex, sanityzacja HTML transport, optymalizacja SQL
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.307 - 22.02.2026</b><br />
|
||||||
|
NEW - przycisk Sprawdz aktualizacje w panelu admina, NEW - auto-generowany changelog z manifestow
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.306 - 22.02.2026</b><br />
|
||||||
|
FIX - ukrywanie form dostawy gdy nie ma dostepnych form platnosci
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.305 - 22.02.2026</b><br />
|
||||||
|
FIX - naprawa kolejnosci atrybutow permutacji, NEW - pasek postepu darmowej dostawy w koszyku
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.304 - 22.02.2026</b><br />
|
||||||
|
NEW - konfigurowalne limity kwotowe metod platnosci (min/max kwota zamowienia)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.303 - 22.02.2026</b><br />
|
||||||
|
FIX - naprawiono wyswietlanie atrybutow produktu na froncie (kolizja kolejnosci), NEW - przycisk Podglad w edycji produktu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.302 - 22.02.2026</b><br />
|
||||||
|
NEW - REST API wariantow produktow (CRUD), slownik atrybutow, filtrowanie po atrybutach, wzbogacone atrybuty z tlumaczeniami
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.301 - 22.02.2026</b><br />
|
||||||
|
NEW - Ukrywalne filtry tabel, mobilna wersja szczegółów zamówienia
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.300 - 21.02.2026</b><br />
|
||||||
|
- NEW - System aktualizacji oparty na manifestach JSON (checksum SHA256, backup plikĂłw, automatyczny build)
|
||||||
|
- NEW - Panel logu aktualizacji w panelu admina
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.299 - 21.02.2026</b><br />
|
||||||
|
- NEW - Ukrywanie/pokazywanie kolumn w tabelach admina (toggle switch + localStorage)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.298 - 20.02.2026</b><br />
|
||||||
|
- FIX - kilka poprawek po aktualizacji
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.297 - 19.02.2026</b><br />
|
||||||
|
- NEW - REST API produktów (lista, szczegóły, tworzenie, aktualizacja)
|
||||||
|
- NEW - Endpoint products z filtrowaniem, sortowaniem i paginacjÄ…
|
||||||
|
- NEW - Partial update produktĂłw (tylko zmienione pola)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.296 - 19.02.2026</b><br />
|
||||||
|
- NEW - REST API zamówień dla ordersPRO (lista, szczegóły, zmiana statusu, płatności)
|
||||||
|
- NEW - Endpointy słownikowe (statusy, transporty, metody płatności)
|
||||||
|
- NEW - Autentykacja API przez X-Api-Key header
|
||||||
|
- NEW - Kolumna updated_at w pp_shop_orders (polling zmian)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.295 - 19.02.2026</b><br />
|
||||||
|
- NEW - Edycja produktów w zamówieniu z panelu admina (dodawanie, usuwanie, zmiana ilości/cen)
|
||||||
|
- NEW - Wyszukiwarka produktĂłw AJAX w formularzu edycji zamĂłwienia
|
||||||
|
- NEW - Automatyczna korekta stanĂłw magazynowych i przeliczanie kosztu dostawy
|
||||||
|
- FIX - Cena promo w zamĂłwieniu = 0 gdy identyczna z cenÄ… bazowÄ…
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.294 - 19.02.2026</b><br />
|
||||||
|
- FIX - Code review zakończony (96/96 klas, ~1144 metod): 27 fixów across all layers
|
||||||
|
- FIX - Domain: null guard na query()->fetchAll() w 8 repozytoriach, redundancja DI w PromotionRepository
|
||||||
|
- FIX - Admin: null safety find() ?: [] w 10 kontrolerach, null guard w App logowaniu/2FA
|
||||||
|
- FIX - Front: LayoutEngine undefined $level + $_GET null check, ShopBasketController missing global $lang_id
|
||||||
|
- FIX - Shared: Helpers $_GET null check + bug 'png' → 'image/png' (Imagick lossless WebP nigdy nie działał)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.293 - 19.02.2026</b><br />
|
||||||
|
- FIX - ArticleRepository: SQL injection fix (addslashes→parameterized), uproszczenie articleDetailsFrontend
|
||||||
|
- FIX - AttributeRepository: martwy class_exists('\S') blokowal czyszczenie cache/temp
|
||||||
|
- FIX - CategoryRepository: martwy class_exists('\S') blokowal generowanie linkow SEO kategorii
|
||||||
|
- FIX - BannerRepository: parametryzacja dat w SQL + null guard na query()
|
||||||
|
- FIX - BasketCalculator: null guard checkProductQuantityInStock + opcjonalne DI params summaryPrice/calculateBasketProductPrice
|
||||||
|
- FIX - PromotionRepository: null guard na $basket (produkcyjny fatal error)
|
||||||
|
- UPDATE - OrderRepository, ShopBasketController, ajax.php: jawne DI zamiast globals w callerach BasketCalculator
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.292 - 18.02.2026</b><br />
|
||||||
|
- UPDATE - pelna migracja front\factory\ do Domain (5 ostatnich klas: ShopProduct, ShopPaymentMethod, ShopPromotion, ShopStatuses, ShopTransport)
|
||||||
|
- UPDATE - ProductRepository: ~20 nowych metod frontendowych (cache Redis, lazy loading, SKU/EAN fallback)
|
||||||
|
- UPDATE - PromotionRepository: 5 metod aplikowania promocji (applyTypeWholeBasket/CheapestProduct/CategoriesOr/CategoriesAnd/CategoryCondition)
|
||||||
|
- UPDATE - TransportRepository: 4 metody frontendowe z cache (transportMethodsFront, transportCostCached, findActiveByIdCached, forPaymentMethod)
|
||||||
|
- UPDATE - PaymentMethodRepository: metody frontendowe z Redis cache
|
||||||
|
- CLEANUP - usuniety caly folder front\factory\ (20 klas zmigrowanych) + 4 inne klasy legacy
|
||||||
|
- FIX - broken transports_list() w ajax.php zastapiony nowa metoda forPaymentMethod()
|
||||||
|
- UPDATE - front\controls\Site przemianowany na front\App (router, camelCase: checkUrlParams, pageTitle)
|
||||||
|
- UPDATE - front\view\Site przemianowany na front\LayoutEngine (layout engine, camelCase: cookieInformation)
|
||||||
|
- CLEANUP - usuniete autoload/front/controls/ i autoload/front/view/ (puste foldery + pliki legacy)
|
||||||
|
- UPDATE - usuniecie 12 legacy klas z autoload/shop/ (~2363 linii) — pelna migracja na Domain-Driven Architecture
|
||||||
|
- UPDATE - class.Order.php: logika Apilo sync i email statusu przeniesiona do OrderAdminService
|
||||||
|
- UPDATE - class.Product.php: ~20 metod przeniesionych do ProductRepository, calculate_basket_product_price do BasketCalculator
|
||||||
|
- FIX - findCached(): stale Redis cache z obiektami \shop\Product powodowal ceny 0,00 zl
|
||||||
|
- FIX - szablony: konwersja object access na array access po migracji Product
|
||||||
|
- UPDATE - AttributeRepository::getAttributeValueById() — dodano Redis cache
|
||||||
|
- CLEANUP - katalog autoload/shop/ pusty, zero referencji \shop\ w aktywnym kodzie
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.291 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\controls\ShopProducer + shop\Producer do Domain\Producer\ProducerRepository + front\Controllers\ShopProducerController
|
||||||
|
- FIX - bug shop\Producer::__get() referowal nieistniejace $this->data
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.290 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\factory\ShopCoupon + front\controls\ShopCoupon do Domain\Coupon\CouponRepository + front\Controllers\ShopCouponController
|
||||||
|
- UPDATE - migracja front\factory\ShopOrder + front\controls\ShopOrder + front\view\ShopOrder do Domain\Order\OrderRepository + front\Controllers\ShopOrderController
|
||||||
|
- FIX - kupony jednorazowe nigdy nie byly oznaczane jako uzyte (is_one_time/set_as_used w shop\Coupon)
|
||||||
|
- FIX - webhooks przelewy24/hotpay ujednolicone z tpay (poprawna obsluga Apilo sync)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.289 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\factory\ShopCategory + front\view\ShopCategory do Domain\Category\CategoryRepository + front\Views\ShopCategory
|
||||||
|
- UPDATE - migracja front\factory\ShopClient + front\view\ShopClient + front\controls\ShopClient do Domain\Client\ClientRepository + front\Views\ShopClient + front\Controllers\ShopClientController
|
||||||
|
- FIX - usuniety hardcoded password bypass 'Legia1916' w logowaniu klienta
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.288 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\factory\ShopBasket do Domain\Basket\BasketCalculator (4 metody statyczne)
|
||||||
|
- UPDATE - migracja front\controls\ShopBasket do front\Controllers\ShopBasketController (camelCase, instancyjny)
|
||||||
|
- UPDATE - routing snake_case->camelCase w dispatch dla nowych kontrolerow
|
||||||
|
- CLEANUP - usunieta klasa cms\Layout (zastapiona $layoutsRepo->find)
|
||||||
|
- CLEANUP - usuniete 3 klasy legacy (front\factory\ShopBasket, front\controls\ShopBasket, cms\Layout)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.287 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\factory\Scontainers do Domain\Scontainers\ScontainersRepository (frontScontainerDetails z Redis cache)
|
||||||
|
- UPDATE - migracja front\factory\ShopAttribute do Domain\Attribute\AttributeRepository (frontAttributeDetails, frontValueDetails z Redis cache)
|
||||||
|
- CLEANUP - usuniete 3 klasy legacy (front\factory\Scontainers, front\view\Scontainers, front\factory\ShopAttribute)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.286 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja front\factory\Layouts do Domain\Layouts\LayoutsRepository (6 metod frontend z Redis cache)
|
||||||
|
- UPDATE - migracja front\factory\Menu + front\factory\Pages do Domain\Pages\PagesRepository (6 metod frontend z Redis cache)
|
||||||
|
- UPDATE - migracja front\view\Menu do front\Views\Menu (nowy namespace)
|
||||||
|
- CLEANUP - usuniete 4 klasy legacy + 1 martwy szablon (submenu.php)
|
||||||
|
- FIX - null $lang_id przy wczesnym wywolaniu check_url_params()
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.285 - 17.02.2026</b><br />
|
||||||
|
- UPDATE - migracja class.Tpl.php do Shared\Tpl\Tpl (~135 plikow przepietych)
|
||||||
|
- CLEANUP - usunieta nieuzywana klasa CurlServer (curl.class.php)
|
||||||
|
- FIX - thumb.php: naprawa require po migracji Image do Shared namespace
|
||||||
|
- FIX - Tpl::render() branch 3: sprawdzal templates_user ale ladowal templates
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.284 - 16.02.2026</b><br />
|
||||||
|
- CLEANUP - usunieta klasa DbModel (base ORM) — logika wbudowana bezposrednio w shop\Promotion
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.283 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - migracja class.S.php do Shared\Helpers\Helpers (~140 plikow przepietych)
|
||||||
|
- UPDATE - migracja class.Html.php do Shared\Html\Html
|
||||||
|
- UPDATE - migracja class.Email.php do Shared\Email\Email
|
||||||
|
- UPDATE - migracja class.Image.php do Shared\Image\ImageManipulator
|
||||||
|
- UPDATE - migracja class.Log.php do Shared\Log\Log (usunieta — logika przeniesiona)
|
||||||
|
- CLEANUP - usunieta class.Mobile_Detect.php (przestarzala detekcja UA)
|
||||||
|
- CLEANUP - usunieto 12 nieuzywanych metod z klasy S
|
||||||
|
- FIX - array_cartesian_product() — blad iteracji po niezdefiniowanej zmiennej
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.282 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - Cache cleanup: eliminacja legacy class.Cache.php, migracja CacheHandler i RedisConnection do Shared\Cache namespace
|
||||||
|
- UPDATE - 60 odwolan CacheHandler i 12 odwolan RedisConnection przepietych na Shared\Cache\
|
||||||
|
- UPDATE - 13 metod front\factory przepietych z \Cache::fetch/store na CacheHandler (ShopProduct, ShopPaymentMethod, ShopCategory, ShopTransport, ShopAttribute)
|
||||||
|
- FIX - naprawione rozbieznosci kluczy cache (random_products, category_name)
|
||||||
|
- CLEANUP - usuniete: class.Cache.php, class.CacheHandler.php, class.RedisConnection.php
|
||||||
|
- UPDATE - testy: OK (454 tests, 1449 assertions)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.281 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - migracja Banners frontend: factory + view do Domain/Views (DI)
|
||||||
|
- NEW - `front\Views\Banners` — czysty VIEW (banners, mainBanner)
|
||||||
|
- UPDATE - `BannerRepository` rozszerzony o 2 metody frontendowe (banners, mainBanner) z Redis cache
|
||||||
|
- UPDATE - `front\view\Site::show()` przepiety na repo + Views
|
||||||
|
- CLEANUP - usuniete: front\factory\Banners, front\view\Banners
|
||||||
|
- UPDATE - testy: OK (454 tests, 1449 assertions)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.280 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - migracja Articles frontend: factory + view + encja do Domain/Views (DI)
|
||||||
|
- NEW - `front\Views\Articles` — czysty VIEW + utility (renderowanie, generateTableOfContents, generateHeadersIds, getImage)
|
||||||
|
- UPDATE - `ArticleRepository` rozszerzony o 8 metod frontendowych (z Redis cache)
|
||||||
|
- UPDATE - `front\view\Site::show()` — 5 sekcji przepietych na repo + Views
|
||||||
|
- UPDATE - `front\controls\Site::route()` — single article + page_type switch przepiete na repo + Views
|
||||||
|
- UPDATE - 5 szablonow `templates/articles/*` przepietych na `\front\Views\Articles::`
|
||||||
|
- CLEANUP - usuniete: `class.Article` (encja + metody statyczne), `front\factory\Settings` (fasada)
|
||||||
|
- FIX - eliminacja `global $lang` z `articleNoindex()`, eliminacja zaleznosci od `front\factory\Pages::page_sort()`
|
||||||
|
- UPDATE - testy: `OK (450 tests, 1431 assertions)`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.279 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - migracja Newsletter frontend: factory + view + controls do Domain/Controllers/Views (DI)
|
||||||
|
- UPDATE - nowy namespace `front\Controllers` z `NewsletterController` (DI via factory closures)
|
||||||
|
- UPDATE - nowy namespace `front\Views` z `Languages` i `Newsletter` (czyste VIEW, statyczne metody)
|
||||||
|
- UPDATE - routing frontend: `Site::getControllerFactories()` z fallback na stare kontrolery
|
||||||
|
- FIX - `newsletter_unsubscribe()` — poprawiona skladnia medoo `delete()` (2 argumenty zamiast 3)
|
||||||
|
- UPDATE - eliminacja fasady `front\factory\Languages` — 26 zaleznosci przepietych na `LanguagesRepository`
|
||||||
|
- CLEANUP - usuniete: `front\factory\Languages`, `front\factory\Newsletter`, `front\view\Languages`, `front\view\Newsletter`, `front\controls\Newsletter`
|
||||||
|
- UPDATE - testy: `OK (437 tests, 1398 assertions)`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.278 - 16.02.2026</b><br />
|
||||||
|
- UPDATE - migracja Settings + Languages do wspolnych klas Domain (z cache Redis)
|
||||||
|
- FIX - `get_single_settings_value()` — parametr `$param` poprawnie uzywany (wczesniej hardcoded `firm_name`)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.277 - 16.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopProduct` (factory) — pelna migracja ~40 metod do `ProductRepository` + ~30 akcji w `ShopProductController`
|
||||||
|
- NEW - migracja modulu `Dashboard` do Domain + DI (`DashboardRepository`, `DashboardController`)
|
||||||
|
- NEW - migracja modulu `Update` do Domain + DI (`UpdateRepository`, `UpdateController`)
|
||||||
|
- UPDATE - klasa `admin\Site` przemianowana na `admin\App` (plik `App.php`)
|
||||||
|
- UPDATE - refaktoring routingu — usunieto fallback na stare kontrolery, uproszczony routing
|
||||||
|
- UPDATE - template `update/main-view.php` — panele zamiast `gridEdit`, `$.confirm()` zamiast `$.prompt()`
|
||||||
|
- CLEANUP - usuniete stare foldery: `autoload/admin/controls/`, `autoload/admin/factory/`, `autoload/admin/view/`
|
||||||
|
- CLEANUP - usuniete legacy: `class.Dashboard.php` (controls/shop), `class.Update.php` (controls/factory/view), `class.Articles.php` (factory), `class.Page.php` (view), `class.ShopProduct.php` (controls/factory/view)
|
||||||
|
- UPDATE - `front\factory\Newsletter` przepieta na `ArticleRepository::articlesByDateAdd()`
|
||||||
|
- UPDATE - testy: `OK (414 tests, 1335 assertions)`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.276 - 15.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopOrder` do architektury Domain + DI (`Domain\Order\OrderRepository`, `Domain\Order\OrderAdminService`, `admin\Controllers\ShopOrderController`)
|
||||||
|
- UPDATE - modul `/admin/shop_order/*` przepiety na nowy routing (kanoniczny URL `/admin/shop_order/list/`) i nowe widoki (`orders-list`, `order-details`, `order-edit`)
|
||||||
|
- FIX - stabilizacja listy zamowien (`OrderRepository::listForAdmin`) oraz poprawa wygladu tabeli (`components/table-list`, wyrownanie komorek i `text-right`)
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopOrder.php`, `autoload/admin/factory/class.ShopOrder.php`, `admin/templates/shop-order/view-list.php`
|
||||||
|
- UPDATE - usunieta fasada `autoload/admin/factory/class.Integrations.php`; wywolania przepiete na `Domain\Integrations\IntegrationsRepository`
|
||||||
|
- NEW - globalna wyszukiwarka admin (produkty + zamowienia) przy "Wyczysc cache" + endpoint `/admin/settings/globalSearchAjax/`
|
||||||
|
- FIX - wyszukiwanie po pelnym imieniu i nazwisku w global search
|
||||||
|
- UPDATE - testy: `OK (385 tests, 1246 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.276.zip`, `ver_0.276_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.275 - 15.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopCategory` do architektury Domain + DI (`Domain\Category\CategoryRepository`, `admin\Controllers\ShopCategoryController`)
|
||||||
|
- UPDATE - modul `/admin/shop_category/*` przepiety na nowy routing (kanoniczny URL `/admin/shop_category/list/`) i endpointy AJAX kontrolera (`save_categories_order`, `save_products_order`, `cookie_categories`)
|
||||||
|
- UPDATE - widoki `shop-category/*`: wydzielenie skryptow do `*-custom-script.php`, ujednolicone strzalki drzewa (`button + caret + aria-expanded`)
|
||||||
|
- UPDATE - przepiecie zaleznosci `ShopProduct` z `admin\factory\ShopCategory` na `Domain\Category\CategoryRepository`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopCategory.php`, `autoload/admin/factory/class.ShopCategory.php`, `autoload/admin/view/class.ShopCategory.php`
|
||||||
|
- UPDATE - testy: `OK (377 tests, 1197 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.275.zip`, `ver_0.275_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.274 - 15.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopClients` do architektury Domain + DI (`Domain\Client\ClientRepository`, `admin\Controllers\ShopClientsController`)
|
||||||
|
- UPDATE - modul `/admin/shop_clients/*` przepiety na `components/table-list` (lista klientow i szczegoly zamowien)
|
||||||
|
- UPDATE - routing i menu admin przepiete na kanoniczny URL `/admin/shop_clients/list/`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopClients.php`, `autoload/admin/factory/class.ShopClients.php`
|
||||||
|
- UPDATE - testy: `OK (361 tests, 1125 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.274.zip`, `ver_0.274_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.273 - 15.02.2026</b><br />
|
||||||
|
- NEW - migracja `/admin/shop_product/mass_edit/*` do `Domain\Product\ProductRepository` + `admin\Controllers\ShopProductController` (DI + routing)
|
||||||
|
- UPDATE - nowy widok/skrypt masowej edycji (`mass-edit`, `mass-edit-custom-script`) z iCheck i ujednoliconymi strzalkami drzewa
|
||||||
|
- FIX - zaznaczanie kategorii w mass-edit nie zaznacza automatycznie produktow na liscie
|
||||||
|
- UPDATE - ujednolicenie strzalek/checkboxow w drzewkach: `/admin/pages/list/*` oraz zakladka wyswietlania w `/admin/articles/edit/*`
|
||||||
|
- UPDATE - testy: `OK (351 tests, 1091 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.273.zip`, `ver_0.273_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.272 - 15.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopProductSets` do architektury Domain + DI (`Domain\ProductSet\ProductSetRepository`, `admin\Controllers\ShopProductSetsController`)
|
||||||
|
- UPDATE - modul `/admin/shop_product_sets/*` przepiety z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit` + multi-select Selectize
|
||||||
|
- UPDATE - routing i menu admin przepiete na kanoniczny URL `/admin/shop_product_sets/list/`
|
||||||
|
- UPDATE - `shop\ProductSet` przepiety na fasade do `Domain\ProductSet\ProductSetRepository`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopProductSets.php`, `autoload/admin/factory/class.ShopProductSet.php`, `admin/templates/shop-product-sets/view-list.php`, `admin/templates/shop-product-sets/set-edit.php`
|
||||||
|
- UPDATE - testy: `OK (324 tests, 1000 assertions)` + nowe pliki testowe `ProductSetRepositoryTest`, `ShopProductSetsControllerTest`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.272.zip`, `ver_0.272_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.271 - 14.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopAttribute` do architektury Domain + DI (`Domain\Attribute\AttributeRepository`, `admin\Controllers\ShopAttributeController`)
|
||||||
|
- UPDATE - modul `/admin/shop_attribute/*` przepiety z legacy `grid/gridEdit` na `components/table-list`, `components/form-edit` oraz nowy edytor wartosci (`values-edit`)
|
||||||
|
- UPDATE - routing i menu admin przepiete na kanoniczny URL `/admin/shop_attribute/list/` (bez aliasow legacy)
|
||||||
|
- UPDATE - przepiecie zaleznosci kombinacji produktu: `admin\controls\ShopProduct`, `admin\factory\ShopProduct`, `admin/templates/shop-product/product-combination.php`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopAttribute.php`, `autoload/admin/factory/class.ShopAttribute.php`, `autoload/admin/view/class.ShopAttribute.php`, `admin/templates/shop-attribute/_partials/value.php`
|
||||||
|
- UPDATE - testy: `OK (312 tests, 948 assertions)` + nowe pliki testowe `AttributeRepositoryTest`, `ShopAttributeControllerTest`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.271.zip`, `ver_0.271_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.270 - 14.02.2026</b><br />
|
||||||
|
- FIX - Apilo: `shop\Order::set_as_paid()` wysyla mapowany typ platnosci Apilo (z `payment_method_id`), zamiast stalego `type = 1`
|
||||||
|
- NEW - Apilo: dodana kolejka retry `temp/apilo-sync-queue.json` dla nieudanych syncow platnosci/statusu (chwilowa niedostepnosc API)
|
||||||
|
- UPDATE - `cron.php`: automatyczne ponawianie zaleglych syncow przez `Order::process_apilo_sync_queue(10)`
|
||||||
|
- UPDATE - debug Apilo: rozszerzone logi odpowiedzi o HTTP code i bledy cURL dla sync platnosci/statusu
|
||||||
|
- UPDATE - testy: `OK (300 tests, 895 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.270.zip`, `ver_0.270_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.269 - 14.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopPaymentMethod` do architektury Domain + DI (`Domain\PaymentMethod\PaymentMethodRepository`, `admin\Controllers\ShopPaymentMethodController`)
|
||||||
|
- UPDATE - modul `/admin/shop_payment_method/*` przepiety z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit` (nowe widoki listy i edycji)
|
||||||
|
- UPDATE - przepiecie zaleznosci na nowe repozytorium: `admin\controls\ShopTransport`, `front\factory\ShopPaymentMethod`, `shop\PaymentMethod`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopPaymentMethod.php`, `autoload/admin/factory/class.ShopPaymentMethod.php`, `autoload/admin/view/class.ShopPaymentMethod.php`, `admin/templates/shop-payment-method/view-list.php`
|
||||||
|
- UPDATE - Apilo: dodane automatyczne odswiezanie tokenu przed wygasnieciem (`apiloKeepalive`) oraz bardziej szczegolowe komunikaty bledow integracji
|
||||||
|
- UPDATE - testy: `OK (280 tests, 828 assertions)` + nowe pliki testowe `PaymentMethodRepositoryTest`, `ShopPaymentMethodControllerTest`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.269.zip`, `ver_0.269_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.268 - 14.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopStatuses` do architektury Domain + DI (`Domain\ShopStatus\ShopStatusRepository`, `admin\Controllers\ShopStatusesController`)
|
||||||
|
- UPDATE - modul `/admin/shop_statuses/*` przepiety z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit`
|
||||||
|
- NEW - nowy typ pola formularza `color` (HTML5 color picker + pole tekstowe zsynchronizowane)
|
||||||
|
- UPDATE - `front\factory\ShopStatuses` dziala jako fasada do `Domain\ShopStatus\ShopStatusRepository`
|
||||||
|
- UPDATE - menu admin przepiete na kanoniczny URL `/admin/shop_statuses/list/`
|
||||||
|
- CLEANUP - usuniete legacy klasy: `autoload/admin/controls/class.ShopStatuses.php`, `autoload/admin/factory/class.ShopStatuses.php`
|
||||||
|
- UPDATE - reorganizacja dokumentacji technicznej: pliki przeniesione do folderu `docs/` i rozbite na mniejsze pliki tematyczne
|
||||||
|
- UPDATE - testy: `OK (254 tests, 736 assertions)` + nowe pliki testowe `ShopStatusRepositoryTest`, `ShopStatusesControllerTest`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.268.zip`, `ver_0.268_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.267 - 13.02.2026</b><br />
|
||||||
|
- FIX - front: poprawione dobieranie layoutu dla kategorii/produktu/koszyka i innych stron modułowych (fallback do layoutu domyślnego)
|
||||||
|
- FIX - produkt/koszyk: poprawiona obsługa ilości dla kombinacji (stan 0 po dodaniu do koszyka, limit max, odczyt `stock_0_buy`)
|
||||||
|
- FIX - produkt: usunięty błąd JS `TypeError: $(...).visible is not a function` (zamiana na `:visible`)
|
||||||
|
- FIX - SEO redirecty produktów: blokada konfliktów po kopiowaniu URL oraz utwardzone wykrywanie pętli redirectów (`lang_id` + graf przejść)
|
||||||
|
- UPDATE - admin: `input-switch` zapisuje wartość `on` (spójnie z obsługą pól checkbox w formularzach)
|
||||||
|
- CLEANUP - usunięte pliki: `apilo-bck`, `geocode-cache.php`
|
||||||
|
- UPDATE - testy: `OK (235 tests, 682 assertions)`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.267.zip`, `ver_0.267_files.txt`, `ver_0.267_sql.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.266 - 13.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopCoupon` do architektury Domain + DI (`Domain\Coupon\CouponRepository`, `admin\Controllers\ShopCouponController`)
|
||||||
|
- UPDATE - modul `/admin/shop_coupon/*` przepiety z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit`
|
||||||
|
- UPDATE - nowe widoki i partiale: `shop-coupon/coupons-list`, `shop-coupon/coupon-edit-new`, `shop-coupon/coupon-categories-selector`, `shop-coupon/coupon-categories-tree`, `shop-coupon/coupon-edit-custom-script`
|
||||||
|
- UPDATE - zachowana kompatybilnosc aliasow legacy akcji (`view_list`, `coupon_edit`, `coupon_save`, `coupon_delete`) w nowym kontrolerze
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopCoupon.php`, `autoload/admin/factory/class.ShopCoupon.php`, `admin/templates/shop-coupon/view-list.php`, `admin/templates/shop-coupon/coupon-edit.php`
|
||||||
|
- UPDATE - menu admin wskazuje kanoniczny URL `/admin/shop_coupon/list/`
|
||||||
|
- FIX - ujednolicone drzewka (strzalki + focus) i wyglad checkboxow miedzy `/admin/shop_coupon/edit/*` oraz `/admin/layouts/edit/*`
|
||||||
|
- UPDATE - testy: `OK (235 tests, 682 assertions)` + nowe pliki testowe `CouponRepositoryTest`, `ShopCouponControllerTest`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.266.zip`, `ver_0.266_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.265 - 13.02.2026</b><br />
|
||||||
|
- UPDATE - modul `/admin/shop_promotion/*`: dodano pole `Data od` (`date_from`) w repozytorium, formularzu i liscie
|
||||||
|
- UPDATE - front: `shop\Promotion::get_active_promotions()` uwzglednia `date_from` (okno aktywnosci od-do)
|
||||||
|
- FIX - edycja promocji zapisuje aktualizacje rekordu zamiast tworzenia nowego (`id` przekazywane przez hidden field + fallback z URL)
|
||||||
|
- UPDATE - testy: `OK (222 tests, 614 assertions)`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.264 - 13.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ShopPromotion` do architektury Domain + DI (`Domain\Promotion\PromotionRepository`, `admin\Controllers\ShopPromotionController`)
|
||||||
|
- UPDATE - modul `/admin/shop_promotion/*` przepiety z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit`
|
||||||
|
- UPDATE - nowe widoki i partiale: `shop-promotion/promotions-list`, `shop-promotion/promotion-edit`, `shop-promotion/promotion-categories-selector`, `shop-promotion/promotion-categories-tree`, `shop-promotion/promotion-edit-custom-script`
|
||||||
|
- CLEANUP - usuniete legacy klasy/pliki: `autoload/admin/controls/class.ShopPromotion.php`, `autoload/admin/factory/class.ShopPromotion.php`, `admin/templates/shop-promotion/view-list.php`
|
||||||
|
- UPDATE - menu admin wskazuje kanoniczny URL `/admin/shop_promotion/list/`
|
||||||
|
- UPDATE - testy: `OK (222 tests, 609 assertions)` + nowe pliki testowe `PromotionRepositoryTest`, `ShopPromotionControllerTest`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.263 - 13.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `Integrations` do architektury Domain + DI (`Domain\Integrations\IntegrationsRepository`, `admin\Controllers\IntegrationsController`)
|
||||||
|
- CLEANUP - usunieto integracje Sellasist i Baselinker z calego projektu (kontrolery, factory, szablony, referencje w cron/Order/ShopStatuses/ShopTransport/ShopPaymentMethod/ShopProduct)
|
||||||
|
- UPDATE - `admin\factory\Integrations` jako fasada delegujaca do repozytorium (tylko Apilo + ShopPRO)
|
||||||
|
- FIX - naprawione polskie znaki w `product-edit.php` (usuniety podwojny encoding UTF-8/CP1250)
|
||||||
|
- CLEANUP - usuniete pliki: `controls/Integrations`, `controls/Baselinker`, `factory/Baselinker`, `front/factory/Shop`, `shop/ShopStatus`, szablony sellasist/baselinker
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.263.zip`, `ver_0.263_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.262 - 13.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `Pages` do architektury Domain + DI (`Domain\Pages\PagesRepository`, `admin\Controllers\PagesController`)
|
||||||
|
- UPDATE - widoki `/admin/pages/*` przepiete na nowy routing i komponent `components/form-edit` (menu/page edit)
|
||||||
|
- FIX - przywrocony przycisk generowania linku SEO w edycji strony (zakladka SEO, pola jezykowe)
|
||||||
|
- FIX - popup potwierdzenia usuwania menu/strony ujednolicony z `table-list-confirm-dialog` + poprawione polskie znaki
|
||||||
|
- CLEANUP - usuniete legacy pliki Pages: `admin/ajax/pages.php`, `autoload/admin/controls/class.Pages.php`, `autoload/admin/factory/class.Pages.php`, `autoload/admin/view/class.Pages.php`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.262.zip`, `ver_0.262_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.261 - 13.02.2026</b><br />
|
||||||
|
- UPDATE - finalizacja refaktoryzacji modulu `Articles` (`/admin/articles`) w warstwie Domain + DI
|
||||||
|
- UPDATE - nowe akcje AJAX w `admin\Controllers\ArticlesController` (m.in. `files_order_save`)
|
||||||
|
- UPDATE - sortowanie zalacznikow i zdjec w edycji artykulu (drag&drop + zapis kolejnosci przy pierwszym zapisie)
|
||||||
|
- UPDATE - utwardzenie uploadow (wspolny helper `libraries/plupload/upload-common.php`, walidacje i tokeny)
|
||||||
|
- FIX - potwierdzenia usuwania zdjec/zalacznikow ujednolicone z widokiem listy (jquery-confirm)
|
||||||
|
- CLEANUP - usuniete legacy `admin/ajax/articles.php` i `autoload/admin/view/class.Articles.php`
|
||||||
|
- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.261.zip`, `ver_0.261_files.txt`, `ver_0.261_sql.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.260 - 12.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `ArticlesArchive` do architektury Domain + DI (`admin\Controllers\ArticlesArchiveController`)
|
||||||
|
- UPDATE - `Domain\Article\ArticleRepository` rozszerzone o metody `listArchivedForAdmin`, `restore`, `deletePermanently`
|
||||||
|
- UPDATE - widok `/admin/articles_archive/view_list/` przepiety z legacy `grid` na `components/table-list`
|
||||||
|
- UPDATE - routing DI (`admin\Site`) rozszerzony o modul `ArticlesArchive` + mapowanie akcji `article_restore -> restore`
|
||||||
|
- CLEANUP - usuniete legacy klasy `autoload/admin/controls/class.ArticlesArchive.php`, `autoload/admin/factory/class.ArticlesArchive.php`, `autoload/admin/view/class.ArticlesArchive.php`
|
||||||
|
- UPDATE - plik do usuniecia dodany w `updates/0.20/ver_0.260_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.259 - 12.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu `Scontainers` do architektury Domain + DI (`Domain\Scontainers\ScontainersRepository`, `admin\Controllers\ScontainersController`)
|
||||||
|
- UPDATE - widoki `/admin/scontainers/*` przepiete z legacy `grid/gridEdit` na `components/table-list` i `components/form-edit`
|
||||||
|
- UPDATE - routing DI (`admin\Site`) rozszerzony o modul `Scontainers` + mapowanie akcji `container_edit/container_save/container_delete`
|
||||||
|
- UPDATE - `admin\factory\Scontainers` dziala jako fasada do repozytorium (backward compatibility)
|
||||||
|
- UPDATE - `front\factory\Scontainers` korzysta z `Domain\Scontainers\ScontainersRepository`
|
||||||
|
- CLEANUP - usuniete legacy klasy `autoload/admin/controls/class.Scontainers.php`, `autoload/admin/view/class.Scontainers.php`
|
||||||
|
- UPDATE - plik do usuniecia dodany w `updates/0.20/ver_0.259_files.txt`
|
||||||
|
<hr>
|
||||||
|
<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
|
||||||
|
- UPDATE - `Domain\Languages\LanguagesRepository` rozszerzone o wspolna metode `defaultLanguageId()`
|
||||||
|
- UPDATE - `admin\Controllers\ArticlesController` pobiera layouty przez `Domain\Layouts\LayoutsRepository` (DI)
|
||||||
|
- CLEANUP - usuniete legacy klasy `autoload/admin/controls/class.Layouts.php`, `autoload/admin/view/class.Layouts.php`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.255 - 12.02.2026</b><br />
|
||||||
|
- UPDATE - kontrolery admin `Settings`, `Banners`, `Dictionaries`, `Articles` pobieraja liste jezykow przez `Domain\Languages\LanguagesRepository` (DI)
|
||||||
|
- UPDATE - routing DI (`admin\Site`) przekazuje `LanguagesRepository` do kontrolerow `Articles`, `Banners`, `Settings`, `Dictionaries`
|
||||||
|
- UPDATE - aktywne legacy odwolania (`admin\controls`, `admin\factory\Shop*`) przepiete z `admin\factory\Languages` na `LanguagesRepository`
|
||||||
|
- FIX - `autoload/admin/factory/class.Languages.php` uzywa pelnego znacznika PHP (zgodnosc z `short_open_tag=Off`)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.254 - 12.02.2026</b><br />
|
||||||
|
- UPDATE - modul `Languages` w panelu admin przepiety na `Domain\Languages\LanguagesRepository` + `admin\Controllers\LanguagesController`
|
||||||
|
- UPDATE - migracja widokow languages (`languages-list`, `language-edit`, `translations-list`, `translation-edit`) na `components/table-list` i `components/form-edit`
|
||||||
|
- UPDATE - routing DI dla `Languages` w `admin\Site` oraz kompatybilna fasada `admin\factory\Languages` delegujaca do repozytorium
|
||||||
|
- UPDATE - naprawiono zapis edycji jezyka (ID jezyka pobierane z URL przy edycji)
|
||||||
|
- UPDATE - globalne poprawki UX filtrĂłw w `components/table-list` (kompaktowe kolumny `Aktywny`/`Domyslny`, spacing i pelna szerokosc selecta)
|
||||||
|
- CLEANUP - usuniete legacy klasy: `autoload/admin/controls/class.Languages.php`, `autoload/admin/view/class.Languages.php`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.253 - 12.02.2026</b><br />
|
||||||
|
- UPDATE - modul `Users` w panelu admin w pelni przepiety na `Domain\User\UserRepository` + `admin\Controllers\UsersController`
|
||||||
|
- UPDATE - migracja widokow users z `grid/gridEdit` na nowe komponenty (`components/table-list`, `components/form-edit`)
|
||||||
|
- UPDATE - dodana walidacja warunkowa: przy wlaczonym 2FA pole `E-mail do 2FA` jest wymagane
|
||||||
|
- UPDATE - globalne ulepszenia `components/table-list` (kompaktowe filtry select/status i odstepy w formularzu paginacji)
|
||||||
|
- CLEANUP - usuniete legacy klasy users: `autoload/admin/controls/class.Users.php`, `autoload/admin/factory/class.Users.php`, `autoload/admin/view/class.Users.php`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.252 - 10.02.2026</b><br />
|
||||||
|
- UPDATE - migracja listy archiwum produktow do nowego komponentu tabeli (`components/table-list`) z filtrowaniem i paginacja
|
||||||
|
- UPDATE - banery i archiwum produktow: wydzielenie CSS/JS do osobnych widokow `*-custom-script.php`
|
||||||
|
- UPDATE - filemanager przepiety na nowy routing (`admin\Controllers\FilemanagerController`)
|
||||||
|
- FIX - naprawiono blad `Invalid Key` w widoku filemanagera po refaktoryzacji
|
||||||
|
- UPDATE - usunieto legacy klasy i stare szablony (`admin\controls`, `admin\view`, `admin/templates/product_archive`)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.251 - 09.02.2026</b><br />
|
||||||
|
- NEW - migracja modulu Dictionaries do nowej architektury (Domain + admin Controller + DI)
|
||||||
|
- UPDATE - lista i formularz Dictionaries przepiete na nowe komponenty (`components/table-list`, `components/form-edit`)
|
||||||
|
- UPDATE - dodano globalne ograniczenie szerokosci pierwszej kolumny (Lp.) w `components/table-list`
|
||||||
|
- FIX - zapis tlumaczen jednostek obsluguje `lang_id` jako string (`pl`, `en`)
|
||||||
|
- UPDATE - usunieto legacy klasy Dictionaries: `admin\controls`, `admin\factory`, `front\factory`
|
||||||
|
- UPDATE - przepieto uzycia na `Domain\Dictionaries\DictionariesRepository` (`shop-product`, `shop_product` admin)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.250</b><br />
|
||||||
|
- UPDATE - refaktoryzacja Settings: `Domain\Settings\SettingsRepository` ma bezposredni dostep do bazy (bez delegacji do `admin\factory\Settings`)
|
||||||
|
- UPDATE - przepieto pozostale uzycia `admin\factory\Settings` na `Domain\Settings\SettingsRepository` (`admin\controls\Settings`, `admin\controls\Newsletter`, `front\factory\Newsletter`)
|
||||||
|
- UPDATE - DI dla SettingsController: repozytorium otrzymuje `$mdb` w `admin\Site`
|
||||||
|
- UPDATE - Settings: widok edycji przeniesiony na nowy mechanizm formularza (`FormEditViewModel` + `components/form-edit`) jak w banerach
|
||||||
|
- UPDATE - usunieto nieuzywana legacy klase `autoload/admin/factory/class.Settings.php`
|
||||||
|
- UPDATE - usunieto legacy fallback kontrolera `autoload/admin/controls/class.Settings.php`
|
||||||
|
- UPDATE - usunieto nieuzywana klase widoku `autoload/admin/view/class.Settings.php`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.249</b><br />
|
||||||
|
- FIX - banner edit: poprawiono zapisywanie danych jezykowych i synchronizacje CKEditor przed zapisem
|
||||||
|
- FIX - banner edit: naprawiono hash zakladek (usunieto `undefined` w URL)
|
||||||
|
- FIX - filemanager: przywrocono dzialanie popupa wyboru obrazka z banera
|
||||||
|
- UPDATE - komunikaty zapisu w nowym formularzu sa wyswietlane w stylu panelu (bez natywnego alertu JS)
|
||||||
|
- UPDATE - lista banerow: dodano kolumne miniatury oraz podglad duzego obrazka w popup po najechaniu
|
||||||
|
- UPDATE - usunieto nieuzywane legacy klasy banerow: `admin\view\Banners`, `admin\factory\Banners`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.248</b><br />
|
||||||
|
- UPDATE - filtry w nowych tabelach dzialaja automatycznie na `onchange`
|
||||||
|
- UPDATE - `components/table-list`: auto-submit formularza filtrow po zmianie pola (select, date, text)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.247</b><br />
|
||||||
|
- UPDATE - nowy dialog potwierdzenia usuwania w `components/table-list` (zamiast natywnego `confirm`)
|
||||||
|
- UPDATE - popup usuwania: wiekszy rozmiar i centrowanie na srodku ekranu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.246</b><br />
|
||||||
|
- UPDATE - migracja listy banerow do nowego mechanizmu tabeli (`components/table-list`, filtrowanie, sortowanie, paginacja)
|
||||||
|
- UPDATE - `admin\Controllers\BannerController::list()` buduje `PaginatedTableViewModel`
|
||||||
|
- UPDATE - `Domain\Banner\BannerRepository::listForAdmin()` (bezpieczne filtrowanie i sortowanie)
|
||||||
|
- UPDATE - usunieto legacy kontroler `autoload/admin/controls/class.Banners.php`
|
||||||
|
- UPDATE - plik do usuniecia dodany w `updates/0.20/ver_0.246_files.txt`
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.245</b><br />
|
||||||
|
- UPDATE - refaktoryzacja listy artykulow: wspolny komponent `admin/templates/components/table-list.php` + `PaginatedTableViewModel`
|
||||||
|
- NEW - `admin\Support\TableListRequestFactory` (wspolna obsluga filtrow, sortowania i paginacji dla list)
|
||||||
|
- UPDATE - `Domain\Article\ArticleRepository::listForAdmin()` utwardzone pod katem bezpieczenstwa (whitelist sortowania, bind params, limit per_page)
|
||||||
|
- UPDATE - usunieto legacy `browse_list` dla modulu Articles
|
||||||
|
- UPDATE - usuniete pliki legacy sa wyszczegolnione w `updates/0.20/ver_0.245_files.txt`
|
||||||
|
- FIX - generator `.htaccess` i `libraries/htaccess.conf` (QSA dla `/admin/...`, komentarz niedozwolonych dyrektyw `SetHandler/AddHandler/ForceType`)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.244</b><br />
|
||||||
|
- UPDATE - refaktoryzacja: article_save przeniesiony do Domain\Article\ArticleRepository::save() z prywatnymi helperami
|
||||||
|
- UPDATE - refaktoryzacja: article_delete przeniesiony do Domain\Article\ArticleRepository::archive()
|
||||||
|
- UPDATE - ArticlesController: nowe akcje save() i delete() z DI
|
||||||
|
- UPDATE - admin\factory\Articles::article_save() i articles_set_archive() delegują do repozytorium (kompatybilność)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.243</b><br />
|
||||||
|
- UPDATE - refaktoryzacja: cleanup nieprzypisanych plików/zdjęć artykułów przeniesiony do Domain\Article\ArticleRepository
|
||||||
|
- UPDATE - ArticlesController::edit() używa repozytorium do cleanupu, a admin\factory\Articles zachowuje delegowanie (kompatybilność)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.242</b><br />
|
||||||
|
- NEW - refaktoryzacja: Domain\Article\ArticleRepository + migracja article_edit do admin\Controllers\ArticlesController (DI)
|
||||||
|
- UPDATE - admin\factory\Articles::article_details() deleguje do nowego repozytorium (kompatybilność zachowana)
|
||||||
|
- UPDATE - metody przejęte przez nowe kontrolery oznaczone jako @deprecated w legacy kontrolerach admin\controls
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.241</b><br />
|
||||||
|
- NEW - refaktoryzacja: admin\Controllers\ProductArchiveController - archiwum produktĂłw z DI
|
||||||
|
- NEW - ProductRepository::archive(), unarchive() - operacje archiwizacji w repozytorium
|
||||||
|
- FIX - naprawiono SQL w liście archiwum (puste wyszukiwanie filtrowało wszystkie wyniki)
|
||||||
|
- FIX - naprawiono brakujÄ…cy filtr archive = 1 w zapytaniu bez wyszukiwania
|
||||||
|
- UPDATE - wyczyszczono szablony archiwum (usunięto zbędne funkcje: apilo, baselinker, duplikowanie)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.240</b><br />
|
||||||
|
- NEW - refaktoryzacja: Domain\Settings\SettingsRepository + admin\Controllers\SettingsController (architektura Domain-Driven)
|
||||||
|
- NEW - refaktoryzacja: Domain\Cache\CacheRepository - czyszczenie cache z obsługą Redis
|
||||||
|
- FIX - komunikat potwierdzenia zapisu ustawień w panelu administratora
|
||||||
|
- FIX - naprawiono element #content w layoucie admina (powiadomienia grid.js)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.239</b><br />
|
||||||
|
- NEW - refaktoryzacja: Domain\Banner\BannerRepository + admin\Controllers\BannerController (pełna migracja kontrolera)
|
||||||
|
- NEW - refaktoryzacja: Domain\Product\ProductRepository::getPrice(), getName() - migracja kolejnych metod
|
||||||
|
- NEW - router admin z obsługą nowych kontrolerów (fallback na stare)
|
||||||
|
- UPDATE - shop\Product::get_product_price(), get_product_name() używają nowego repozytorium (kompatybilność zachowana)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.238</b><br />
|
||||||
|
- NEW - refaktoryzacja: Domain\Product\ProductRepository - pierwsza klasa w nowej architekturze Domain-Driven
|
||||||
|
- NEW - Dependency Injection zamiast global variables
|
||||||
|
- UPDATE - shop\Product::get_product_quantity() używa teraz nowego repozytorium (kompatybilność zachowana)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.237</b><br />
|
||||||
|
- NEW - automatyczne czyszczenie cache produktu po aktualizacji przez CRON (Sellasist, Apilo, Baselinker)
|
||||||
|
- UPDATE - przycisk "Wyczyść cache" w panelu administratora z obsługą AJAX i komunikatami o postępie
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.236</b><br />
|
||||||
|
- FIX - zabezpieczenie przed duplikatami zamówień w Apilo - automatyczne pobieranie ID zamówienia przy błędzie "idExternal już wykorzystywany"
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.235</b><br />
|
||||||
|
- FIX - poprawka funkcji aktualizacji
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.234</b><br />
|
||||||
|
- NEW - przycisk zaznaczania zamówienia jako wysłane do trustmate.io
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.232</b><br />
|
||||||
|
- NEW - opcje GPSR
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.231</b><br />
|
||||||
|
- FIX - poprawki bezpieczeństwa + dwuetapowa weryfikacja logowania
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.230</b><br />
|
||||||
|
- FIX - poprawki bezpieczeństwa
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.229</b><br />
|
||||||
|
- NEW - pola dodatkowe z opcjÄ… wymagane/niewymagane
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.228</b><br />
|
||||||
|
- NEW - cron do wysyłania zamówień do trustmate.io
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.227</b><br />
|
||||||
|
- NEW - historia kodĂłw rabatowych
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.226</b><br />
|
||||||
|
- NEW - dodanie opcji faktury do zamĂłwienia
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.225</b><br />
|
||||||
|
- NEW - przycisk czyszczenia cache
|
||||||
|
- NEW - ponowne wysyłanie zamówienia do apilo
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.224</b><br />
|
||||||
|
- NEW - sortowanie form dostawy
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.223</b><br />
|
||||||
|
- FIX - integracja z Orlen Paczka
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.222</b><br />
|
||||||
|
- NEW - integracja z Orlen Paczka
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.221</b><br />
|
||||||
|
- NEW - Automatyczne przekierowania adresĂłw URL produktĂłw, zmiany w pliku htaccess
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.220</b><br />
|
||||||
|
- NEW - Dodanie możliwości wyświetlenia na strone ostatnio dodane produkty [PRODUKTY_NEW] lub [PRODUKTY_NEW:10].
|
||||||
|
- NEW - Dodanie możliwości wyświetlenia na strone popularnych produktów [PRODUKTY_TOP] lub [PRODUKTY_TOP:10].
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.219</b><br />
|
||||||
|
- NEW - Dodanie możliwości zmiany daty w artykułach
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.218</b><br />
|
||||||
|
- NEW - indywidualny kod GTM
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.217</b><br />
|
||||||
|
- NEW - zwiększenie obsługi REDIS
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.216</b><br />
|
||||||
|
- NEW - aktualizacja api i cron (apilo)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.215</b><br />
|
||||||
|
- FIX - generowanie pliku .htaccess
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.214</b><br />
|
||||||
|
- NEW - dodanie API
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.213</b><br />
|
||||||
|
- FIX - wyliczenie darmowej dostawy
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.212</b><br />
|
||||||
|
- NEW - zmiany w zapisywaniu zamĂłwienia do apilo
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.211</b><br />
|
||||||
|
- NEW - Debugowanie apilo + wyświetlanie podkategorii
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.210</b><br />
|
||||||
|
- NEW - dodatkowe pola w widoku produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.209</b><br />
|
||||||
|
- NEW - zmiany w widoku produktĂłw (panel administratora)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.208</b><br />
|
||||||
|
- NEW - zmiany w wyszukiwarce produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.204-0.207</b><br />
|
||||||
|
- NEW - htaccess update
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.204-0.206</b><br />
|
||||||
|
- NEW - wysyłanie produktów do apilo
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.203</b><br />
|
||||||
|
- NEW - zmiana sposobu wyliczania cen produkty z dodatkami
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.202</b><br />
|
||||||
|
- NEW - dodano "główne zdjęcie" w edycji artykułu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.201</b><br />
|
||||||
|
- FIX - aktualizacja statusĂłw na podstawie baselinkera
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.200</b><br />
|
||||||
|
- NEW - wysyłanie produktów do baselinker
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.199</b><br />
|
||||||
|
- NEW - usprawnienie edycji danych do XML
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.198</b><br />
|
||||||
|
- NEW - automatyczne generowanie kodĂłw SKU
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.197</b><br />
|
||||||
|
- FIX - poprawki w Dashboard
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.196</b><br />
|
||||||
|
- FIX - integracja z apilo.com
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.195</b><br />
|
||||||
|
- FIX - aktualizacja statusĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.194</b><br />
|
||||||
|
- UPDATE - integracja apilo
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.193</b><br />
|
||||||
|
- UPDATE - aktualizacja synchronizacji z baselinker
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.192</b><br />
|
||||||
|
- NEW - pobieranie statusĂłw z sellasist
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.191</b><br />
|
||||||
|
- NEW - integracja z selasist
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.190</b><br />
|
||||||
|
- FIX - produkty powiÄ…zane
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.189</b><br />
|
||||||
|
- FIX - ceny promocyjne produktĂłw z dodatkiem
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.188</b><br />
|
||||||
|
- NEW - widok listy produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.187</b><br />
|
||||||
|
- FIX - pobieranie cen z APILO
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.186</b><br />
|
||||||
|
- FIX - dodawanie do koszyka tych samych produktów ale z różną personalizacją
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.185</b><br />
|
||||||
|
- FIX - masowa edycja produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.184</b><br />
|
||||||
|
- NEW - druga część integracji z apilo, masowa edycja produktów
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.183</b><br />
|
||||||
|
- NEW - pierwsza część integracji z apilo
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.182</b><br />
|
||||||
|
- FIX - layout
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.181</b><br />
|
||||||
|
- NEW - infinitescroll - opcja włączy/wyłącz
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.180</b><br />
|
||||||
|
- NEW - aktualizacja dashboard
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.179</b><br />
|
||||||
|
- NEW - obsługa EAN
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.177, 0.178</b><br />
|
||||||
|
- FIX - custom_label
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.176</b><br />
|
||||||
|
- NEW - custom_label
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.175</b><br />
|
||||||
|
- NEW - nowe statystyki
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.174</b><br />
|
||||||
|
- FIX - generowanie xml
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.173</b><br />
|
||||||
|
- NEW - duplikowanie produktu wraz z kombinacjami
|
||||||
|
- NEW - dodanie przechodzenia pomiędzy zamówienia (poprzednie/następne zamówienie)
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.172</b><br />
|
||||||
|
- FIX - poprawki w Cache
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.171</b><br />
|
||||||
|
- FIX - poprawki w Cache
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.170</b><br />
|
||||||
|
- NEW - usuwanie cache produktu przy zapisie
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.169</b><br />
|
||||||
|
- FIX - poprawki w liście produktów
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.168</b><br />
|
||||||
|
- NEW - archiwum produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.167</b><br />
|
||||||
|
- NEW - dodanie obsługi cen i stanów magazynowych kombinacji produktów
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.166</b><br />
|
||||||
|
- NEW - współpraca z GTM
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.164/5</b><br />
|
||||||
|
- FIX - ukrywanie produktĂłw nieaktywnych
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.163</b><br />
|
||||||
|
- NEW - automatyczne podpowiadanie produktów do zestawu na podstawie wcześniejszych zakupów klientów
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.162</b><br />
|
||||||
|
- NEW - GA4
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.161</b><br />
|
||||||
|
- UPDATE - aktualizacja menu administratora
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.160</b><br />
|
||||||
|
- UPDATE - aktualizacja cron Baselinker
|
||||||
|
- NEW - waga i cena jednostkowa produktu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.159</b><br />
|
||||||
|
- FIX - cron Baselinker
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.158</b><br />
|
||||||
|
- UPDATE - poprawa kolorystyki przyciskĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.157</b><br />
|
||||||
|
- NEW - szybka zmiana statusu produktu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.156</b><br />
|
||||||
|
- NEW - dodanie szybkiej edycji google xml label
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.155</b><br />
|
||||||
|
- NEW - infinite scroll w widoku kategorii
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.154</b><br />
|
||||||
|
- FIX - atrybuty produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.153</b><br />
|
||||||
|
- FIX - atrybuty produktĂłw
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.152</b><br />
|
||||||
|
- FIX - tematy maili
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.151</b><br />
|
||||||
|
- FIX - tematy maili
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.150</b><br />
|
||||||
|
- NEW - domyślna forma transportu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.149</b><br />
|
||||||
|
- NEW - tematy maili
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.148</b><br />
|
||||||
|
- FIX - cron-xml
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.147</b><br />
|
||||||
|
- FIX - cron-xml
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.146</b><br />
|
||||||
|
- NEW - cron-xml
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.145</b><br />
|
||||||
|
- NEW - omnibus ready
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.144</b><br />
|
||||||
|
- FIX - usunięcie adresu marianek.pl z kodu
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.143</b><br />
|
||||||
|
- FIX - poprawa generowania plikĂłw WEBP
|
||||||
|
<hr>
|
||||||
|
<b>ver. 0.142</b><br />
|
||||||
|
- FIX - poprawa adresu strony głównej
|
||||||
|
<hr>
|
||||||
@@ -1,96 +1,52 @@
|
|||||||
<b>ver. 0.314 - 23.02.2026</b><br />
|
|
||||||
FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamówienia
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.313 - 23.02.2026</b><br />
|
|
||||||
FIX - sync płatności Apilo (int cast na apilo_order_id PPxxxxxx dawał 0) + logowanie decyzji sync do pp_log
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.312 - 23.02.2026</b><br />
|
|
||||||
FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskończona pętla wysyłki, ceny 0.00 PLN, walidacja cen
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.311 - 23.02.2026</b><br />
|
|
||||||
FIX - race condition callback płatności Apilo, persistence filtrów tabel admin, poprawki cen zamówień
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.310 - 23.02.2026</b><br />
|
|
||||||
NEW - Zakladka Logi w sekcji Integracje (podglad pp_log z paginacja, sortowaniem, filtrami)
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.309 - 23.02.2026</b><br />
|
|
||||||
NEW - ApiloLogger (logowanie operacji Apilo do pp_log), cache-busting CSS/JS w admin panelu, poprawki UI listy produktow, clipboard API
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.308 - 22.02.2026</b><br />
|
|
||||||
NEW - kolorowe badge statusow zamowien, walidacja hex, sanityzacja HTML transport, optymalizacja SQL
|
|
||||||
<hr>
|
|
||||||
<b>ver. 0.308 - 22.02.2026</b><br />
|
|
||||||
NEW - kolorowe badge statusow zamowien, walidacja hex, sanityzacja HTML transport, optymalizacja SQL
|
|
||||||
<hr>
|
|
||||||
<?php
|
<?php
|
||||||
// Auto-generated changelog from manifest files + legacy entries.
|
header( 'Content-Type: text/html; charset=utf-8' );
|
||||||
// Scans manifest JSON files, merges with changelog-legacy.json, sorts descending, outputs HTML.
|
|
||||||
|
|
||||||
|
$dataFile = __DIR__ . '/changelog-data.html';
|
||||||
|
if ( !file_exists( $dataFile ) ) {
|
||||||
|
echo '';
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$html = file_get_contents( $dataFile );
|
||||||
|
if ( $html === false ) {
|
||||||
|
echo '';
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse entries by splitting on <hr> tags
|
||||||
|
$blocks = preg_split( '/<hr\s*\/?>/', $html );
|
||||||
$entries = [];
|
$entries = [];
|
||||||
|
|
||||||
// 1. Scan manifest files
|
foreach ( $blocks as $block ) {
|
||||||
$manifests = glob( __DIR__ . '/0.*/ver_*_manifest.json' );
|
$block = trim( $block );
|
||||||
if ( $manifests ) {
|
if ( empty( $block ) ) {
|
||||||
foreach ( $manifests as $file ) {
|
continue;
|
||||||
$json = @file_get_contents( $file );
|
}
|
||||||
if ( !$json ) continue;
|
// Extract version number from <b>ver. X.XXX
|
||||||
// Strip UTF-8 BOM if present
|
if ( preg_match( '/<b>ver\.\s*([\d.]+)/', $block, $m ) ) {
|
||||||
if ( substr( $json, 0, 3 ) === "\xEF\xBB\xBF" ) {
|
|
||||||
$json = substr( $json, 3 );
|
|
||||||
}
|
|
||||||
$data = @json_decode( $json, true );
|
|
||||||
if ( !$data || empty( $data['version'] ) || empty( $data['changelog'] ) ) continue;
|
|
||||||
|
|
||||||
$date = isset( $data['date'] ) ? $data['date'] : '';
|
|
||||||
// Convert YYYY-MM-DD to DD.MM.YYYY
|
|
||||||
if ( $date && preg_match( '/^(\d{4})-(\d{2})-(\d{2})$/', $date, $m ) ) {
|
|
||||||
$date = $m[3] . '.' . $m[2] . '.' . $m[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
$entries[] = [
|
$entries[] = [
|
||||||
'version' => (float) $data['version'],
|
'version_int' => (int) round( (float) $m[1] * 1000 ),
|
||||||
'ver_str' => $data['version'],
|
'html' => $block,
|
||||||
'date' => $date,
|
|
||||||
'text' => $data['changelog'],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Load legacy entries
|
// If ?ver= parameter is provided, show only 5 versions back from that version
|
||||||
$legacyFile = __DIR__ . '/changelog-legacy.json';
|
$ver = isset( $_GET['ver'] ) ? (int) round( (float) $_GET['ver'] * 1000 ) : 0;
|
||||||
if ( file_exists( $legacyFile ) ) {
|
|
||||||
$legacyJson = @file_get_contents( $legacyFile );
|
if ( $ver > 0 ) {
|
||||||
if ( $legacyJson ) {
|
$lowerBound = $ver - 5;
|
||||||
$legacy = @json_decode( $legacyJson, true );
|
|
||||||
if ( is_array( $legacy ) ) {
|
$filtered = [];
|
||||||
foreach ( $legacy as $item ) {
|
foreach ( $entries as $entry ) {
|
||||||
if ( empty( $item['version'] ) ) continue;
|
if ( $entry['version_int'] > $lowerBound ) {
|
||||||
$entries[] = [
|
$filtered[] = $entry;
|
||||||
'version' => (float) $item['version'],
|
|
||||||
'ver_str' => $item['version'],
|
|
||||||
'date' => isset( $item['date'] ) ? $item['date'] : '',
|
|
||||||
'text' => isset( $item['text'] ) ? $item['text'] : '',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$entries = $filtered;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Sort descending by version
|
// Output
|
||||||
usort( $entries, function ( $a, $b ) {
|
|
||||||
if ( $a['version'] == $b['version'] ) return 0;
|
|
||||||
return ( $a['version'] > $b['version'] ) ? -1 : 1;
|
|
||||||
} );
|
|
||||||
|
|
||||||
// 4. Output HTML
|
|
||||||
foreach ( $entries as $entry ) {
|
foreach ( $entries as $entry ) {
|
||||||
$header = 'ver. ' . htmlspecialchars( $entry['ver_str'] );
|
echo $entry['html'] . "\n<hr>\n";
|
||||||
if ( $entry['date'] ) {
|
|
||||||
$header .= ' - ' . htmlspecialchars( $entry['date'] );
|
|
||||||
}
|
|
||||||
$text = nl2br( htmlspecialchars( $entry['text'] ) );
|
|
||||||
|
|
||||||
echo '<b>' . $header . '</b><br />' . "\n";
|
|
||||||
echo $text . "\n";
|
|
||||||
echo '<hr>' . "\n";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?
|
<?
|
||||||
$current_ver = 315;
|
$current_ver = 325;
|
||||||
|
|
||||||
for ($i = 1; $i <= $current_ver; $i++)
|
for ($i = 1; $i <= $current_ver; $i++)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user