From 818cd7f2c06f2ab7da00ddab02e3311d53f096e7 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Sat, 14 Feb 2026 15:22:02 +0100 Subject: [PATCH] ver. 0.269: ShopPaymentMethod refactor + Apilo keepalive --- .../templates/integrations/apilo-settings.php | 130 ++++--- .../payment-method-edit.php | 1 + .../payment-methods-list.php | 1 + .../shop-payment-method/view-list.php | 65 ---- admin/templates/site/main-layout.php | 2 +- .../Integrations/IntegrationsRepository.php | 333 ++++++++++++++++- .../PaymentMethod/PaymentMethodRepository.php | 309 ++++++++++++++++ .../Controllers/IntegrationsController.php | 118 +++--- .../ShopPaymentMethodController.php | 290 +++++++++++++++ autoload/admin/class.Site.php | 7 + .../controls/class.ShopPaymentMethod.php | 11 - .../admin/controls/class.ShopTransport.php | 5 +- autoload/admin/factory/class.Integrations.php | 7 +- .../admin/factory/class.ShopPaymentMethod.php | 10 - .../admin/view/class.ShopPaymentMethod.php | 6 - .../front/factory/class.ShopPaymentMethod.php | 68 ++-- autoload/shop/class.PaymentMethod.php | 19 +- cron.php | 8 +- docs/CHANGELOG.md | 17 + docs/DATABASE_STRUCTURE.md | 16 + docs/PROJECT_STRUCTURE.md | 10 + docs/REFACTORING_PLAN.md | 13 +- docs/SHOP_PAYMENT_METHOD_REFACTOR_PLAN.md | 138 +++++++ docs/TESTING.md | 6 +- .../IntegrationsRepositoryTest.php | 101 +++++- .../PaymentMethodRepositoryTest.php | 337 ++++++++++++++++++ .../ShopPaymentMethodControllerTest.php | 57 +++ updates/0.20/ver_0.269.zip | Bin 0 -> 30115 bytes updates/0.20/ver_0.269_files.txt | 4 + updates/changelog.php | 10 +- updates/versions.php | 2 +- 31 files changed, 1832 insertions(+), 269 deletions(-) create mode 100644 admin/templates/shop-payment-method/payment-method-edit.php create mode 100644 admin/templates/shop-payment-method/payment-methods-list.php delete mode 100644 admin/templates/shop-payment-method/view-list.php create mode 100644 autoload/Domain/PaymentMethod/PaymentMethodRepository.php create mode 100644 autoload/admin/Controllers/ShopPaymentMethodController.php delete mode 100644 autoload/admin/controls/class.ShopPaymentMethod.php delete mode 100644 autoload/admin/factory/class.ShopPaymentMethod.php delete mode 100644 autoload/admin/view/class.ShopPaymentMethod.php create mode 100644 docs/SHOP_PAYMENT_METHOD_REFACTOR_PLAN.md create mode 100644 tests/Unit/Domain/PaymentMethod/PaymentMethodRepositoryTest.php create mode 100644 tests/Unit/admin/Controllers/ShopPaymentMethodControllerTest.php create mode 100644 updates/0.20/ver_0.269.zip create mode 100644 updates/0.20/ver_0.269_files.txt diff --git a/admin/templates/integrations/apilo-settings.php b/admin/templates/integrations/apilo-settings.php index e25d05f..e87ff8c 100644 --- a/admin/templates/integrations/apilo-settings.php +++ b/admin/templates/integrations/apilo-settings.php @@ -1,19 +1,43 @@ + settings ) ? $this -> settings : []; + +$apilo_status = is_array( $this -> apilo_status ) ? $this -> apilo_status : [ + 'is_valid' => false, + 'severity' => 'warning', + 'message' => 'Brak statusu integracji.', +]; + +$status_class = 'alert-warning'; +if ( isset( $apilo_status['severity'] ) && $apilo_status['severity'] == 'success' ) $status_class = 'alert-success'; +if ( isset( $apilo_status['severity'] ) && $apilo_status['severity'] == 'danger' ) $status_class = 'alert-danger'; + +$status_message = trim( (string)($apilo_status['message'] ?? '') ); +if ( $status_message == '' ) $status_message = 'Brak szczegolow statusu integracji.'; + +$platform_list_raw = isset( $settings['platform-list'] ) ? $settings['platform-list'] : ''; +$platform_list = @unserialize( $platform_list_raw ); +if ( !is_array( $platform_list ) ) $platform_list = []; +?>
Ustawienia apilo.com
+
+ Status integracji Apilo: +
+
- +
@@ -22,15 +46,16 @@
+
- +
@@ -39,15 +64,16 @@
+
- +
@@ -56,12 +82,13 @@
+
- +
- + @@ -69,18 +96,20 @@
+
- settings['platform-list'] ); - ?> @@ -90,12 +119,13 @@
+
- + @@ -103,12 +133,13 @@
+
- + @@ -116,12 +147,13 @@
+
- + @@ -129,86 +161,89 @@
+
- settings['access-token'] ):?>readonly> - settings['access-token'] ):?> - - - - + + + +
- settings['access-token'] ):?> + +
- +
- settings['access-token-expire-at'] ):?> + +
- +
- settings['refresh-token'] ):?> + +
- +
- settings['refresh-token-expire-at'] ):?> + +
- +
+
- settings['access-token'] ):?> - Autoryzuj się w apilo.com - - Pobierz listę metod płatności - Pobierz listę kont przewoźników - Pobierz statusy zamówień - Pobierz listę platform - + Ponow autoryzacje w apilo.comAutoryzuj sie w apilo.com + Pobierz liste metod platnosci + Pobierz liste kont przewoznikow + Pobierz statusy zamowien + Pobierz liste platform
+ \ No newline at end of file + diff --git a/admin/templates/shop-payment-method/payment-method-edit.php b/admin/templates/shop-payment-method/payment-method-edit.php new file mode 100644 index 0000000..5fe1611 --- /dev/null +++ b/admin/templates/shop-payment-method/payment-method-edit.php @@ -0,0 +1 @@ + $this->form]); ?> diff --git a/admin/templates/shop-payment-method/payment-methods-list.php b/admin/templates/shop-payment-method/payment-methods-list.php new file mode 100644 index 0000000..0f89c5b --- /dev/null +++ b/admin/templates/shop-payment-method/payment-methods-list.php @@ -0,0 +1 @@ + $this->viewModel]); ?> diff --git a/admin/templates/shop-payment-method/view-list.php b/admin/templates/shop-payment-method/view-list.php deleted file mode 100644 index 4459e14..0000000 --- a/admin/templates/shop-payment-method/view-list.php +++ /dev/null @@ -1,65 +0,0 @@ - apilo_payment_types_list as $payment_type ) -{ - if ( isset( $payment_type['name'] ) && isset( $payment_type['id'] ) ) - $payment_types[ $payment_type['id'] ] = $payment_type['name']; -} - -$grid = new \grid( 'pp_shop_payment_methods' ); -$grid -> gdb_opt = $gdb; -$grid -> debug = true; -$grid -> order = [ 'column' => 'id', 'type' => 'ASC' ]; -$grid -> search = [ - [ 'name' => 'Nazwa', 'db' => 'name', 'type' => 'text' ], - [ 'name' => 'Aktywny', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => [ 0 => 'nie', 1 => 'tak' ] ] ] - ]; -$grid -> columns_view = [ - [ - 'name' => 'Lp.', - 'th' => [ 'class' => 'g-lp' ], - 'td' => [ 'class' => 'g-center' ], - 'autoincrement' => true - ], [ - 'name' => 'Nazwa', - 'db' => 'name' - ], [ - 'name' => 'Aktywny', - 'db' => 'status', - 'replace' => [ 'array' => [ 0 => 'nie', 1 => 'tak' ] ], - 'td' => [ 'class' => 'g-center' ], - 'th' => [ 'class' => 'g-center', 'style' => 'width: 150px;' ] - ], [ - 'name' => 'Typ płatności Apilo', - 'db' => 'apilo_payment_type_id', - 'replace' => [ 'array' => $payment_types ], - 'td' => [ 'class' => 'g-center' ], - 'th' => [ 'class' => 'g-center', 'style' => 'width: 150px;' ] - ] - ]; - -$grid -> columns_edit = [ - [ - 'name' => 'Nazwa', - 'db' => 'name', - 'type' => 'text', - 'readonly-edit' => true - ], [ - 'name' => 'Opis', - 'db' => 'description', - 'type' => 'textarea' - ], [ - 'db' => 'apilo_payment_type_id', - 'type' => 'select', - 'name' => 'Typ płatności Apilo', - 'replace' => [ 'array' => $payment_types ], - ], [ - 'name' => 'Aktywny', - 'db' => 'status', - 'type' => 'select', - 'default_value' => 1, - 'replace' => [ 'array' => [ 0 => 'nie', 1 => 'tak' ] ] - ] - ]; -$grid -> actions = [ 'edit' => true ]; -echo $grid -> draw(); \ No newline at end of file diff --git a/admin/templates/site/main-layout.php b/admin/templates/site/main-layout.php index d2aa5bb..7a8bf07 100644 --- a/admin/templates/site/main-layout.php +++ b/admin/templates/site/main-layout.php @@ -71,7 +71,7 @@
  • Cechy produktów
  • Rodzaje transportu
    • -
  • Metody płatności
    • +
  • Metody płatności
  • Statusy zamówień
    • diff --git a/autoload/Domain/Integrations/IntegrationsRepository.php b/autoload/Domain/Integrations/IntegrationsRepository.php index 9a70801..0204a6d 100644 --- a/autoload/Domain/Integrations/IntegrationsRepository.php +++ b/autoload/Domain/Integrations/IntegrationsRepository.php @@ -110,20 +110,83 @@ class IntegrationsRepository return true; } - public function apiloGetAccessToken(): ?string + public function apiloGetAccessToken( int $refreshLeadSeconds = 300 ): ?string { $settings = $this->getSettings( 'apilo' ); - if ( empty( $settings['access-token-expire-at'] ) || empty( $settings['access-token'] ) ) + $hasRefreshCredentials = !empty( $settings['refresh-token'] ) + && !empty( $settings['client-id'] ) + && !empty( $settings['client-secret'] ); + + $accessToken = trim( (string)($settings['access-token'] ?? '') ); + $accessTokenExpireAt = trim( (string)($settings['access-token-expire-at'] ?? '') ); + + if ( $accessToken !== '' && $accessTokenExpireAt !== '' ) { + if ( !$this->shouldRefreshAccessToken( $accessTokenExpireAt, $refreshLeadSeconds ) ) { + return $accessToken; + } + } + + if ( !$hasRefreshCredentials ) { return null; + } - $expireAt = new \DateTime( $settings['access-token-expire-at'] ); - $now = new \DateTime( date( 'Y-m-d H:i:s' ) ); + if ( + !empty( $settings['refresh-token-expire-at'] ) && + !$this->isFutureDate( (string)$settings['refresh-token-expire-at'] ) + ) { + return null; + } - if ( $expireAt >= $now ) - return $settings['access-token']; + return $this->refreshApiloAccessToken( $settings ); + } - // Token expired - refresh + /** + * Keepalive tokenu Apilo do uzycia w CRON. + * Odswieza token, gdy wygasa lub jest bliski wygasniecia. + * + * @return array{success:bool,skipped:bool,message:string} + */ + public function apiloKeepalive( int $refreshLeadSeconds = 300 ): array + { + $settings = $this->getSettings( 'apilo' ); + + if ( (int)($settings['enabled'] ?? 0) !== 1 ) { + return [ + 'success' => false, + 'skipped' => true, + 'message' => 'Apilo disabled.', + ]; + } + + if ( empty( $settings['client-id'] ) || empty( $settings['client-secret'] ) ) { + return [ + 'success' => false, + 'skipped' => true, + 'message' => 'Missing Apilo credentials.', + ]; + } + + $token = $this->apiloGetAccessToken( $refreshLeadSeconds ); + if ( !$token ) { + return [ + 'success' => false, + 'skipped' => false, + 'message' => 'Unable to refresh Apilo token.', + ]; + } + + $this->saveSetting( 'apilo', 'token-keepalive-at', date( 'Y-m-d H:i:s' ) ); + + return [ + 'success' => true, + 'skipped' => false, + 'message' => 'Apilo token keepalive OK.', + ]; + } + + private function refreshApiloAccessToken( array $settings ): ?string + { $postData = [ 'grantType' => 'refresh_token', 'token' => $settings['refresh-token'], @@ -147,17 +210,102 @@ class IntegrationsRepository curl_close( $ch ); $response = json_decode( $response, true ); - if ( empty( $response['accessToken'] ) ) + if ( empty( $response['accessToken'] ) ) { return null; + } $this->saveSetting( 'apilo', 'access-token', $response['accessToken'] ); - $this->saveSetting( 'apilo', 'refresh-token', $response['refreshToken'] ); - $this->saveSetting( 'apilo', 'access-token-expire-at', $response['accessTokenExpireAt'] ); - $this->saveSetting( 'apilo', 'refresh-token-expire-at', $response['refreshTokenExpireAt'] ); + $this->saveSetting( 'apilo', 'refresh-token', $response['refreshToken'] ?? ( $settings['refresh-token'] ?? '' ) ); + $this->saveSetting( 'apilo', 'access-token-expire-at', $response['accessTokenExpireAt'] ?? null ); + $this->saveSetting( 'apilo', 'refresh-token-expire-at', $response['refreshTokenExpireAt'] ?? null ); return $response['accessToken']; } + private function shouldRefreshAccessToken( string $expiresAtRaw, int $leadSeconds = 300 ): bool + { + try { + $expiresAt = new \DateTime( $expiresAtRaw ); + } catch ( \Exception $e ) { + return true; + } + + $threshold = new \DateTime( date( 'Y-m-d H:i:s', time() + max( 0, $leadSeconds ) ) ); + return $expiresAt <= $threshold; + } + + private function isFutureDate( string $dateRaw ): bool + { + try { + $date = new \DateTime( $dateRaw ); + } catch ( \Exception $e ) { + return false; + } + + return $date > new \DateTime( date( 'Y-m-d H:i:s' ) ); + } + + /** + * Sprawdza aktualny stan integracji Apilo i zwraca komunikat dla UI. + * + * @return array{is_valid:bool,severity:string,message:string} + */ + public function apiloIntegrationStatus(): array + { + $settings = $this->getSettings( 'apilo' ); + + $missing = []; + foreach ( [ 'client-id', 'client-secret' ] as $field ) { + if ( trim( (string)($settings[$field] ?? '') ) === '' ) + $missing[] = $field; + } + + if ( !empty( $missing ) ) { + return [ + 'is_valid' => false, + 'severity' => 'danger', + 'message' => 'Brakuje konfiguracji Apilo: ' . implode( ', ', $missing ) . '.', + ]; + } + + $accessToken = trim( (string)($settings['access-token'] ?? '') ); + $authorizationCode = trim( (string)($settings['authorization-code'] ?? '') ); + + if ( $accessToken === '' ) { + if ( $authorizationCode === '' ) { + return [ + 'is_valid' => false, + 'severity' => 'warning', + 'message' => 'Brak authorization-code i access-token. Wpisz kod autoryzacji i uruchom autoryzacje.', + ]; + } + + return [ + 'is_valid' => false, + 'severity' => 'warning', + 'message' => 'Brak access-token. Uruchom autoryzacje Apilo.', + ]; + } + + $token = $this->apiloGetAccessToken(); + if ( !$token ) { + return [ + 'is_valid' => false, + 'severity' => 'danger', + 'message' => 'Token Apilo jest niewazny lub wygasl i nie udal sie refresh. Wykonaj ponowna autoryzacje.', + ]; + } + + $expiresAt = trim( (string)($settings['access-token-expire-at'] ?? '') ); + $suffix = $expiresAt !== '' ? ( ' Token wazny do: ' . $expiresAt . '.' ) : ''; + + return [ + 'is_valid' => true, + 'severity' => 'success', + 'message' => 'Integracja Apilo jest aktywna.' . $suffix, + ]; + } + // ── Apilo API fetch lists ─────────────────────────────────── private const APILO_ENDPOINTS = [ @@ -179,13 +327,45 @@ class IntegrationsRepository * @param string $type platform|status|carrier|payment */ public function apiloFetchList( string $type ): bool + { + $result = $this->apiloFetchListResult( $type ); + return !empty( $result['success'] ); + } + + /** + * Fetch list from Apilo API and return detailed status for UI. + * + * @param string $type platform|status|carrier|payment + * @return array{success:bool,count:int,message:string} + */ + public function apiloFetchListResult( string $type ): array { if ( !isset( self::APILO_ENDPOINTS[$type] ) ) throw new \InvalidArgumentException( "Unknown apilo list type: $type" ); + $settings = $this->getSettings( 'apilo' ); + $missingFields = []; + foreach ( [ 'client-id', 'client-secret' ] as $requiredField ) { + if ( trim( (string)($settings[$requiredField] ?? '') ) === '' ) + $missingFields[] = $requiredField; + } + + if ( !empty( $missingFields ) ) { + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Brakuje konfiguracji Apilo: ' . implode( ', ', $missingFields ) . '. Uzupelnij pola i zapisz ustawienia.', + ]; + } + $accessToken = $this->apiloGetAccessToken(); - if ( !$accessToken ) - return false; + if ( !$accessToken ) { + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Brak aktywnego tokenu Apilo. Wykonaj autoryzacje Apilo i sprobuj ponownie.', + ]; + } $ch = curl_init( self::APILO_ENDPOINTS[$type] ); curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true ); @@ -196,19 +376,140 @@ class IntegrationsRepository $response = curl_exec( $ch ); if ( curl_errno( $ch ) ) { + $error = curl_error( $ch ); curl_close( $ch ); - return false; + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Blad polaczenia z Apilo: ' . $error . '. Sprawdz polaczenie serwera i sprobuj ponownie.', + ]; } + $httpCode = (int) curl_getinfo( $ch, CURLINFO_HTTP_CODE ); curl_close( $ch ); $data = json_decode( $response, true ); - if ( !$data ) + if ( !is_array( $data ) ) { + $responsePreview = substr( trim( (string)$response ), 0, 180 ); + if ( $responsePreview === '' ) + $responsePreview = '[pusta odpowiedz]'; + + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Apilo zwrocilo niepoprawny format odpowiedzi (HTTP ' . $httpCode . '). Odpowiedz: ' . $responsePreview, + ]; + } + + if ( $httpCode >= 400 ) { + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Apilo zwrocilo blad HTTP ' . $httpCode . ': ' . $this->extractApiloErrorMessage( $data ), + ]; + } + + $normalizedList = $this->normalizeApiloMapList( $data ); + if ( $normalizedList === null ) { + return [ + 'success' => false, + 'count' => 0, + 'message' => 'Apilo zwrocilo dane w nieoczekiwanym formacie. Odswiez token i sproboj ponownie.', + ]; + } + + $this->saveSetting( 'apilo', self::APILO_SETTINGS_KEYS[$type], $normalizedList ); + return [ + 'success' => true, + 'count' => count( $normalizedList ), + 'message' => 'OK', + ]; + } + + /** + * Normalizuje odpowiedz API mapowania do listy rekordow ['id' => ..., 'name' => ...]. + * Zwraca null dla payloadu bledow lub nieoczekiwanego formatu. + * + * @return array|null + */ + private function normalizeApiloMapList( array $data ): ?array + { + if ( isset( $data['message'] ) && isset( $data['code'] ) ) + return null; + + if ( $this->isMapListShape( $data ) ) + return $data; + + if ( isset( $data['items'] ) && is_array( $data['items'] ) && $this->isMapListShape( $data['items'] ) ) + return $data['items']; + + if ( isset( $data['data'] ) && is_array( $data['data'] ) && $this->isMapListShape( $data['data'] ) ) + return $data['data']; + + // Dopuszczamy rowniez format asocjacyjny: [id => name, ...], ale tylko dla kluczy liczbowych. + if ( !empty( $data ) ) { + $normalized = []; + foreach ( $data as $key => $value ) { + if ( !( is_int( $key ) || ( is_string( $key ) && preg_match('/^-?\d+$/', $key) === 1 ) ) ) + return null; + + if ( !is_scalar( $value ) ) + return null; + + $normalized[] = [ + 'id' => $key, + 'name' => (string) $value, + ]; + } + + return !empty( $normalized ) ? $normalized : null; + } + + return null; + } + + private function isMapListShape( array $list ): bool + { + if ( empty( $list ) ) return false; - $this->saveSetting( 'apilo', self::APILO_SETTINGS_KEYS[$type], $data ); + foreach ( $list as $row ) { + if ( !is_array( $row ) || !array_key_exists( 'id', $row ) || !array_key_exists( 'name', $row ) ) + return false; + } + return true; } + private function extractApiloErrorMessage( array $data ): string + { + foreach ( [ 'message', 'error', 'detail', 'title' ] as $key ) { + if ( isset( $data[$key] ) && is_scalar( $data[$key] ) ) { + $message = trim( (string)$data[$key] ); + if ( $message !== '' ) + return $message; + } + } + + if ( isset( $data['errors'] ) ) { + if ( is_array( $data['errors'] ) ) { + $flat = []; + foreach ( $data['errors'] as $errorItem ) { + if ( is_scalar( $errorItem ) ) + $flat[] = (string)$errorItem; + elseif ( is_array( $errorItem ) ) + $flat[] = json_encode( $errorItem, JSON_UNESCAPED_UNICODE ); + } + + if ( !empty( $flat ) ) + return implode( '; ', $flat ); + } elseif ( is_scalar( $data['errors'] ) ) { + return (string)$data['errors']; + } + } + + return 'Nieznany blad odpowiedzi API.'; + } + // ── Apilo product operations ──────────────────────────────── public function getProductSku( int $productId ): ?string diff --git a/autoload/Domain/PaymentMethod/PaymentMethodRepository.php b/autoload/Domain/PaymentMethod/PaymentMethodRepository.php new file mode 100644 index 0000000..eaaf7ae --- /dev/null +++ b/autoload/Domain/PaymentMethod/PaymentMethodRepository.php @@ -0,0 +1,309 @@ +db = $db; + } + + /** + * @return array{items: array>, total: int} + */ + public function listForAdmin( + array $filters, + string $sortColumn = 'name', + string $sortDir = 'ASC', + int $page = 1, + int $perPage = 15 + ): array { + $allowedSortColumns = [ + 'id' => 'spm.id', + 'name' => 'spm.name', + 'status' => 'spm.status', + 'apilo_payment_type_id' => 'spm.apilo_payment_type_id', + ]; + + $sortSql = $allowedSortColumns[$sortColumn] ?? 'spm.name'; + $sortDir = strtoupper(trim($sortDir)) === 'DESC' ? 'DESC' : 'ASC'; + $page = max(1, $page); + $perPage = min(self::MAX_PER_PAGE, max(1, $perPage)); + $offset = ($page - 1) * $perPage; + + $where = ['1 = 1']; + $params = []; + + $name = trim((string)($filters['name'] ?? '')); + if ($name !== '') { + if (strlen($name) > 255) { + $name = substr($name, 0, 255); + } + $where[] = 'spm.name LIKE :name'; + $params[':name'] = '%' . $name . '%'; + } + + $status = trim((string)($filters['status'] ?? '')); + if ($status === '0' || $status === '1') { + $where[] = 'spm.status = :status'; + $params[':status'] = (int)$status; + } + + $whereSql = implode(' AND ', $where); + + $sqlCount = " + SELECT COUNT(0) + FROM pp_shop_payment_methods AS spm + WHERE {$whereSql} + "; + + $stmtCount = $this->db->query($sqlCount, $params); + $countRows = $stmtCount ? $stmtCount->fetchAll() : []; + $total = isset($countRows[0][0]) ? (int)$countRows[0][0] : 0; + + $sql = " + SELECT + spm.id, + spm.name, + spm.description, + spm.status, + spm.apilo_payment_type_id + FROM pp_shop_payment_methods AS spm + WHERE {$whereSql} + ORDER BY {$sortSql} {$sortDir}, spm.id ASC + LIMIT {$perPage} OFFSET {$offset} + "; + + $stmt = $this->db->query($sql, $params); + $items = $stmt ? $stmt->fetchAll() : []; + + if (!is_array($items)) { + $items = []; + } + + foreach ($items as &$item) { + $item = $this->normalizePaymentMethod($item); + } + unset($item); + + return [ + 'items' => $items, + 'total' => $total, + ]; + } + + public function find(int $paymentMethodId): ?array + { + if ($paymentMethodId <= 0) { + return null; + } + + $paymentMethod = $this->db->get('pp_shop_payment_methods', '*', ['id' => $paymentMethodId]); + if (!is_array($paymentMethod)) { + return null; + } + + return $this->normalizePaymentMethod($paymentMethod); + } + + public function save(int $paymentMethodId, array $data): ?int + { + if ($paymentMethodId <= 0) { + return null; + } + + $row = [ + 'description' => trim((string)($data['description'] ?? '')), + 'status' => $this->toSwitchValue($data['status'] ?? 0), + 'apilo_payment_type_id' => $this->normalizeApiloPaymentTypeId($data['apilo_payment_type_id'] ?? null), + ]; + + $this->db->update('pp_shop_payment_methods', $row, ['id' => $paymentMethodId]); + + return $paymentMethodId; + } + + /** + * @return array> + */ + public function allActive(): array + { + $rows = $this->db->select('pp_shop_payment_methods', '*', [ + 'status' => 1, + 'ORDER' => ['id' => 'ASC'], + ]); + + if (!is_array($rows)) { + return []; + } + + $result = []; + foreach ($rows as $row) { + if (is_array($row)) { + $result[] = $this->normalizePaymentMethod($row); + } + } + + return $result; + } + + /** + * @return array> + */ + public function allForAdmin(): array + { + $rows = $this->db->select('pp_shop_payment_methods', '*', [ + 'ORDER' => ['name' => 'ASC'], + ]); + + if (!is_array($rows)) { + return []; + } + + $result = []; + foreach ($rows as $row) { + if (is_array($row)) { + $result[] = $this->normalizePaymentMethod($row); + } + } + + return $result; + } + + public function findActiveById(int $paymentMethodId): ?array + { + if ($paymentMethodId <= 0) { + return null; + } + + $paymentMethod = $this->db->get('pp_shop_payment_methods', '*', [ + 'AND' => [ + 'id' => $paymentMethodId, + 'status' => 1, + ], + ]); + + if (!is_array($paymentMethod)) { + return null; + } + + return $this->normalizePaymentMethod($paymentMethod); + } + + public function isActive(int $paymentMethodId): int + { + if ($paymentMethodId <= 0) { + return 0; + } + + $status = $this->db->get('pp_shop_payment_methods', 'status', ['id' => $paymentMethodId]); + return $this->toSwitchValue($status); + } + + /** + * @return int|string|null + */ + public function getApiloPaymentTypeId(int $paymentMethodId) + { + if ($paymentMethodId <= 0) { + return null; + } + + $value = $this->db->get('pp_shop_payment_methods', 'apilo_payment_type_id', ['id' => $paymentMethodId]); + return $this->normalizeApiloPaymentTypeId($value); + } + + /** + * @return array> + */ + public function forTransport(int $transportMethodId): array + { + if ($transportMethodId <= 0) { + return []; + } + + $sql = " + SELECT + spm.id, + spm.name, + spm.description, + spm.status, + spm.apilo_payment_type_id + FROM pp_shop_payment_methods AS spm + INNER JOIN pp_shop_transport_payment_methods AS stpm + ON stpm.id_payment_method = spm.id + WHERE spm.status = 1 + AND stpm.id_transport = :transport_id + "; + + $stmt = $this->db->query($sql, [':transport_id' => $transportMethodId]); + $rows = $stmt ? $stmt->fetchAll() : []; + + if (!is_array($rows)) { + return []; + } + + $result = []; + foreach ($rows as $row) { + if (is_array($row)) { + $result[] = $this->normalizePaymentMethod($row); + } + } + + return $result; + } + + private function normalizePaymentMethod(array $row): array + { + $row['id'] = (int)($row['id'] ?? 0); + $row['name'] = trim((string)($row['name'] ?? '')); + $row['description'] = (string)($row['description'] ?? ''); + $row['status'] = $this->toSwitchValue($row['status'] ?? 0); + $row['apilo_payment_type_id'] = $this->normalizeApiloPaymentTypeId($row['apilo_payment_type_id'] ?? null); + + return $row; + } + + /** + * @return int|string|null + */ + private function normalizeApiloPaymentTypeId($value) + { + if ($value === null || $value === false) { + return null; + } + + $text = trim((string)$value); + if ($text === '') { + return null; + } + + if (preg_match('/^-?\d+$/', $text) === 1) { + return (int)$text; + } + + return $text; + } + + private function toSwitchValue($value): int + { + if (is_bool($value)) { + return $value ? 1 : 0; + } + + if (is_numeric($value)) { + return ((int)$value) === 1 ? 1 : 0; + } + + if (is_string($value)) { + $normalized = strtolower(trim($value)); + return in_array($normalized, ['1', 'on', 'true', 'yes'], true) ? 1 : 0; + } + + return 0; + } +} diff --git a/autoload/admin/Controllers/IntegrationsController.php b/autoload/admin/Controllers/IntegrationsController.php index e3d78db..dbd43cd 100644 --- a/autoload/admin/Controllers/IntegrationsController.php +++ b/autoload/admin/Controllers/IntegrationsController.php @@ -12,23 +12,23 @@ class IntegrationsController $this->repository = $repository; } - // ── Apilo settings ────────────────────────────────────────── - public function apilo_settings(): string { return \Tpl::view( 'integrations/apilo-settings', [ 'settings' => $this->repository->getSettings( 'apilo' ), + 'apilo_status' => $this->repository->apiloIntegrationStatus(), ] ); } public function apilo_settings_save(): void { - $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawień wystąpił błąd. Proszę spróbować ponownie.' ]; + $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ]; $fieldId = \S::get( 'field_id' ); $value = \S::get( 'value' ); - if ( $this->repository->saveSetting( 'apilo', $fieldId, $value ) ) - $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostały zapisane.', 'value' => $value ]; + if ( $this->repository->saveSetting( 'apilo', $fieldId, $value ) ) { + $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ]; + } echo json_encode( $response ); exit; @@ -36,70 +36,55 @@ class IntegrationsController public function apilo_authorization(): void { - $response = [ 'status' => 'error', 'msg' => 'Podczas autoryzacji wystąpił błąd. Proszę spróbować ponownie.' ]; $settings = $this->repository->getSettings( 'apilo' ); - if ( $this->repository->apiloAuthorize( $settings['client-id'], $settings['client-secret'], $settings['authorization-code'] ) ) - $response = [ 'status' => 'ok', 'msg' => 'Autoryzacja przebiegła pomyślnie.' ]; + if ( $this->repository->apiloAuthorize( + (string)($settings['client-id'] ?? ''), + (string)($settings['client-secret'] ?? ''), + (string)($settings['authorization-code'] ?? '') + ) ) { + echo json_encode( [ 'status' => 'ok', 'msg' => 'Autoryzacja przebiegla pomyslnie.' ] ); + exit; + } - echo json_encode( $response ); + $status = $this->repository->apiloIntegrationStatus(); + $message = trim( (string)($status['message'] ?? '') ); + if ( $message === '' ) { + $message = 'Podczas autoryzacji wystapil blad. Prosze sprawdzic dane i sprobowac ponownie.'; + } else { + $message = 'Autoryzacja nieudana. ' . $message; + } + + echo json_encode( [ 'status' => 'error', 'msg' => $message ] ); exit; } - // ── Apilo data fetch ──────────────────────────────────────── - public function get_platform_list(): void { - if ( $this->repository->apiloFetchList( 'platform' ) ) - \S::alert( 'Lista platform została pobrana.' ); - else - \S::alert( 'Brak wyników.' ); - - header( 'Location: /admin/integrations/apilo_settings/' ); - exit; + $this->fetchApiloListWithFeedback( 'platform', 'Liste platform' ); } public function get_status_types_list(): void { - if ( $this->repository->apiloFetchList( 'status' ) ) - \S::alert( 'Lista statusów została pobrana.' ); - else - \S::alert( 'Brak wyników.' ); - - header( 'Location: /admin/integrations/apilo_settings/' ); - exit; + $this->fetchApiloListWithFeedback( 'status', 'Liste statusow' ); } public function get_carrier_account_list(): void { - if ( $this->repository->apiloFetchList( 'carrier' ) ) - \S::alert( 'Lista kont przewoźników została pobrana.' ); - else - \S::alert( 'Brak wyników.' ); - - header( 'Location: /admin/integrations/apilo_settings/' ); - exit; + $this->fetchApiloListWithFeedback( 'carrier', 'Liste kont przewoznikow' ); } public function get_payment_types_list(): void { - if ( $this->repository->apiloFetchList( 'payment' ) ) - \S::alert( 'Lista metod płatności została pobrana.' ); - else - \S::alert( 'Brak wyników.' ); - - header( 'Location: /admin/integrations/apilo_settings/' ); - exit; + $this->fetchApiloListWithFeedback( 'payment', 'Liste metod platnosci' ); } - // ── Apilo product operations ──────────────────────────────── - public function apilo_create_product(): void { $productId = (int) \S::get( 'product_id' ); $result = $this->repository->apiloCreateProduct( $productId ); - \S::alert( $result['message'] ); + \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') ); header( 'Location: /admin/shop_product/view_list/' ); exit; } @@ -120,24 +105,26 @@ class IntegrationsController public function apilo_product_select_save(): void { - if ( $this->repository->linkProduct( (int) \S::get( 'product_id' ), \S::get( 'apilo_product_id' ), \S::get( 'apilo_product_name' ) ) ) + if ( $this->repository->linkProduct( (int) \S::get( 'product_id' ), \S::get( 'apilo_product_id' ), \S::get( 'apilo_product_name' ) ) ) { echo json_encode( [ 'status' => 'ok' ] ); - else - echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystąpił błąd. Proszę spróbować ponownie.' ] ); + } else { + echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystapil blad. Prosze sprobowac ponownie.' ] ); + } + exit; } public function apilo_product_select_delete(): void { - if ( $this->repository->unlinkProduct( (int) \S::get( 'product_id' ) ) ) + if ( $this->repository->unlinkProduct( (int) \S::get( 'product_id' ) ) ) { echo json_encode( [ 'status' => 'ok' ] ); - else - echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie.' ] ); + } else { + echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas usuwania produktu wystapil blad. Prosze sprobowac ponownie.' ] ); + } + exit; } - // ── ShopPRO settings ──────────────────────────────────────── - public function shoppro_settings(): string { return \Tpl::view( 'integrations/shoppro-settings', [ @@ -147,26 +134,45 @@ class IntegrationsController public function shoppro_settings_save(): void { - $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawień wystąpił błąd. Proszę spróbować ponownie.' ]; + $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ]; $fieldId = \S::get( 'field_id' ); $value = \S::get( 'value' ); - if ( $this->repository->saveSetting( 'shoppro', $fieldId, $value ) ) - $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostały zapisane.', 'value' => $value ]; + if ( $this->repository->saveSetting( 'shoppro', $fieldId, $value ) ) { + $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ]; + } echo json_encode( $response ); exit; } - // ── ShopPRO product import ────────────────────────────────── - public function shoppro_product_import(): void { $productId = (int) \S::get( 'product_id' ); $result = $this->repository->shopproImportProduct( $productId ); - \S::alert( $result['message'] ); + \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') ); header( 'Location: /admin/shop_product/view_list/' ); exit; } + + private function fetchApiloListWithFeedback( string $type, string $label ): void + { + $result = $this->repository->apiloFetchListResult( $type ); + + if ( !empty( $result['success'] ) ) { + $count = (int)($result['count'] ?? 0); + \S::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' ); + } else { + $details = trim( (string)($result['message'] ?? 'Nieznany blad.') ); + \S::alert( + 'Nie udalo sie pobrac ' . strtolower( $label ) . '. ' + . $details + . ' Co zrobic: sprawdz konfiguracje Apilo, wykonaj autoryzacje i ponow pobranie listy.' + ); + } + + header( 'Location: /admin/integrations/apilo_settings/' ); + exit; + } } diff --git a/autoload/admin/Controllers/ShopPaymentMethodController.php b/autoload/admin/Controllers/ShopPaymentMethodController.php new file mode 100644 index 0000000..e72e07a --- /dev/null +++ b/autoload/admin/Controllers/ShopPaymentMethodController.php @@ -0,0 +1,290 @@ +repository = $repository; + } + + public function list(): string + { + $sortableColumns = ['id', 'name', 'status', 'apilo_payment_type_id']; + $filterDefinitions = [ + [ + 'key' => 'name', + 'label' => 'Nazwa', + 'type' => 'text', + ], + [ + 'key' => 'status', + 'label' => 'Aktywny', + 'type' => 'select', + 'options' => [ + '' => '- aktywny -', + '1' => 'tak', + '0' => 'nie', + ], + ], + ]; + + $listRequest = \admin\Support\TableListRequestFactory::fromRequest( + $filterDefinitions, + $sortableColumns, + 'id' + ); + + $sortDir = $listRequest['sortDir']; + if (trim((string)\S::get('sort')) === '') { + $sortDir = 'ASC'; + } + + $result = $this->repository->listForAdmin( + $listRequest['filters'], + $listRequest['sortColumn'], + $sortDir, + $listRequest['page'], + $listRequest['perPage'] + ); + + $apiloPaymentTypes = $this->getApiloPaymentTypes(); + + $rows = []; + $lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1; + foreach ($result['items'] as $item) { + $id = (int)($item['id'] ?? 0); + $name = trim((string)($item['name'] ?? '')); + $status = (int)($item['status'] ?? 0); + $apiloPaymentTypeId = $item['apilo_payment_type_id'] ?? null; + + $apiloLabel = '-'; + if ($apiloPaymentTypeId !== null) { + $apiloKey = (string)$apiloPaymentTypeId; + if (isset($apiloPaymentTypes[$apiloKey])) { + $apiloLabel = $apiloPaymentTypes[$apiloKey]; + } + } + + $rows[] = [ + 'lp' => $lp++ . '.', + 'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '', + 'status' => $status === 1 ? 'tak' : 'nie', + 'apilo_payment_type' => htmlspecialchars((string)$apiloLabel, ENT_QUOTES, 'UTF-8'), + '_actions' => [ + [ + 'label' => 'Edytuj', + 'url' => '/admin/shop_payment_method/edit/id=' . $id, + 'class' => 'btn btn-xs btn-primary', + ], + ], + ]; + } + + $total = (int)$result['total']; + $totalPages = max(1, (int)ceil($total / $listRequest['perPage'])); + + $viewModel = new PaginatedTableViewModel( + [ + ['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false], + ['key' => 'name', 'sort_key' => 'name', 'label' => 'Nazwa', 'sortable' => true, 'raw' => true], + ['key' => 'status', 'sort_key' => 'status', 'label' => 'Aktywny', 'class' => 'text-center', 'sortable' => true, 'raw' => true], + ['key' => 'apilo_payment_type', 'sort_key' => 'apilo_payment_type_id', 'label' => 'Typ platnosci Apilo', 'class' => 'text-center', 'sortable' => true], + ], + $rows, + $listRequest['viewFilters'], + [ + 'column' => $listRequest['sortColumn'], + 'dir' => $sortDir, + ], + [ + 'page' => $listRequest['page'], + 'per_page' => $listRequest['perPage'], + 'total' => $total, + 'total_pages' => $totalPages, + ], + array_merge($listRequest['queryFilters'], [ + 'sort' => $listRequest['sortColumn'], + 'dir' => $sortDir, + 'per_page' => $listRequest['perPage'], + ]), + $listRequest['perPageOptions'], + $sortableColumns, + '/admin/shop_payment_method/list/', + 'Brak danych w tabeli.' + ); + + return \Tpl::view('shop-payment-method/payment-methods-list', [ + 'viewModel' => $viewModel, + ]); + } + + public function edit(): string + { + $paymentMethod = $this->repository->find((int)\S::get('id')); + if ($paymentMethod === null) { + \S::alert('Metoda platnosci nie zostala znaleziona.'); + header('Location: /admin/shop_payment_method/list/'); + exit; + } + + return \Tpl::view('shop-payment-method/payment-method-edit', [ + 'form' => $this->buildFormViewModel($paymentMethod, $this->getApiloPaymentTypes()), + ]); + } + + public function save(): void + { + $payload = $_POST; + $paymentMethodId = isset($payload['id']) && $payload['id'] !== '' + ? (int)$payload['id'] + : (int)\S::get('id'); + + $id = $this->repository->save($paymentMethodId, $payload); + if ($id !== null) { + echo json_encode([ + 'success' => true, + 'id' => (int)$id, + 'message' => 'Metoda platnosci zostala zapisana.', + ]); + exit; + } + + echo json_encode([ + 'success' => false, + 'errors' => ['general' => 'Podczas zapisywania metody platnosci wystapil blad.'], + ]); + exit; + } + + private function buildFormViewModel(array $paymentMethod, array $apiloPaymentTypes): FormEditViewModel + { + $id = (int)($paymentMethod['id'] ?? 0); + $name = (string)($paymentMethod['name'] ?? ''); + + $apiloOptions = ['' => '--- wybierz typ platnosci apilo.com ---']; + foreach ($apiloPaymentTypes as $apiloId => $apiloName) { + $apiloOptions[(string)$apiloId] = $apiloName; + } + + $data = [ + 'id' => $id, + 'description' => (string)($paymentMethod['description'] ?? ''), + 'status' => (int)($paymentMethod['status'] ?? 0), + 'apilo_payment_type_id' => $paymentMethod['apilo_payment_type_id'] ?? '', + ]; + + $fields = [ + FormField::hidden('id', $id), + FormField::custom( + 'name_preview', + \Html::input([ + 'label' => 'Nazwa', + 'name' => 'name_preview', + 'id' => 'name_preview', + 'value' => $name, + 'type' => 'text', + 'readonly' => true, + ]), + ['tab' => 'settings'] + ), + FormField::textarea('description', [ + 'label' => 'Opis', + 'tab' => 'settings', + 'rows' => 5, + ]), + FormField::select('apilo_payment_type_id', [ + 'label' => 'Typ platnosci Apilo', + 'tab' => 'settings', + 'options' => $apiloOptions, + ]), + FormField::switch('status', [ + 'label' => 'Aktywny', + 'tab' => 'settings', + ]), + ]; + + $tabs = [ + new FormTab('settings', 'Ustawienia', 'fa-wrench'), + ]; + + $actionUrl = '/admin/shop_payment_method/save/id=' . $id; + $actions = [ + FormAction::save($actionUrl, '/admin/shop_payment_method/list/'), + FormAction::cancel('/admin/shop_payment_method/list/'), + ]; + + return new FormEditViewModel( + 'shop-payment-method-edit', + 'Edycja metody platnosci: ' . $name, + $data, + $fields, + $tabs, + $actions, + 'POST', + $actionUrl, + '/admin/shop_payment_method/list/', + true, + ['id' => $id] + ); + } + + private function getApiloPaymentTypes(): array + { + $rawSetting = \admin\factory\Integrations::apilo_settings('payment-types-list'); + $raw = null; + + if (is_array($rawSetting)) { + $raw = $rawSetting; + } elseif (is_string($rawSetting)) { + $decoded = @unserialize($rawSetting); + if (is_array($decoded)) { + $raw = $decoded; + } else { + $decodedJson = json_decode($rawSetting, true); + if (is_array($decodedJson)) { + $raw = $decodedJson; + } + } + } + + if (!is_array($raw)) { + return []; + } + + if (isset($raw['message']) && isset($raw['code'])) { + return []; + } + + if (isset($raw['items']) && is_array($raw['items'])) { + $raw = $raw['items']; + } elseif (isset($raw['data']) && is_array($raw['data'])) { + $raw = $raw['data']; + } + + $list = []; + foreach ($raw as $key => $paymentType) { + if (is_array($paymentType)) { + if (isset($paymentType['id'], $paymentType['name'])) { + $list[(string)$paymentType['id']] = (string)$paymentType['name']; + continue; + } + } elseif (is_scalar($paymentType)) { + if (is_int($key) || (is_string($key) && preg_match('/^-?\d+$/', $key) === 1)) { + $list[(string)$key] = (string)$paymentType; + } + } + } + + return $list; + } +} diff --git a/autoload/admin/class.Site.php b/autoload/admin/class.Site.php index 34aea29..20e7d52 100644 --- a/autoload/admin/class.Site.php +++ b/autoload/admin/class.Site.php @@ -316,6 +316,13 @@ class Site new \Domain\Coupon\CouponRepository( $mdb ) ); }, + 'ShopPaymentMethod' => function() { + global $mdb; + + return new \admin\Controllers\ShopPaymentMethodController( + new \Domain\PaymentMethod\PaymentMethodRepository( $mdb ) + ); + }, 'Pages' => function() { global $mdb; diff --git a/autoload/admin/controls/class.ShopPaymentMethod.php b/autoload/admin/controls/class.ShopPaymentMethod.php deleted file mode 100644 index b340f14..0000000 --- a/autoload/admin/controls/class.ShopPaymentMethod.php +++ /dev/null @@ -1,11 +0,0 @@ - unserialize( \admin\factory\Integrations::apilo_settings( 'payment-types-list' ) ), - ] ); - } -} diff --git a/autoload/admin/controls/class.ShopTransport.php b/autoload/admin/controls/class.ShopTransport.php index 611d6c5..adbc796 100644 --- a/autoload/admin/controls/class.ShopTransport.php +++ b/autoload/admin/controls/class.ShopTransport.php @@ -18,9 +18,12 @@ class ShopTransport public static function transport_edit() { + global $mdb; + $paymentMethodRepository = new \Domain\PaymentMethod\PaymentMethodRepository( $mdb ); + return \Tpl::view( 'shop-transport/transport-edit', [ 'transport_details' => \admin\factory\ShopTransport::transport_details( \S::get( 'id' ) ), - 'payments_list' => \admin\factory\ShopPaymentMethod::payments_list(), + 'payments_list' => $paymentMethodRepository -> allForAdmin(), 'apilo_carrier_account_list' => unserialize( \admin\factory\Integrations::apilo_settings( 'carrier-account-list' ) ), ] ); } diff --git a/autoload/admin/factory/class.Integrations.php b/autoload/admin/factory/class.Integrations.php index 1550289..7c17121 100644 --- a/autoload/admin/factory/class.Integrations.php +++ b/autoload/admin/factory/class.Integrations.php @@ -4,7 +4,7 @@ namespace admin\factory; /** * Fasada kompatybilnosci wstecznej. * Deleguje do Domain\Integrations\IntegrationsRepository. - * Uzywane przez: cron.php, shop\Order, admin\Controllers\ShopStatusesController, admin\controls\ShopTransport, admin\controls\ShopPaymentMethod, admin\controls\ShopProduct. + * Uzywane przez: cron.php, shop\Order, admin\Controllers\ShopStatusesController, admin\controls\ShopTransport, admin\controls\ShopProduct, admin\Controllers\ShopPaymentMethodController. */ class Integrations { @@ -32,6 +32,11 @@ class Integrations { return self::repo()->apiloGetAccessToken(); } + static public function apilo_keepalive( int $refresh_lead_seconds = 300 ) + { + return self::repo()->apiloKeepalive( $refresh_lead_seconds ); + } + static public function apilo_authorization( $client_id, $client_secret, $authorization_code ) { return self::repo()->apiloAuthorize( $client_id, $client_secret, $authorization_code ); diff --git a/autoload/admin/factory/class.ShopPaymentMethod.php b/autoload/admin/factory/class.ShopPaymentMethod.php deleted file mode 100644 index 464c2f6..0000000 --- a/autoload/admin/factory/class.ShopPaymentMethod.php +++ /dev/null @@ -1,10 +0,0 @@ - select( 'pp_shop_payment_methods', '*', [ 'ORDER' => [ 'name' => 'ASC'] ] ); - } -} diff --git a/autoload/admin/view/class.ShopPaymentMethod.php b/autoload/admin/view/class.ShopPaymentMethod.php deleted file mode 100644 index 7a02c8d..0000000 --- a/autoload/admin/view/class.ShopPaymentMethod.php +++ /dev/null @@ -1,6 +0,0 @@ - get( 'pp_shop_payment_methods', 'apilo_payment_type_id', [ 'id' => $payment_method_id ] ); + return self::repo()->getApiloPaymentTypeId( (int)$payment_method_id ); } public static function payment_methods_by_transport( $transport_method_id ) { - global $mdb, $settings; + $transport_method_id = (int)$transport_method_id; + $cacheKey = 'payment_methods_by_transport' . $transport_method_id; + $payments = \Cache::fetch( $cacheKey ); - if ( !$payments = \Cache::fetch( 'payment_methods_by_transport' . $transport_method_id ) ) - { - $results = $mdb -> query( 'SELECT ' - . 'pspm.id, name, description ' - . 'FROM ' - . 'pp_shop_payment_methods AS pspm ' - . 'INNER JOIN pp_shop_transport_payment_methods AS pstpm ON pstpm.id_payment_method = pspm.id ' - . 'WHERE ' - . 'status = 1 ' - . 'AND ' - . 'id_transport = ' . $transport_method_id ) -> fetchAll(); - if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row ) - $payments[] = $row; - - \Cache::store( 'payment_methods_by_transport' . $transport_method_id, $payments ); + if ( $payments !== false && is_array( $payments ) ) { + return $payments; } + $payments = self::repo()->forTransport( $transport_method_id ); + \Cache::store( $cacheKey, $payments ); + return $payments; } public static function is_payment_active( $payment_method_id ) { - global $mdb; - return $mdb -> get( 'pp_shop_payment_methods', 'status', [ 'id' => $payment_method_id ] ); + return self::repo()->isActive( (int)$payment_method_id ); } public static function payment_method( $payment_method_id ) { - global $mdb; + $payment_method_id = (int)$payment_method_id; + $cacheKey = 'payment_method' . $payment_method_id; + $payment_method = \Cache::fetch( $cacheKey ); - if ( !$payment_method = \Cache::fetch( 'payment_method' . $payment_method_id ) ) - { - $payment_method = $mdb -> get( 'pp_shop_payment_methods', '*', [ - 'AND' => [ - 'id' => $payment_method_id, - 'status' => 1 - ] ] ); - - \Cache::store( 'payment_method' . $payment_method_id, $payment_method ); + if ( $payment_method === false ) { + $payment_method = self::repo()->findActiveById( $payment_method_id ); + \Cache::store( $cacheKey, $payment_method ); } + return $payment_method; } public static function payment_methods() { - global $mdb; + $cacheKey = 'payment_methods'; + $payment_methods = \Cache::fetch( $cacheKey ); - if ( !$payment_methods = \Cache::fetch( 'payment_methods' ) ) - { - $results = $mdb -> select( 'pp_shop_payment_methods', '*', [ 'status' => 1 ] ); - if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row ) - $payment_methods[] = $row; - - \Cache::store( 'payment_methods', $payment_methods ); + if ( $payment_methods !== false && is_array( $payment_methods ) ) { + return $payment_methods; } + $payment_methods = self::repo()->allActive(); + \Cache::store( $cacheKey, $payment_methods ); + return $payment_methods; } } diff --git a/autoload/shop/class.PaymentMethod.php b/autoload/shop/class.PaymentMethod.php index 73997ba..15ffe2e 100644 --- a/autoload/shop/class.PaymentMethod.php +++ b/autoload/shop/class.PaymentMethod.php @@ -1,19 +1,24 @@ - select( 'pp_shop_payment_methods', '*', [ 'status' => 1 ] ); + return new \Domain\PaymentMethod\PaymentMethodRepository( $mdb ); + } + + // lista dostepnych form platnosci + static public function method_list() + { + return self::repo()->allActive(); } // get_apilo_payment_method_id static public function get_apilo_payment_method_id( $payment_method_id ) { - global $mdb; - return $mdb -> get( 'pp_shop_payment_methods', 'apilo_payment_type_id', [ 'id' => $payment_method_id ] ); + return self::repo()->getApiloPaymentTypeId( (int)$payment_method_id ); } public function offsetExists( $offset ) @@ -35,4 +40,4 @@ class PaymentMethod implements \ArrayAccess { unset( $this -> $offset ); } -} \ No newline at end of file +} diff --git a/cron.php b/cron.php index 2f396c5..f8996a9 100644 --- a/cron.php +++ b/cron.php @@ -55,6 +55,12 @@ $mdb = new medoo( [ $settings = \front\factory\Settings::settings_details(); $apilo_settings = \admin\factory\Integrations::apilo_settings(); +// Keepalive tokenu Apilo: odswiezaj token przed wygasnieciem, zeby integracja byla stale aktywna. +if ( (int)($apilo_settings['enabled'] ?? 0) === 1 ) { + \admin\factory\Integrations::apilo_keepalive( 300 ); + $apilo_settings = \admin\factory\Integrations::apilo_settings(); +} + function parsePaczkomatAddress($input) { $pattern = '/^([\w-]+)\s+\|\s+([^,]+),\s+(\d{2}-\d{3})\s+(.+)$/'; @@ -574,4 +580,4 @@ foreach ( $orders as $order ) } $mdb -> update( 'pp_shop_orders', [ 'parsed' => 1 ], [ 'id' => $order ] ); echo '

    Parsuję zamówienie #' . $order . '

    '; -} \ No newline at end of file +} diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c67c7f4..2b1c17d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -4,6 +4,23 @@ Logi zmian z migracji na Domain-Driven Architecture. Najnowsze na gorze. --- +## ver. 0.268 (2026-02-14) - ShopPaymentMethod + Apilo token keepalive + +- **ShopPaymentMethod** - migracja `/admin/shop_payment_method` na Domain + DI + nowe widoki + - NOWE: `Domain\PaymentMethod\PaymentMethodRepository` (`listForAdmin`, `find`, `save`, `allActive`, `allForAdmin`, `findActiveById`, `isActive`, `getApiloPaymentTypeId`, `forTransport`) + - NOWE: `admin\Controllers\ShopPaymentMethodController` (DI) z akcjami `list`, `edit`, `save` + - NOWE: widoki `shop-payment-method/payment-methods-list.php` i `shop-payment-method/payment-method-edit.php` + - UPDATE: routing i menu admin na kanoniczny URL `/admin/shop_payment_method/list/` + - UPDATE: `admin\controls\ShopTransport`, `front\factory\ShopPaymentMethod`, `shop\PaymentMethod` przepiete na nowe repozytorium + - CLEANUP: usuniete legacy `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` +- **Integrations/Apilo** - stabilizacja tokenu i lepszy feedback + - NOWE: automatyczne odswiezanie tokenu Apilo przed wygasnieciem (`apiloKeepalive`, refresh lead time) + - UPDATE: cron uruchamia keepalive i odswieza konfiguracje Apilo + - UPDATE: bardziej szczegolowe komunikaty bledow dla przyciskow integracji Apilo (co zrobic dalej) +- Testy: **OK (280 tests, 828 assertions)** + +--- + ## ver. 0.267 (2026-02-14) - ShopStatuses - **ShopStatuses** - migracja `/admin/shop_statuses` na Domain + DI + nowe widoki diff --git a/docs/DATABASE_STRUCTURE.md b/docs/DATABASE_STRUCTURE.md index 7f5cd47..acb13ca 100644 --- a/docs/DATABASE_STRUCTURE.md +++ b/docs/DATABASE_STRUCTURE.md @@ -368,6 +368,22 @@ Promocje sklepu (modul `/admin/shop_promotion`). **Aktualizacja 2026-02-13 (ver. 0.265):** dodano obsluge `date_from` (repozytorium, formularz admin, lista admin, filtr aktywnych promocji na froncie) oraz poprawke zapisu edycji promocji po `id`. +## pp_shop_payment_methods +Metody platnosci sklepu (modul `/admin/shop_payment_method`). + +| Kolumna | Opis | +|---------|------| +| id | PK | +| name | Nazwa metody platnosci | +| description | Opis metody platnosci (wyswietlany m.in. w checkout) | +| status | Status: 1 = aktywna, 0 = nieaktywna | +| apilo_payment_type_id | ID typu platnosci Apilo (NULL gdy brak mapowania) | +| sellasist_payment_type_id | DEPRECATED (integracja Sellasist usunieta w ver. 0.263) | + +**Uzywane w:** `Domain\PaymentMethod\PaymentMethodRepository`, `admin\Controllers\ShopPaymentMethodController`, `front\factory\ShopPaymentMethod`, `shop\PaymentMethod`, `admin\controls\ShopTransport`, `cron.php` + +**Aktualizacja 2026-02-14 (ver. 0.268):** modul `/admin/shop_payment_method` korzysta z `Domain\PaymentMethod\PaymentMethodRepository` przez `admin\Controllers\ShopPaymentMethodController`. Usunieto legacy klasy `admin\controls\ShopPaymentMethod`, `admin\factory\ShopPaymentMethod`, `admin\view\ShopPaymentMethod` oraz widok `admin/templates/shop-payment-method/view-list.php`. + ## pp_shop_apilo_settings Ustawienia integracji Apilo (key-value). diff --git a/docs/PROJECT_STRUCTURE.md b/docs/PROJECT_STRUCTURE.md index eed9acf..450e66b 100644 --- a/docs/PROJECT_STRUCTURE.md +++ b/docs/PROJECT_STRUCTURE.md @@ -124,6 +124,10 @@ shopPRO/ - `pp_shop_apilo_settings` (key-value) - `pp_shop_shoppro_settings` (key-value) +### Tabele checkout +- `pp_shop_payment_methods` - metody platnosci sklepu (mapowanie `apilo_payment_type_id`) +- `pp_shop_transport_payment_methods` - powiazanie metod transportu i platnosci + Pelna dokumentacja tabel: `DATABASE_STRUCTURE.md` ## Konfiguracja @@ -222,6 +226,12 @@ autoload/ └── front/factory/ # Legacy - stopniowo migrowane ``` +**Aktualizacja 2026-02-14 (ver. 0.268):** +- Dodano modul domenowy `Domain/PaymentMethod/PaymentMethodRepository.php`. +- Dodano kontroler DI `admin/Controllers/ShopPaymentMethodController.php`. +- Modul `/admin/shop_payment_method/*` dziala na nowych widokach (`payment-methods-list`, `payment-method-edit`). +- Usunieto legacy: `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`. + ### Routing admin (admin\Site::route()) 1. Sprawdź mapę `$newControllers` → utwórz instancję z DI → wywołaj 2. Jeśli nowy kontroler nie istnieje (`class_exists()` = false) → fallback na `admin\controls\` diff --git a/docs/REFACTORING_PLAN.md b/docs/REFACTORING_PLAN.md index 7cceb37..5d80306 100644 --- a/docs/REFACTORING_PLAN.md +++ b/docs/REFACTORING_PLAN.md @@ -148,6 +148,7 @@ grep -r "Product::getQuantity" . | 17 | ShopPromotion | 0.264-0.265 | listForAdmin, find, save, delete, categoriesTree | | 18 | ShopCoupon | 0.266 | listForAdmin, find, save, delete, categoriesTree | | 19 | ShopStatuses | 0.267 | listForAdmin, find, save, color picker | +| 20 | ShopPaymentMethod | 0.268 | listForAdmin, find, save, allActive, mapowanie Apilo, DI kontroler | ### Product - szczegolowy status - ✅ getQuantity (ver. 0.238) @@ -166,12 +167,12 @@ grep -r "Product::getQuantity" . ## Kolejność refaktoryzacji (priorytet) -1-13: ✅ Cache, Product, Banner, Settings, Dictionaries, ProductArchive, Filemanager, Users, Pages, Integrations, ShopPromotion, ShopCoupon, ShopStatuses +1-20: ✅ Cache, Product, Banner, Settings, Dictionaries, ProductArchive, Filemanager, Users, Pages, Integrations, ShopPromotion, ShopCoupon, ShopStatuses, ShopPaymentMethod Nastepne: -14. **Order** -15. **Category** -16. **ShopAttribute** +21. **Order** +22. **Category** +23. **ShopAttribute** ## Form Edit System @@ -248,6 +249,7 @@ tests/ │ │ ├── Coupon/CouponRepositoryTest.php │ │ ├── Dictionaries/DictionariesRepositoryTest.php │ │ ├── Integrations/IntegrationsRepositoryTest.php +│ │ ├── PaymentMethod/PaymentMethodRepositoryTest.php │ │ ├── Product/ProductRepositoryTest.php │ │ ├── Promotion/PromotionRepositoryTest.php │ │ ├── Settings/SettingsRepositoryTest.php @@ -261,12 +263,13 @@ tests/ │ ├── ProductArchiveControllerTest.php │ ├── SettingsControllerTest.php │ ├── ShopCouponControllerTest.php +│ ├── ShopPaymentMethodControllerTest.php │ ├── ShopPromotionControllerTest.php │ ├── ShopStatusesControllerTest.php │ └── UsersControllerTest.php └── Integration/ ``` -**Łącznie: 254 testów, 736 asercji** +**Łącznie: 280 testów, 828 asercji** Pelna dokumentacja testow: `TESTING.md` diff --git a/docs/SHOP_PAYMENT_METHOD_REFACTOR_PLAN.md b/docs/SHOP_PAYMENT_METHOD_REFACTOR_PLAN.md new file mode 100644 index 0000000..3aeb6c1 --- /dev/null +++ b/docs/SHOP_PAYMENT_METHOD_REFACTOR_PLAN.md @@ -0,0 +1,138 @@ +# Plan Refaktoryzacji: shop_payment_method + +Data utworzenia: 2026-02-14 +Status: ZREALIZOWANY (Etapy 1-4 zakonczone: 2026-02-14) + +## 1. Cel + +Pelna migracja modulu `/admin/shop_payment_method/*` do obecnego standardu projektu: +- `Domain/*` dla logiki danych, +- `admin/Controllers/*` z DI dla routingu, +- widoki oparte o `components/table-list` i `components/form-edit`, +- usuniecie legacy klas/podpiecie zaleznosci. + +## 2. Stan obecny (inwentaryzacja) + +Aktualny modul jest legacy i opiera sie o `grid`: +- `autoload/admin/controls/class.ShopPaymentMethod.php` +- `autoload/admin/factory/class.ShopPaymentMethod.php` +- `autoload/admin/view/class.ShopPaymentMethod.php` (pusta) +- `admin/templates/shop-payment-method/view-list.php` (grid + inline edit) +- menu: `admin/templates/site/main-layout.php` -> `/admin/shop_payment_method/view_list/` + +Zaleznosci wykryte poza modulem: +- `autoload/admin/controls/class.ShopTransport.php` korzysta z `admin\\factory\\ShopPaymentMethod::payments_list()` +- `autoload/front/factory/class.ShopPaymentMethod.php` ma bezposrednie zapytania do `pp_shop_payment_methods` +- `autoload/shop/class.PaymentMethod.php` ma bezposrednie zapytania do `pp_shop_payment_methods` +- `cron.php` korzysta z `front\\factory\\ShopPaymentMethod::get_apilo_payment_method_id()` + +## 3. Zakres refaktoru + +W zakresie: +1. Nowe repozytorium domenowe dla metod platnosci. +2. Nowy kontroler admin z DI i routingiem kanonicznym. +3. Nowe widoki listy i edycji (bez legacy `grid`). +4. Przepiecie zaleznosci (`ShopTransport`, `front\\factory\\ShopPaymentMethod`, `shop\\PaymentMethod`) na nowe API. +5. Cleanup legacy klas/plikow zwiazanych z modulem. +6. Testy jednostkowe + aktualizacja dokumentacji. + +Poza zakresem (na ten etap): +1. Refaktoryzacja calego modulu `shop_transport` (zrobimy tylko przepiecie zaleznosci dot. payment methods). +2. Zmiany biznesowe w checkout poza zachowaniem obecnej logiki. + +## 4. Architektura docelowa + +Planowane nowe pliki: +- `autoload/Domain/PaymentMethod/PaymentMethodRepository.php` +- `autoload/admin/Controllers/ShopPaymentMethodController.php` +- `admin/templates/shop-payment-method/payment-methods-list.php` +- `admin/templates/shop-payment-method/payment-method-edit.php` + +Planowane aktualizacje: +- `autoload/admin/class.Site.php` (rejestracja `ShopPaymentMethod` w DI routerze) +- `admin/templates/site/main-layout.php` (kanoniczny URL `/admin/shop_payment_method/list/`) +- `autoload/admin/controls/class.ShopTransport.php` (usuniecie zaleznosci od legacy factory) +- `autoload/front/factory/class.ShopPaymentMethod.php` (fasada delegujaca do Domain repo) +- `autoload/shop/class.PaymentMethod.php` (fasada delegujaca do Domain repo) + +Planowane usuniecia: +- `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` + +## 5. Etapy realizacji (Human In The Loop) + +### Etap 1: Domain + testy repozytorium +Zakres: +- utworzenie `PaymentMethodRepository` z metodami: + - `listForAdmin(...)` + - `find(int $id)` + - `save(int $id, array $data)` + - `allActive()` + - `findActiveById(int $id)` + - `isActive(int $id)` + - `getApiloPaymentTypeId(int $id)` + - `forTransport(int $transportId)` +- dodanie testu: `tests/Unit/Domain/PaymentMethod/PaymentMethodRepositoryTest.php` + +Checkpoint: +- STOP i prosba o akceptacje po wdrozeniu etapu 1. + +### Etap 2: Admin Controller + routing + nowe widoki +Zakres: +- nowy `ShopPaymentMethodController` (akcje: `list`, `edit`, `save`) +- migracja listy/edycji na `table-list` + `form-edit` +- podpiecie w `admin\\Site` (DI factory map) +- kompatybilnosc URL: + - kanoniczne: `/admin/shop_payment_method/list|edit|save/` + - aliasy legacy do decyzji po wdrozeniu (proponuje: tymczasowo wlaczyc) +- test kontrolera: `tests/Unit/admin/Controllers/ShopPaymentMethodControllerTest.php` + +Checkpoint: +- STOP i prosba o akceptacje po wdrozeniu etapu 2. + +### Etap 3: Przepiecie zaleznosci miedzymodulowych +Zakres: +- `ShopTransport` pobiera liste platnosci przez nowe repozytorium (bez legacy factory) +- `front\\factory\\ShopPaymentMethod` jako fasada do repozytorium domenowego +- `shop\\PaymentMethod` jako fasada do repozytorium domenowego +- zachowanie dotychczasowych podpisow metod (BC) + +Checkpoint: +- STOP i prosba o akceptacje po wdrozeniu etapu 3. + +### Etap 4: Cleanup + finalne testy + dokumentacja +Zakres: +- usuniecie legacy klas/plikow dla `shop_payment_method` +- uruchomienie testow: + - najpierw targetowane testy PaymentMethod, + - potem caly suite (`composer test` lub `./test.ps1`) +- aktualizacja dokumentacji: + - `docs/DATABASE_STRUCTURE.md` + - `docs/PROJECT_STRUCTURE.md` + - `docs/REFACTORING_PLAN.md` + - `docs/CHANGELOG.md` + - `docs/TESTING.md` + +Checkpoint: +- STOP i prosba o finalna akceptacje przed etapem release (zip/commit/push wg procedury KONIEC PRACY, jesli zlecisz). + +## 6. Ryzyka i kontrola regresji + +1. Ryzyko: utrata kompatybilnosci URL (`view_list`). + Kontrola: tymczasowe aliasy lub redirect + test akcji. + +2. Ryzyko: regresja checkout przy pobieraniu metod platnosci. + Kontrola: zachowanie podpisow metod we `front\\factory\\ShopPaymentMethod` i `shop\\PaymentMethod`, testy repozytorium. + +3. Ryzyko: `ShopTransport` przestanie pokazywac metody platnosci. + Kontrola: jawne przepiecie zaleznosci i test manualny widoku edycji transportu. + +## 7. Kryteria akceptacji + +1. `/admin/shop_payment_method/list/` dziala na nowym kontrolerze i nowym widoku. +2. `/admin/shop_payment_method/edit/id={id}` i zapis dzialaja bez `grid`. +3. Brak zaleznosci od legacy `admin\\controls\\ShopPaymentMethod` i `admin\\factory\\ShopPaymentMethod`. +4. `ShopTransport`, frontend checkout i `cron.php` dzialaja na niezmienionych API publicznych. +5. Nowe testy przechodza, a pelny suite nie ma regresji. diff --git a/docs/TESTING.md b/docs/TESTING.md index 00d3c4c..67ff0d5 100644 --- a/docs/TESTING.md +++ b/docs/TESTING.md @@ -33,10 +33,10 @@ Alternatywnie (Git Bash): ## Aktualny stan suite -Ostatnio zweryfikowano: 2026-02-13 +Ostatnio zweryfikowano: 2026-02-14 ```text -OK (254 tests, 736 assertions) +OK (280 tests, 828 assertions) ``` ## Struktura testow @@ -52,6 +52,7 @@ tests/ | | |-- Coupon/CouponRepositoryTest.php | | |-- Dictionaries/DictionariesRepositoryTest.php | | |-- Integrations/IntegrationsRepositoryTest.php +| | |-- PaymentMethod/PaymentMethodRepositoryTest.php | | |-- Product/ProductRepositoryTest.php | | |-- Promotion/PromotionRepositoryTest.php | | |-- Settings/SettingsRepositoryTest.php @@ -65,6 +66,7 @@ tests/ | |-- ProductArchiveControllerTest.php | |-- SettingsControllerTest.php | |-- ShopCouponControllerTest.php +| |-- ShopPaymentMethodControllerTest.php | |-- ShopPromotionControllerTest.php | |-- ShopStatusesControllerTest.php | `-- UsersControllerTest.php diff --git a/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php b/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php index 06ec914..96a979d 100644 --- a/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php +++ b/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php @@ -152,19 +152,83 @@ class IntegrationsRepositoryTest extends TestCase $this->assertNull($this->repository->apiloGetAccessToken()); } + public function testShouldRefreshAccessTokenReturnsFalseForFarFutureDate(): void + { + $reflection = new \ReflectionClass($this->repository); + $method = $reflection->getMethod('shouldRefreshAccessToken'); + $method->setAccessible(true); + + $future = date('Y-m-d H:i:s', time() + 3600); + $result = $method->invoke($this->repository, $future, 300); + + $this->assertFalse($result); + } + + public function testShouldRefreshAccessTokenReturnsTrueForNearExpiryDate(): void + { + $reflection = new \ReflectionClass($this->repository); + $method = $reflection->getMethod('shouldRefreshAccessToken'); + $method->setAccessible(true); + + $near = date('Y-m-d H:i:s', time() + 120); + $result = $method->invoke($this->repository, $near, 300); + + $this->assertTrue($result); + } + public function testApiloFetchListThrowsForInvalidType(): void { $this->expectException(\InvalidArgumentException::class); $this->repository->apiloFetchList('invalid'); } + public function testApiloFetchListResultReturnsDetailedErrorWhenConfigMissing(): void + { + $stmt = $this->createMock(\PDOStatement::class); + $stmt->expects($this->once()) + ->method('fetchAll') + ->with(\PDO::FETCH_ASSOC) + ->willReturn([]); + + $this->mockDb->expects($this->once()) + ->method('query') + ->with('SELECT * FROM pp_shop_apilo_settings') + ->willReturn($stmt); + + $result = $this->repository->apiloFetchListResult('payment'); + + $this->assertIsArray($result); + $this->assertFalse((bool)($result['success'] ?? true)); + $this->assertStringContainsString('Brakuje konfiguracji Apilo', (string)($result['message'] ?? '')); + } + + public function testApiloIntegrationStatusReturnsMissingConfigMessage(): void + { + $stmt = $this->createMock(\PDOStatement::class); + $stmt->expects($this->once()) + ->method('fetchAll') + ->with(\PDO::FETCH_ASSOC) + ->willReturn([]); + + $this->mockDb->expects($this->once()) + ->method('query') + ->with('SELECT * FROM pp_shop_apilo_settings') + ->willReturn($stmt); + + $status = $this->repository->apiloIntegrationStatus(); + + $this->assertIsArray($status); + $this->assertFalse((bool)($status['is_valid'] ?? true)); + $this->assertStringContainsString('Brakuje konfiguracji Apilo', (string)($status['message'] ?? '')); + } + public function testAllPublicMethodsExist(): void { $expectedMethods = [ 'getSettings', 'getSetting', 'saveSetting', 'linkProduct', 'unlinkProduct', - 'apiloAuthorize', 'apiloGetAccessToken', - 'apiloFetchList', 'apiloProductSearch', 'apiloCreateProduct', + 'apiloAuthorize', 'apiloGetAccessToken', 'apiloKeepalive', 'apiloIntegrationStatus', + 'apiloFetchList', 'apiloFetchListResult', 'apiloProductSearch', 'apiloCreateProduct', 'getProductSku', 'shopproImportProduct', ]; @@ -201,4 +265,37 @@ class IntegrationsRepositoryTest extends TestCase $settings = $this->repository->getSettings('shoppro'); $this->assertSame('test.com', $settings['domain']); } + + public function testNormalizeApiloMapListRejectsErrorPayload(): void + { + $reflection = new \ReflectionClass($this->repository); + $method = $reflection->getMethod('normalizeApiloMapList'); + $method->setAccessible(true); + + $result = $method->invoke($this->repository, [ + 'message' => 'Missing JWT token', + 'code' => 401, + ]); + + $this->assertNull($result); + } + + public function testNormalizeApiloMapListAcceptsIdNameList(): void + { + $reflection = new \ReflectionClass($this->repository); + $method = $reflection->getMethod('normalizeApiloMapList'); + $method->setAccessible(true); + + $payload = [ + ['id' => '1', 'name' => 'Przelew'], + ['id' => '2', 'name' => 'Karta'], + ]; + + $result = $method->invoke($this->repository, $payload); + + $this->assertIsArray($result); + $this->assertCount(2, $result); + $this->assertSame('1', (string)$result[0]['id']); + $this->assertSame('Przelew', (string)$result[0]['name']); + } } diff --git a/tests/Unit/Domain/PaymentMethod/PaymentMethodRepositoryTest.php b/tests/Unit/Domain/PaymentMethod/PaymentMethodRepositoryTest.php new file mode 100644 index 0000000..6df4a40 --- /dev/null +++ b/tests/Unit/Domain/PaymentMethod/PaymentMethodRepositoryTest.php @@ -0,0 +1,337 @@ +createMock(\medoo::class); + $mockDb->expects($this->never())->method('get'); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertNull($repository->find(0)); + } + + public function testFindReturnsNullWhenNotFound(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', '*', ['id' => 10]) + ->willReturn(null); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertNull($repository->find(10)); + } + + public function testFindNormalizesData(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', '*', ['id' => 11]) + ->willReturn([ + 'id' => '11', + 'name' => ' Przelew ', + 'description' => null, + 'status' => '1', + 'apilo_payment_type_id' => '7', + ]); + + $repository = new PaymentMethodRepository($mockDb); + $result = $repository->find(11); + + $this->assertIsArray($result); + $this->assertSame(11, $result['id']); + $this->assertSame('Przelew', $result['name']); + $this->assertSame('', $result['description']); + $this->assertSame(1, $result['status']); + $this->assertSame(7, $result['apilo_payment_type_id']); + } + + public function testSaveUpdatesRowAndReturnsId(): void + { + $mockDb = $this->createMock(\medoo::class); + $updateRow = null; + $updateWhere = null; + + $mockDb->expects($this->once()) + ->method('update') + ->willReturnCallback(function ($table, $row, $where) use (&$updateRow, &$updateWhere) { + $this->assertSame('pp_shop_payment_methods', $table); + $updateRow = $row; + $updateWhere = $where; + return true; + }); + + $repository = new PaymentMethodRepository($mockDb); + $id = $repository->save(3, [ + 'description' => ' test ', + 'status' => 'on', + 'apilo_payment_type_id' => '22', + ]); + + $this->assertSame(3, $id); + $this->assertSame('test', $updateRow['description']); + $this->assertSame(1, $updateRow['status']); + $this->assertSame(22, $updateRow['apilo_payment_type_id']); + $this->assertSame(['id' => 3], $updateWhere); + } + + public function testSavePreservesNonNumericApiloPaymentTypeId(): void + { + $mockDb = $this->createMock(\medoo::class); + $updateRow = null; + + $mockDb->expects($this->once()) + ->method('update') + ->willReturnCallback(function ($table, $row) use (&$updateRow) { + $this->assertSame('pp_shop_payment_methods', $table); + $updateRow = $row; + return true; + }); + + $repository = new PaymentMethodRepository($mockDb); + $repository->save(4, [ + 'description' => 'X', + 'status' => 1, + 'apilo_payment_type_id' => 'CASH_ON_DELIVERY', + ]); + + $this->assertSame('CASH_ON_DELIVERY', $updateRow['apilo_payment_type_id']); + } + + public function testSaveReturnsNullForInvalidId(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->never())->method('update'); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertNull($repository->save(0, ['status' => 1])); + } + + public function testListForAdminWhitelistsSortAndDirection(): void + { + $mockDb = $this->createMock(\medoo::class); + $queries = []; + + $mockDb->method('query') + ->willReturnCallback(function ($sql, $params = []) use (&$queries) { + $queries[] = ['sql' => $sql, 'params' => $params]; + + if (strpos($sql, 'COUNT(0)') !== false) { + return new class { + public function fetchAll() + { + return [[1]]; + } + }; + } + + return new class { + public function fetchAll() + { + return [[ + 'id' => 1, + 'name' => 'Przelew', + 'description' => 'Opis', + 'status' => 1, + 'apilo_payment_type_id' => 5, + ]]; + } + }; + }); + + $repository = new PaymentMethodRepository($mockDb); + $result = $repository->listForAdmin( + [], + 'name DESC; DROP TABLE pp_shop_payment_methods; --', + 'DESC; DELETE FROM pp_users; --', + 1, + 999 + ); + + $this->assertCount(2, $queries); + $dataSql = $queries[1]['sql']; + + $this->assertMatchesRegularExpression('/ORDER BY\s+spm\.name\s+ASC,\s+spm\.id\s+ASC/i', $dataSql); + $this->assertStringNotContainsString('DROP TABLE', $dataSql); + $this->assertStringNotContainsString('DELETE FROM pp_users', $dataSql); + $this->assertMatchesRegularExpression('/LIMIT\s+100\s+OFFSET\s+0/i', $dataSql); + $this->assertSame(1, (int)$result['items'][0]['id']); + } + + public function testAllActiveReturnsNormalizedRows(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('select') + ->with('pp_shop_payment_methods', '*', [ + 'status' => 1, + 'ORDER' => ['id' => 'ASC'], + ]) + ->willReturn([ + [ + 'id' => '2', + 'name' => ' PayU ', + 'description' => '', + 'status' => '1', + 'apilo_payment_type_id' => null, + ], + ]); + + $repository = new PaymentMethodRepository($mockDb); + $rows = $repository->allActive(); + + $this->assertCount(1, $rows); + $this->assertSame(2, $rows[0]['id']); + $this->assertSame('PayU', $rows[0]['name']); + $this->assertSame(1, $rows[0]['status']); + $this->assertNull($rows[0]['apilo_payment_type_id']); + } + + public function testAllForAdminReturnsRowsIncludingInactive(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('select') + ->with('pp_shop_payment_methods', '*', [ + 'ORDER' => ['name' => 'ASC'], + ]) + ->willReturn([ + [ + 'id' => '1', + 'name' => 'Przelew', + 'description' => '', + 'status' => '1', + 'apilo_payment_type_id' => null, + ], + [ + 'id' => '2', + 'name' => 'PayPo', + 'description' => '', + 'status' => '0', + 'apilo_payment_type_id' => null, + ], + ]); + + $repository = new PaymentMethodRepository($mockDb); + $rows = $repository->allForAdmin(); + + $this->assertCount(2, $rows); + $this->assertSame(1, $rows[0]['id']); + $this->assertSame(2, $rows[1]['id']); + $this->assertSame(0, $rows[1]['status']); + } + + public function testFindActiveByIdReturnsNullForNotFound(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', '*', [ + 'AND' => [ + 'id' => 4, + 'status' => 1, + ], + ]) + ->willReturn(null); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertNull($repository->findActiveById(4)); + } + + public function testFindKeepsNonNumericApiloPaymentTypeId(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', '*', ['id' => 12]) + ->willReturn([ + 'id' => '12', + 'name' => 'PayPo', + 'description' => '', + 'status' => '1', + 'apilo_payment_type_id' => 'PAYPO_DEFERRED', + ]); + + $repository = new PaymentMethodRepository($mockDb); + $result = $repository->find(12); + + $this->assertIsArray($result); + $this->assertSame('PAYPO_DEFERRED', $result['apilo_payment_type_id']); + } + + public function testIsActiveNormalizesStatusValue(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', 'status', ['id' => 5]) + ->willReturn('0'); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertSame(0, $repository->isActive(5)); + } + + public function testGetApiloPaymentTypeIdHandlesNullAndInt(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->exactly(2)) + ->method('get') + ->willReturnOnConsecutiveCalls(null, '8'); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertNull($repository->getApiloPaymentTypeId(1)); + $this->assertSame(8, $repository->getApiloPaymentTypeId(2)); + } + + public function testGetApiloPaymentTypeIdReturnsStringForNonNumericValue(): void + { + $mockDb = $this->createMock(\medoo::class); + $mockDb->expects($this->once()) + ->method('get') + ->with('pp_shop_payment_methods', 'apilo_payment_type_id', ['id' => 3]) + ->willReturn('BANK_TRANSFER'); + + $repository = new PaymentMethodRepository($mockDb); + $this->assertSame('BANK_TRANSFER', $repository->getApiloPaymentTypeId(3)); + } + + public function testForTransportReturnsRows(): void + { + $mockDb = $this->createMock(\medoo::class); + $capturedParams = null; + + $mockDb->expects($this->once()) + ->method('query') + ->willReturnCallback(function ($sql, $params = []) use (&$capturedParams) { + $this->assertStringContainsString('pp_shop_transport_payment_methods', $sql); + $capturedParams = $params; + + return new class { + public function fetchAll() + { + return [[ + 'id' => '9', + 'name' => 'Karta', + 'description' => 'Opis', + 'status' => 1, + 'apilo_payment_type_id' => '4', + ]]; + } + }; + }); + + $repository = new PaymentMethodRepository($mockDb); + $rows = $repository->forTransport(12); + + $this->assertSame([':transport_id' => 12], $capturedParams); + $this->assertCount(1, $rows); + $this->assertSame(9, $rows[0]['id']); + $this->assertSame(4, $rows[0]['apilo_payment_type_id']); + } +} diff --git a/tests/Unit/admin/Controllers/ShopPaymentMethodControllerTest.php b/tests/Unit/admin/Controllers/ShopPaymentMethodControllerTest.php new file mode 100644 index 0000000..ad4c536 --- /dev/null +++ b/tests/Unit/admin/Controllers/ShopPaymentMethodControllerTest.php @@ -0,0 +1,57 @@ +repository = $this->createMock(PaymentMethodRepository::class); + $this->controller = new ShopPaymentMethodController($this->repository); + } + + public function testConstructorAcceptsRepository(): void + { + $controller = new ShopPaymentMethodController($this->repository); + $this->assertInstanceOf(ShopPaymentMethodController::class, $controller); + } + + public function testHasMainActionMethods(): void + { + $this->assertTrue(method_exists($this->controller, 'list')); + $this->assertTrue(method_exists($this->controller, 'edit')); + $this->assertTrue(method_exists($this->controller, 'save')); + } + + public function testHasNoLegacyAliasMethods(): void + { + $this->assertFalse(method_exists($this->controller, 'view_list')); + $this->assertFalse(method_exists($this->controller, 'payment_method_edit')); + $this->assertFalse(method_exists($this->controller, 'payment_method_save')); + } + + public function testActionMethodReturnTypes(): void + { + $reflection = new \ReflectionClass($this->controller); + + $this->assertEquals('string', (string)$reflection->getMethod('list')->getReturnType()); + $this->assertEquals('string', (string)$reflection->getMethod('edit')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('save')->getReturnType()); + } + + public function testConstructorRequiresPaymentMethodRepository(): void + { + $reflection = new \ReflectionClass(ShopPaymentMethodController::class); + $constructor = $reflection->getConstructor(); + $params = $constructor->getParameters(); + + $this->assertCount(1, $params); + $this->assertEquals('Domain\PaymentMethod\PaymentMethodRepository', $params[0]->getType()->getName()); + } +} diff --git a/updates/0.20/ver_0.269.zip b/updates/0.20/ver_0.269.zip new file mode 100644 index 0000000000000000000000000000000000000000..b78a7e48d7370672b4c13b8b6a80df0df7ce1cbc GIT binary patch literal 30115 zcmbTdW00)jmNeSNZriqP+qP}n?%lSz+qP}nwr%^{XXeaz&cw{UH{w>rTW?jx`jJtQ zwJLMvdgP^mL68Cd@u={W)&7qc|9pb~dp9t)v9Q&4HnFj{HgGm^(w6^cH3Wc`yR3FS zq`JTqH~>HZBLD#1|59yX>uh4?Xy9yNXX~VGU~ge}+9c=0t06Zhxd@W4FNy z|NTeL;VE!zn38L#7EtQ5zH%${T1c%D=Q)oYTGJ4Fxt=^uS-WG(ZztZ9h-59Mp;BTU zK<2XJ;BIfrNleK!G_k-)BH8dxyB{Jg3z1;79ctt}LE?5q-qMTSBK}W*$BUVm*a)!! zLXM<}a{Exc(H^@K^XV-_uMoHzv0)x~0fTm&_D~v=*$D?W>^)=FK+8aGj!b=_6Yl+rWo`>|3E@RhvxU+3p(QL!Ne9YBe}3SG3NOKrO0a&EpBqRj1{pJdE3g?*Q#f0k^Khc2N446y_$%=ft6MOubSUtebo4kEd zp%?ufMaux@3HD}OKuzFVp1WfIN z>d0`60gy!sCYC8Du!CN@!E^Wq5?Ns$Wyub#EtrMnm|@pI5zVogJOQH2P@;6mot1b% zf(aw9@N3^E47 zCLebhgqD)lQmu6Mq%ul_z%BgVuNYAZ_5@W5;*zf?7g2N10X@UFpqR+`hC((2j@Qa( z1AQ#|^#oS-X*%H|l%nk?=wZAxE+YP0tD^06n~G(iu1Xf_Dz$w6myA^OHRyu~m9rWU zp0&@mj72wog#T`4@WC8a??Rwb(Iud2nL-O%nI_q&vW){&z@A}^dF&eJ(Sy5UYGgs+W1Af}X-2*bmF23WWaG~WNtV#DAAXGC3&8NFC zMd;EmwlqjM0+NAJ=G^u8^$BUun~b=X+c|u120lxN zK%IMRg?EvdL9`*lyHVfAqvnyi=mfw^d%Oj6Hm&3`28wGu1wL`YT^O6-J*W$o@w+is zKhqQqA@doAvpIc}ghC6SPu&t#ZsU|u!HO*Ac*8^Q4m4UThJ|hS(a)eM9eewHOzYK~ zNEEO4Oi0}azov>jCCb(KS;JoIajFb{hFZMEd}}xc49->z_TthRU&#BN!65Kmc#BGH z*9{nWdV?2`S9V!B-sT{-YHNm=OA0PgDNq-JlJ2JL>N9!j8|4v)EC$rUvfs6Pk?|J7 z+%dLmgkVx_-n)6QIa&B)V`f=;3%CwDXn*U^genNF17yLpTQ(yNCD`Z5!JLuA;CkmD z5pH#3wnFcd1w7wB74fTGs_MEglj$EBBi^8=fsroHDEH&-?!T?ViA5S7Ch@-j5?G|~ zk6^(IO>lq_X*IY<>8dTl9O+9eGvb~QJy@5lBCt^95XNX2sN+`R!eDgnVEzm}$)pR(AFe#xVuV;fuD^@kH8HQxjBe?}6hiF5JbyLz5>oN~zV#>eZ(8DA|T><8A=+O79=EXGQU zoLh_4MTznLI>~HFVeawr*6iz7C9YeN{Ds2%r4%7{JCez#_k=`9+*CC~ZKQPiyIfEE z7hb>!n(h=Gfaz@R6%?ieqAQNvO7XlE(d3u1RbWxpg%-T7wO*np9xO?Xj^8;l{R%vn8+s{t8K&O3+>{cQ4=6e363@lw_wIPLXn+5(V0^z?G*Z-mnoXqX)Y3vO=Y)ovO zX>3fK&Fze}|NC1S6JrbKf2f3px)zl%NQ%+AdddlDniYAu=^2{Q8L25Mienr5H|J#g_E?4}Y>M~ZKUR<;Q|3YT*7g@uB&8g^LM3R3m?*CuN zoM@~qoc_O{(Md>;ODs)|QPch>HYVhMgLdxoprq(z$Wn!JdDZ%F_{{#|o1d$BD~ARE zSYihNApYO*SvZ?$+Zb5b(pVdK*tz@%jv*`?r+wD+BxP!BkX*%aN>RR zt~g&D$O|I&XXANc$8H-T zkz^O6A_@O2jYos#An9@3o(&T?0>l#rA`Gd4Kz3`)(ed(qoHzFLMHwOoqeq{GAfz86 z3y!0T$JwtYTjC&c5DB})r?8_erq&0U21s&Jd*(_H5?l1PlOup z^q00rERSykfRLLK7uJUHq8F6v2cqp{mo83{pzBu>C0m^7VP}XEvCjVF*tSZWhv{!flYM@y2 z<;tp7GQj^srYxL1ArvlJtIhQ*w#Wg;i6ktFBhgu6GDt{%t^JVdMe1b|vQ*hbk0&f0 z|BBsRgg6!g{(YT?fjOcDPQaAXJkAT?$!xIYOw{vUC=m2+*g%n#*hj!fWsrMB%KFAN z4%ruq%}sVo>2+t-50)70&(H&Q<2Zqfd4$s$NkoWpRm02)d}&Hr6~8SBA7A!8Yr^sK zz7MWg3un|HCDvQ(;`vxPesb8HMDe_=shcv>nMnaBO+U`L(1!N~3+CdDd|Ez?Y={29 zIP5TOrTr$nQ2UVJw+O+`>u4x&{9@D}U*#zkvMNSYv9J|xg+CtGr--KA=?Q_{T-WYz zolNKt`q>0J zhKtC6F^pX6g4qRvCJ5dijz7I67a?rL<;89wLfB_RbeYg284pSFkrp?mz5H@*5id?J z@_+Cr1F$egc>w2WI6MbmpH}yDK`kZO6zg;Ik23l0|{TyfH7sH zbkjWHK_!o43(hyPdxk z@MB^#qxAd&(MJ(|Oi3|0T<;G=S`=47jOu<+$920f1F>kj?0|FXP}$JJ4FIlSk*rDr zo8PWvD@URtIb{!M?2MJ8pqBQJXRgvg@M{)z2;XV$28Dr6^t7|B@s}z*I^=<4b(fWo zp|Q9+aIfmPRuEo{0@vl@^@g2NBzXB0Ms9>6|K5K{H8b<6L=UyA>ApsrpYz=VAeGn?Xuz(L5(BUO2-{GlCi^rId-%6a$K_+a}v0A`{Vm z@uSheAQPk%Gdz8)&q8 z&6omkKp75Cd)q9QKVL=6960;gY%F`iZ2u;2`lT?X76*IQ)MGGJRPW>U%A_GtN<^=4 zvp}ROV#dK5%TI?rzDyGzv~YdE)frIDPh_!>q=JD?0pxLq z@2W{pdNg#l%hnc-3HQrzsY?~A+i=k?u~rCu4N0l|S$_~LDyYun00#X%bK%>x%RCXe z89OZmE*}#!pgF3Lof@x&l|KREBNJS7Mbl-}u;+-iPZv@@m6!Q!THB=w|HdRQDP%VkmNN=jFrq*20zd&an-3*mPmC z&xZCatfIPfIHs$p(db^}NJ$5V#;@5(qEqLTtFSwL%=J{Kzzc7WA;)qUN9Xko5IyyuD~7V7Ce!0kF~Z}l;J-v7O0H=z%zuEZOSbD zH%6};QF{wWh3;9`zn0bMdcgxn0F}#z@!KkQ8ptRxZ}3Vh^k5gv$h8k!j0x*I#9YjS z!}tzlB6Svj|7=p8`{IB@l6b&7jg};_45-1`M-{#dC5WEwl2l&;6JiT8uYceKXVkKu zw!L|ihL#dHOP%Q}9fyWM`Z%WmlyX2-AiH)4f_gKa8IS1qR2z6OiY2U@HvFlE9s>JW z-*b7=RO(T>N57z&wT1lMOy-&(?vxhNek_4@rqskp(Y45Z8DOq&>#SU7bOnF?4M9i8 z&uWUv)9pTN@yhDg03b_O8daL)u3a-vk;2TfilpNee*(gHh^Scuut_?QG;dkSr+3mK|W+aOTJ9^7kss<9g*ye5F1msVBIq> zD+^atlc0e-zZ?2XJG?h%FfhD$=z4s`PWiPjte#aLJ|= zdoSnGKRj=Y=0-axsL((bC6_tt!W?{|%nDz}IzmZE1g+$Qudob#g?vawdghB;zP`KG zeVG8T28zfJ`%PN~+*#RL8gD;F2VT_L4L3S2Drdtw42di)m~ZDD1&Y6Em~rq?VVB$5 zE^p8j^$sL#}4Zht;@_WKxpY<`>}q_|*E9OoELFsTy%chJ%daI0CKQH|WZkIeCE zk-Q$jvu1Kh+dL|r_10Dd|5a`3XlLvEe~TdiO#a#^3anSVyK_(!OLNO{K^(Q4RHbtuokC5*G#dmcfWSKK7rdo9ej&Z} zQi8FLO_|L^Jc&w6uzlL5eZx$z)8y9jCX7c7&lgb{$wXb2Lt6Qi2yum6P7m+N#R8w- z4+o|Q+X@h49ycK@=)P>{?%Y&Urd5m_duTP_*KW0!*GJyRZk|)iPa=s3;BDIA zA7F*~mpcY=AhPFv0C~*2E~fQF%coEKQ&3j;;ZbBw$dbw+o^&+myrU4Leb6C0GH5xT zb)*!RT)Yt8M)d4ii5x~{YkqIpJeZthcmIRyY1k5nSfy!&dYBY_JC`JMb3V#Z?em2+ z%p?a)SaG`ifXDlE@Gi)v4UGi}S`3mX4o-Wt!2&U0GUqZI@vC0Gb~{+l8@T5Vxfj@%oTv7h=k}gU zHzuKYz?TqmVA0@M&jLsX>&V#Ab^|o6PBk{3w1ju!@3Qh* znJH_? zj+h@3fvhec_bf2;Z1dmvlYn7~yK0j|KJqXOrX_N? zF`SRO>Ci9VJINC6a@<3h{~DPwKDhJxB>m|sQV5fUURy*}MI{(eqH`71FKFXLx@UHx zzg8x#F~ZC{&Y?3t{R0dhvGr%~K zlqenGzSBF!*B90WQs4y}xlvBpazsXcCep>hfz0KipC z(cs(=lHz;6KR)tMo_TzaG`*IzK3V_Az}xmammN2fo{N@NggwZYd6f&A3|+g~6fVsr}( zS{eFMKLVW^7@gj182NxROo$zd0ZC*whu|@|#6U7Iy;heL9vTH!C`nSphwwF)0yVc( za!~xd?Ukfxm&`|;);DLkgfLrHgee#Aj-gvSyckmH&TpE??~F-OHhPbhw6F?L<3~K5 zEp2&5k~2G!qeP>`<-f50$J`VYb##ZB3#F01vBPKk(U%G0lqM#zrz@q7k&~q zm^57H;r8s@mgy3egb*{@MXZjg$`bf!SwNl~ZMXNwIhay9 zwx@SV|EyIrl3FZb{&r`uOH(BjL_RZE#$JR6e$GbCil7OAP1sWdyI$y>(_NQ5VdxXm zt47LuZNYLPsE0;hMXuLavdkWc19q}DL)K!h1POlT;fh`a#dy?uc{Oj}U@2?exyfli zapx6{RcOlWNx=?0b9B^m!jKzyx!#dUw=6m)*3F+bTn__q2$q#YE3>&vb z`==jem!~DyUWMiw74t6w5epDfV!>1S^W;XfNR}ClNDROx!rlaa5EZZPRqs^LygK-w zEOv)c?(wVVm~}T~9hcw=Ln*Ys$wN7%9W??*G!p9K0*V(#lXeu2pq1PV1|twt(Ul^D zS__)7Ilh~kF$fNpU<}jnP|N(I#r2r^{H4X^qICo{L+MgB|Fc(wq?vbqcmw4UG1C}3^SHA!eIdS;h!(^@eS5|s{g!7T|0keQR z9n2Ako{AP;qs`v$C}zL6X$y!E?cKVSLy6<<{1)psv3y_etbRB~vshPI7 z^wc#dWUv&fH(p~+0Sgz?5*ck2ZnxtuGaPKQekj1z7lBr_LiaYtLn>5BDyx3{N-;*fK>>Z0=l1BL9R)C>zOEu~=FysEdKCdFL)3cTi@BFmlSb()6EAw>1M6-k`DUm{p z^ILLs6Cmz^Fyu6LoH2jWH(|8f(&5F~jQo;%X z-|wF3rxFjc28MBMGI@Aj!A;M!#64kdj=mNPSxn5ZX~MtzDqk#PmnuJzM_6_WyNT>z zaGi4tfc~N(T6w=9Nbs%d862Wdwm3UaY1Lc0>UMXsFT9owzu<7Z&=_xb5TZ=a_76nS zkZi(Yvz^qP?;D#vZ$(N`0UWvSWkXO z3_v$~r?@|g#;7n$UoVYGmu&l)`*Ji}qIC~jI1>m1B)@h+$#M9-V`!iW9aT0lOiMi7 zYot9GT}ZhvpySO{Z5L2<)1M5}LqxY1x7hVc$4=PrXad+KpliI86LD3Xmu;jmF{W`G zXqwoNl*}<+%B2q$wCMt-ESVpk73cMcv_2{2!`b$;?qpYNvL^qi=~wBs)&#Ef_O{u! z_gw|!9uvMwHcbIyNoKZuajwfK`X|JWCIJs`Vx#ak)_p+o^O$XjM}icV_^zr98bHmu z70pWVuffyshnhd)SJZ(G{MD{ErzwPwkq_OQ@k1PV$~Q#tXifl#$9C$&rf3(@nuah(VrVI%#xUir+bd3whz;FHj zOLjv5F#cWJz(}8+X8;8Ns73<-VELcgSm>{scC@p$HgR;)miV^~j(>gr56yg~uJw0$ z1KIbbh8-A491PoR<~ku)TmfI59%L$lmpDK`sc|X|6*M8j6y@!PtB_c;o1}$eM~C#G5G|2p0WuF-yz%gEAUP^JL6E+P@6of&^j3lv5?6a9WD1!WjX`*pR-y%AY~9dHeqs8MU;VooN)B$ zKO7T+5biPyOd}_a`$*8c+dEA;y*a&aL(TmqXiTQplqC4}n?R><8Pbv_Fbo!CL}E(7 zchd@?EUK}yd_W0xq%)KI_tYMZke&VVLKhf7zOk&;C{SsNiUiPoiZc;xEsXgbb8$p| zUE|`DkcI9f2h<_fzval$NCSn1T2&NJpq=v%g-wHjB;z$E*XaF6;H=)1riGnx@?Jwb z<{%h^FE=|FVgtve#onZa$1$C+qlxa7y?+^C6{7~ub8T|~)A`6d+#Kw@gp9ZX5Tn63 zcc+NsleZ0;)lvErGOTmou50F?^;^<+R?_G@)9y)3xKA2V5}__Dm-h92?;rc4oCZJM#!`a9lQff;+%~r0;00&!$e|Vh3dZg@Pp=?$)W-jv#+!>W z^u)HV^d2qlU($VaZ1mM$Wo{7!3=<)8+BGXqaJ5) zCz?drtr95!gQO2=o26-s;oO#qr@{~f5R!Az-@l>?(>*;itE? zu9o5HLE&zfl4|#)=^w7E43#M1oOqQd+uL6l7Xa+CS}EovN?1Ibk0qfqgw>ahl{)jN zO^PCH<~r-t%>|`9$3xY~OcXJ_gJjnw&edT9dA~(?HMpj7pog7W;H7+_Ew-=nyR|A^ zAB7O1Z!%o5_2cV8A-mip_$;h^d=W^G9L6)U0Hook9elgmK;+haufVGW4ZJC+_>pJC zwFYWa`7Wa^Kitm>$vgX^MfBa}7>8k=E$O0b&JW?6X~dI08t!GUXCAyv)-Mp)x=lFb zrj|c7Yun~G?HfzVsZZujG0V?QcV>s(?{hz|kE;D%voFT@bG*zn$+H#NQ@EV;UmJ>g ztiHE}%HOJ|dD|>6sL%Mq>_Tv#Yyzax{BDZZe}wt8JX9Ca#4u1dwT6kBr6(ytVvA%c zMA#7~Quy5>#g4vNzOP*ZzH6`!f2gE$MCX_>atI@IV?qmlpcnyKI+^6*-QxpIvC)qa%D}DEDGb& zVT#6srU4+DTcNwAX~Y1vB}VI*9XZQg{W|hw-l#i{?VB2d z(O4Q0IxtyP%x{9XJZis~YH#qi#%||7u>RG93teTk)nxQzvmgNg!bt%DIRD>!u+rbG zT>d|!a+&`~%Kv*KuF}wQ+Gt1k+lYH5ctVwpH134VI32B5WG*=@oDv>a&mt==^%3jg zA5`P&311F-+|c}mH^nI|I1<%C&^jWAbh|-y^^_yeb8|T=s50mU7qZaY?8fsEOi~yW za&WP!twgs|IDW(BoN}6pJWyGonppOH4VTv+%TO$rIEL&$%1x{Gq)<#)>Svsg)VuG3 z+NgU<-7qzOZ8My;Be%W(Fj}~4ToQLkdNlAYSWVYElcAXZG8JdkTsbsVP+e}<(!%*X z@$XfF{06xo!dWH=?XOMBsOy|@7d)O2td5^FmC#s>RwtF|1Wyex&JR9tTBUa9;kJVu zO{YN)@BS@f)@i%nm*(%R%iS7vp~&27WjAh}j>dAEEzBJqBOZ(!>~|5uI)Ujo7h!f( zsdzq<;WA{(&&gxcHs!HQf0r`l(WlUQ*zy$>`xPShIJ%6$!L=j)2+8OI(KjPailGkD#;N8Lk<#11$nlk&2Nq4z;<*VF^ZYifD71Hl(PzRvME< zbFWq$bvS1s@?om>81VE^llDp+-Vc_FA#l>5b^F<_!?=1s|AncQDAJbj)+ddx0ZQZ` zF2zVp27Et4`!y=%IDem>8aQVRn6)U&FKeX^+f3X@8v44iq4p==SeH3S9dVSIodgZ- zaA|jubch>tFy+IVbPSucB;ckMNyX9O=rjo_GA&dw;xyS zjx|-DnryM|RzKM|Wx779A z2KWusG<^ccF_sX55ZtC;S1<1MFC@WCu|k?=ejb*BE*?Ud%1(-Md|~EbmvKNIXjHC6 zwI^KljvvTj`NLHHY9_?F^4Gce{K{y=hu*&&U2l0=Vu(RM7EWT5)>lf4!&dAv6^l<-{TOeMuPKX%!@I8n`W@KyZqQnCq?&%N@jLxMeF~{)VXd zlN0?NO-*r*OHuM-az6oD7Yh1Hi)L_WG@ zlN>#AdOut2pO%Npv}ky_;u&U0jmG~3{l0K8DzFA6szkbf z>XR<7y_a^mDHRI*F`lU}@|~BBmH+!II;fg-MSx1iv*%DFqC~?cy2-|MaVHAqdHXJd zmtpg+B%vhWYg&@h&GY%}VCu>ulxlQZB*>RX>`5K?{$XYiH$g`XS!1GSHg}k?k$iaY zg#xMc7S=7P!YP?&z5KA9QPD!beo`h$$zl+N@>Iovx2|hszFs?x?5eru|%jE+1s|O}21{ zgFY_4y7d4VWTsN^GeBRuaW=7gC~dp&*n_5zIy-h?-!%u)OktgVdX{}w5(gk=1B`jB z#AgsTH+g&kddtcC3;6697YD;r`l`)#hjaVYjDu~fg@lDrSBMu9$e$lEiVCE@B5o8? z9aLsWwh(7`j4cQEi^~BFGgov1sVW>+9x;}9gskPf3v4^aPo&2yk`edLU5oJub)40p zJnS#%abpcO6Wot*kS=Rg$dDq6*{JO=AfHe7$w$Oi};#qxI5OT2q2+b-9=W<`StFww*W`o%_20hJvqIclQY&UY1mkmFfs+|(34jaBN zR6A}v4MGM=kW}pk`FI=d-uX3TMnOd3yg|iO)47uS8(FYwK$Q1{=lj*Lle|zKiyOeE z2=C}(8YQ%$_U{U4E&8I6Sc`B7xlW2jvm`)qc zYG<5p`@o3|@z3{8(bOi>agqnq_}AS`g)rCV{$ZTI6!ZIjO28K7Y>^61HQ9JyOQ5uW zdqvjuE7FQ1I=d8Xws(nTRebb!xQPtl23z-9nx7eGtPS#G+qgm@#avsXmVWB0-H@);{l$Fgk6@#MCXLVoU2g(gj}MgA&M3(JQj za)72fkz8(-1SMTX;okSrgK}Wl)d^^xNDC%NWmqzFo55P0!NNzQGtl1mV zdB3+0Zq-8^Ver}SUsopTv7AS9L_U4pq@vUas{4jK0%@qaAqWbz^(<$cjJzDpCkKa&4 z)kwm>a^F#r@+=DR*_xdkR1<1Ns>lvnvLe}GpzmZ4fPaOlPpTF+yJyNugR`2rRY%jn zLBs-8al_jm>7az%0&;o}H9=lu17w;GpTH?@H~~NQHQN ztHQXiR5?m9P5b06Q2UpJcMd=6J+M{aB-*edZz!@X`$JRW=qk2U$)x8z5#>xyJVJ$= z8u%{j9(8&Q>`3k~U4Y>bO-}eXlxQ=vHu$#JUCi2nd|BlMD04McLUrjV4axsaZtf$j3&1(Y@`yq>{wzx6D1Hw#ql?Pa>) zj6DCuh^guP8O~z9W?{W})fDiWR~Zr(dXEyyN7#1m>GK>|7K@D)Bb>%6n6`ECv`zE) z6Drwgx2h*t?3=l+b-rj|*_lb35qHN`|9Bx#mjI zKtjKKBX2kNkA0z!^c(kOlVTr{6@5AS{Wk2{MIRdF`hEW;o=@*%aWw1~6Z<$IqsO zqZdl=%QA>r6Y0r^TBjEZJ@TK=M4vs11d=u#E@s{q+RCjidsS3I>vD&H28#6C-~FrO zB~!p5+cpr<+XIYTt!8)rW2IWqAb$`j0SEfST47?wTDW*lSJWtqJ7W0&h-|=14a_LP z#m4r@k*EFhI`kygXqEU&r0=UV2(MlDMh4t;?K7xs`jjBXqr6SN)Tja~j3*-lbXAdv z=B)#gG={KXZgQ6brxUEX6kJ%n<_C1?aQe!9DQ<~9uJK~YwTlXE%#%ely^`g?J?XkW z3pUD&oAk|a?ZWHeP%P3Z#*%Fn&>98v`r9V;f7rpQ``#E8Y^0?rga}4Is8=D=UC9Jj zqjIC(#rGPc+GGjD>eP+2${-bDG)2zGgG%KkWW9OWE&@X#lr!SKZ=9AYlU z6Zqxif1!tLOOVzf!vAB!2h@6V~lb~^%R6^r|L z%kGmuHIQp?zn`y&=@GmRhX3H2f!KJcRmQ(h{wBr1gc&|KSm=o=KKR0u1tV$+IK*#!LF91Yma!{vAO9nxlwjiPp2(>Kn$;bPWS-j}8JdimN+R;6vfFXW38%ve z&z#M;p0GK^ndIC!wdYIIu|975<$OZYxq%c^AjgM_?#1)i^YfH*3l}Y1v;T5)l0yN@ z@g68=p)=?SZZww4cpSpmBl*wC-`HPgYlHRe`@z(rX*&Ff;c(eqoYbb(qj0>2{YlimoE-w($tSK^SDNFogQYNRa9QMrTiLB>8$ zNY8d7m{zC$l&q*hyoGl201ZHC2l!;hxG-*ERd76goQ9y`lqbEI!NCVxdP^(IACgV9 zVD}(HjH^gT(v}>l!!_gB0GO)>VxrW+VvGvd8HP3K*YqO>%*(^&^9$m|;#h=303s&I zw<4s&W^br|5M}4Lv9LD0@*A?yLeOYM4x|=5gjp#2fG7KeFuq z>jF^>MI&`PQQknek_U2E1<*q073%99&*8BI{gV)0(%qO%%8*6R3a~;qkuBIy%Y=LF zg=hor>qn(n{Ij}P7g+|Hk$JC@Fhf(xwGA4Mc2*Ab%<#fP-|POTvv;>2Cnsi>Tl$mL z+T*SvGj2Br-si@UKJ#@xnc2Wxt4#~?^QpVNBl~&28^vu@aFP|y@3RdWg)ZFK8C|$% zIEtr`v_F>>j%NjU_P;P6L9X(tvJ(8>nlGE=G2NdE10!x>P1;|2XIG(g8}+#)GX^(ndW1zE^lj$Ya>@R?Z0uRq%7_YFb(>uI z(i3OhL#*pAJ+}bahdY@={%D?mKhT1QhsD50tuMkR6j){JL4e-4tb|v zFX+sVz)g!Rf6N}DZ!nwj{j~?z%(@A1=?|;}#cP5Z#Gsm|5>GD=L7nCzAKGBpQGh?^ z{Epb=`5W6z3&x^_x_utAARm*`mPk(Cq6jkfU=~4(3$N(s7tT|AryYn~;7*&cK(m)&i%5BZtNx4|Z(=_b* z+d6nFt}Mj8b|Z?_F$s8{T7UV}jI4?ck&MBh(Goe1@{&_AK|}1<8%V>)Bf`o@!X!F0 z_`w1WPIkOM*QmEbblD%q;T-O0TkcTIdYik*1^7LJH~7s0`rh+gIef4_8NZOHps4*& zf%Si9=`Ca-Y?b8cplJ>>+`YzPa1XN;&a_cFA6nFGkB;p%*4kA*fY;heOL5I+v!+Xk zD;dPjY@2OZfAiEJJr*(=VD}-THZrQ{x8)aX+KfKPic>R~HQEEz4px z_8;cM;hhUeQhodu`x%x~%8<3EZ7rg(7zwMAZUxChQ!TM<3KMlXsq1}wYgGU*s5=Ox zAfGfMHb;#z7;G|;P%0gO+16no@<<}8zszwn<-+ycdif{|a-K0Y2^tP8uT_iQW`${m zC-yLZE#N$rn$lObd~PC5#XwoQT^?4j9A8hXi|8&UT(p@~u{t2PF@{TTtImA3NqbtO ziIoP#s+3(ht)sD|_5Hm6zs{f^P!mH*Bt)uX5!#>WkU|iH7*{eP9ZEB>KgNgzwDXZU} zlYQWkD)uLU=CF|((PXS&TP=Pymq07KsBLI9Cq8C7v0D(hIjV}RJ2|oiK&NEtXk0=i z^NhTpx5Cx-Zi{~Ew8G|5jCtS%=drRP)>~_(MiBZ4qGv~`-5NFMj|EC)i7SjbI1HuxTpdVo;5v$Ijy$26KlR&0vX zYxJBB^Mue3tl20OeLK6Y?C_`acr#F#byO!=cn*y)ShKHS@ueDu3H!vtG_a|z78AmJ z!;s5ctF~4SK8f}zArU)(oZQN0jStYeElt$ovZZ@LJ!8>W(r75-nEC!4kon+NazU(3Y-{h>U0mF82ayt%)VV4GvjB^n8(4SHJ>F zvfhx=%WV<9A>VcomRoZBB@484gyc1&uHyc;f4z_JFGU=(a3ZC z)_Oke?A-+^pd7n;r=w%u;N%CvoXI=HPiUIkx_n&#!q5`(7khujS3*Jt`8d#3h)-C7 zIFu=&%|dvVO{Jh5Im%?IC<|Yos~x3)q*f7@EYVTeeWGKd$6yI1{d5@Mxn3wUlWf7n z$SV1~@WN6{W)-R!sF4_zJpTthfFL)FD(~Qw{og(_z29pLhFGieyCrLOtxEIVL@1*i z7_#6cp=JXI3w3QoEU@-qus*}-bNSo|A6?{k;t9_Y#a$RNUhmy1s1ad4SQi9GG8N=H z5SHF)x>&i$GH(23XSOwz*XVSo)sr&zk;Ry@CPdXD@Qypju|YYRzZE{$^DGy8^}emh zv<8W*`p=`7+!a7qJP3R>>{El34Nr*5o=!Odk@Tj)u|2I%@Tx*lO+{%vKRJdW|BNLC zxq@{f75wyuz6i*F3&b^YGMf%&0np&!I8B)fcFQc@QX!6Tcx_O~D=SuyNbUgxkj+18 zFPmXbZ6b#8BpC4FffO2EG}F9ufPCiqMmKK!4~-Z8wB?b{kn z(m|(VcWm3XZQHhO+qP}nw$)L`wmQk1{hasQ?)~5Up8K3zzYkUQVa~Bu)%sAsHO3qh zgJ>S(=l)*gO;w|wQsXhoeo;u!h-5*fUh<9!VFFlC;WkV44W7dN`cUyfm}oufQ$pIW zlO%JB3fPR8fXa#zy>$yqfm>0SCY2fx>t5$G(HWB3DzpZ5g(oOP>K?3gkBc}d<_3ks zn(vV5WqCTveeg1A22$`HRmfsWv#>G>Oe;fQrVwjByj(Cz#q2!X7!1_tIKN{-lZh4D z*9u%-8;&ZHlc)LgQc9&xpM^XigQJj4!QWuTi5=lhR`+nHbmc9SpHoqia(~Rz%TIKS z$?>Y3@|0<^$ETo)Bf8oGBhRaAm91`Cmx*l8=;+bx8o~;3ZXETXty|;>nzZ~bhqttADk{jC8nLx_4d)NubwSN@6puZ|ZHRsGh zxP}rYQ>;%cgdsis;w{R7Mw~Py%VqquwVg721=Q%8FgyT+Hl|$cMa*$;BQle5q5(W~ zJe9p?L%U~o=*LRN9BkPI*p93 zAKRQcjAV7bv`2)Wlhsr80l3u#*a9?r=bFSDFu%n=08=hN)E3gf*}1tqBhN28nGXBS zxvQrCE~M(1X9!VXWgKpE2}HysR|<&)Dxw8<6dlF8tGHC57W(JC@jK^rTLSR={oXiC zgE(g^o$|4nQSb^%|DgzWXPIQRfYTrjaonZHm!fMq#M4O)arGKzBmG)q`5DHxL0Vai zBq$hnQ@lCwYkE3yaWqD5lMc%~9*|06K|aQLfe&@@xR<(AJn&TkSTMPxW%fyG~jBg6O!Vl*qga%JLu%b;?{FaRgz&uO9-Y8{V}@{Ad+cQgeIss&OO}-4@ik9 z1Uvf7*~Onx^RLmF%GRCSR`(`$V6YsQo>R+Xnk5{$!oxS&?j&D5QsJ?h&eeE9%qkS05XsQnB zUo{S2!OfdKhFGQh8gRo75*k{Ktu`1-eTs~x91#^6%){RI zjwGaNv6uwEwSg&oQFwZJInX-YM3I-=!h0*>(|JmO6)os`= z%yd)d>t_|?Aqe(9m(D)FO z2rPujfhI1?rdkz<#ksPG2)5^w#@f{uErk3T%-EazP56h6DEbA?t@}X`>#Fu(Jei5Z zy+{Xi8`W!?mc8&*dS8KwVIxNzVZw^u%@P^Q1`h5S+)`KEG92WpzR&#Ya)QATh7^=6rCs&xlzkkrtJdjvVGQqigh+>7(a?UuckY6yoG*Y`J< zT5(;%oeE!nC9Q)2qb)!IFjUi)ioNjEOfk#Jrj7***KaU{4~X*N?@G{$m_@S@RUySm z5acPnvs_{5E3V+xlMv)zq0`lR%|l#QL1wH? z-W+M$n1Pt7Sr?+*rg$J!l;8WT4R(kSTuIT16*UwAfq@IjVw(xpf-`th#Qi)M7ngLvLZv%-=USw@DZXSkvNrPA#O2;bN4h2P+8!U*M4kpMDU0J_ zSOoh?XH+$z?a23M=AW~$!B)Qnb-J$XcriIO!`2)nMpgOC6xD2zT`%A#D9?kaUj{OK zFz_lFUWd2zu|rz)+Um_iixbi%dHswJ`O_Z!+n@TJy%v9DjZk}Y8ZlI1UsbLx5K(6^ z`jw_S-#fzjOopKN8q)NWq2bNT56(+uRb)}lY5RqxC;AjlC81AumX~r8h>6~0o$Kvq zi-$Rv#znQ|G+lie?6jViE-O z#R*SW!ZJ~$45^3=-kgAtRsn)o5wbj-96l2&Hna)}F9cc@(ge*EDHdoxMEF>Sw|H+> zS1JD95u&basVk|XT0Lgb$4ZEf1F8Jh(SVd@(xrlq;i@4H*S`ZF0*%ldi4h?^pj25N zUh-IRLD5iop~0tga98MBPfS`>wVx)cFrZWrpWJA!nnDzw6)g=dh0!KRb|j5qheGE> zI0A6M*>;9O4_rR{zzbR8ys1b4U)Mr~ikuO*@BEZE~!InF(Vy*8nr0t}b9edWW z{;)L3z0xbVvt5V0VtlrZrfH;AL?HNsuaFx6=^TS9*UARl=Tb*jWK;mA3*A4y8i6cZRmtoqGo zWYU5#YRqtP(AY`%BSrvxRdBlN^@82pv-PQlYL_G5J0(PE-B38;riv^N&8j){X91}R z!dN5JkD~$#ubB~d%~VwZ+2usFrktPP^*YVZ=aXj#g&Txax8Z?W5`o?yV81tnjXpJ5 zXRryX>z~}*BQ^j4>%VLW|4oFY@wdCbZwa5Pp8jQQ_L0@?N7*4dmN0}hLoJ0lEtxT? ze#;Zrxos4rH(LwPi6<*rKlJe$1v5$@xh5J8fUcA;LU`li{A)9QA>E5>x_J(#*APpB zmTe*qM{Fw_x62dMQU|LzXy?la~kp4GM z?AQokTNJ=iKASa0GE`wg*0C_&6oJz9qoI_%C5kX`DzR?VLp_=DiEnl>gNku}H_(Bb zvzhYUY2tA(UU?QjW9i&RG_h-X;a+4&_w__d#L85nJ zTOiFK7aYbDNjXQtAtj?3c{sPTzS~$!9o~4r;1^yZOY>#3IEM&}*%PHwp8nGOy*Oin z|Mlo~x!RFVHL$KN2q|Mj*fM+elJqCUex$XthoFBE6O9}5i(yDxS|uUCkd*QnxRU2y zjxygn`Ad^VZH#B6>n&PLK>NB**|L1j8nl}W&zOuc2#2SBB#NsrnA^^MJ)Tcql5^GpXEhl&pTHboo@(V1+=t7ghl!w zw0QtLU=j>3g@*IRaS%goe5InJsDc~NAA+e-P#i~U6!F!HlMMfl{i`C<>@(%vMPYK;CKae5%Sd>}^tC61pYfjp{KRG+rHccUz#aXYye z%mR3;+I^h{2e1(smNOkQ?98f>HgWFz7uE6}h3Z^QxL@k9$}L8O z$~R3@{Xe=-n!d}3>BflXpa(Vr(8CZ#^X;jwZ5B!^vC{ONZp7iW_EIZ*h~~R4Jey6% znw^t=d$|YX@SR>9MtZAJ4!P;rV7!}fc?r>JK-F;2e!2 zWAnQBOPZ#;)aSOu%bokBI>~NPe4Avz(*VR&-AwbmXt^LqxNWVwLODb%ww)6B{RTR> za|iYvIDctbCfa;Xp`zizr~ZbikZ0xn%d{KJ0+BgAmWlNdLPQIf`hZ7HyE|G*l6l*7 zuZv~(fWrFMCzM5uk*;LHm?YK=2G*+ruSAWtw0fnG<<%Y~EH`82eZYufxZPNF6-2w$nx7eQGt0AFDIpU$5Gis5;?u zJf4Ruq5`SAn~EGx(MN-NkWJItuPxWm_(jl{RgsqskT(MWUrPEfXDQpkj7$@^@zSie z4{s*z(4xllQ|!lAU7FFnAx@>k?%ECBL}e+~=#LQ!9d9&lavbydUnxTzpTxty&3|0d z3RFfPl{YIHH>PV@P&U2)L7|>~Dq50oC&0G=0RUJ&O+Y_AK>xEO`|l!vf9RP1Voxg- zdd>D|U^`FAi(t{v*UmRh)z&TwDImnx^?OL7G$0H_MZ{3*e{Lx^At_2Bw)<*DP)@qv z8XZJhUm6m^4KvQdqX3H$wx}ky(C{%r1bho>3|bZ&;ch7fXYLLy9RPjf2aubEvG{7@ z4@H@?anmQ$%L_*u$KbyxEvrAK{N?A>>0prA+CiNMC2OEzerrS&Zk#Mh`nJYf?g}#zRiWg$(QF3V?FRMwP0{^w*IC7B>F{#oYk&zA=i^ zbURPuQ7kno;+M+UpR02O3F!<&`-|*~!IM~g4qaAu`83ONB>Icbk1_L)Y;K(ndU(!n zJVqc?WH;dqOb%R0-q756q!^L@X5#g3W~B8M1VtrrIR2I05JiLpfV+CF0r2#a+c)qf zQ?+s};9umpLAb%ZSBtlD@savP6ZtwN9qWqM%9od%2xPpGzS#v13`9&WBR5;uYKpz^ z?k3&hN2W!cfCax1WlM&HXi!NPX5A?q=E>LWJg-XKuv`{PuVdI_Kl$HCZY>QTJPQaT zN13nTzET|bWP(}Q@*2M*#OcuBm$OGV-TgYh>j@>ix5aO7iw>=_$gyETok+QTO-8ws zm++A0$7OHe|M+9MJbo^h_c`We;m_sb{RIGk@XzJ)mmS>ym5TiBv+A!Ek{B~?)=vW~ z`1lg0YM{%{{~(&KXF{rpD2CncBm2{qVg@2IV=3X6yWwzwYq}LAeHN>ImDQ!@e##Eo zsI4zgq9grKz^=g67 z?b%g=%)Z@TGpfm59~YI*LD{(87orq{LAxbJj-WMknx}hiy*XMOOHy=X z?s#w#RKwgF#FR#%xjNtBy_SxlHqFp^~v<2XuFiLoq{J z)5y`@W2B%A_EL+BrY_g%gu(rK*4g*Yetu6|W)*QF40Dsopf*|nwR6{}SK~if95klv8VwP^)PdcU9-!uHaTk77i z&D~8z%n9gh_lTFkxUBs1UsYLGRTsyWSoK^m%os-gFEY_-XnJhpX)G?6CjevBI4JrI zB2~D7WXc6>tINxL?Cslao0{hNVr^;AVR!Z~FZYuV*S$Y_wT~Y+-)C*TjooLq1TDwT z^CCL&MD!Ri+6-d@LQi4xM`s{5Ifh*!DCezf(RCNRp0+C|LAN_aR6rvL7RUI{W+LZrp+)&c5;Z z49VbRKNxcXoGY3V+4L1*O%LjV#rfA@m3m;h9CnkVfUy@rLV2a` z@w6Idm4`=ed+r%im;7_}dh2EQ>Zs-8#0CJgx!oP|GV8jkpl?x}Yb`^ziKsIA7Ehc= zV~YIj#ewCFI7=L|A-FB-`|zbdpF$_bGd?WskiI~BMWEE`lf6z&3qJF3zh0akm}M7_ z6vL=DWM-5o&qNYDMYu2yrMnANhMTJ--%PL ziK~8$0sTOVu+?BmB#~0p@HmfIKJ?h8{sMR%#d>sbh9|zed)9X!Mv$J7dBxnBl>@kl zLW5>6^X6~J4Ao~)g6#Z85@LAW+0v7YdJeCXD~|vQ)24ZcIaG=cdPzeTXO59-+9bgL+0yZaETltu7YT7XEw3bijDUYZ>iUepHYmt`@5HpVKARo zakZy^WiweRZGXh0-*h#;2)ehH3xy(f^uUtcRH^xqyEv(#d(5G*ST_sG;8?YjUsrIpRW?XhZEN~i4UdatgY27G!PT#mCeq1z0?ueoa+lZLiT!_pN zcxr%7ma0%Fbt_Ov+a_52OHOVLkz4sZxn(7ML;M#TM0e`hGtG?W4=X*TD+MSTSp4@> z#}5MRaAxzjz4)3qucV>0IVq=n`UH$m>OH$5LR0#SQWeo^91T7Wg5v)2I26T8G zjCkuInw_CziuA^ghQ)1l>j&XaMCK-g$1|VTA=_FyAD$(CtF$1%@X*a>SNM9DC1fb| zAl_I%?7qC!C(Z{EMN3vTBzT)B6e@>ey^n?%6e89tF~++Fix?rPLL6L30vsSd7hN}m zMWq*9zQEJr0y;jo^Kd<`TP-qzx+VoJqgvWXUDZ>#&y{M zuc}18nguhHpPGNgGf~yK3F5Lq02ZgXfV9C{07&xbdTwvbI*-R}=zcV__E`d_EV%x9a)SAEEqV3NOzuCAkMGB%#fFo|T9V}lWfrgGw;}a3J?IkJEn8c~1x<9OP&xgENPP4n( zWs>VxCLEV*YT8aw6-SX`C-V*!6l7=;${?gDUrYudJ)d{coa7?I+Xu(+O!dR9)S0(I z-I;deiuRke4T=x8c#qS(frKXL0EbTzZ2HDAfz;3w-42osJ*7NXgyg9o9K^`4;kihN zPGlI#+a{+TA>h-+5YlNKsUGqw$|WoS8>jQOjH z^+!!)RD$^`qg&K|+?)P7*Sh-~!t?t^5ZXh>V4Y>|NCp@smLdRNGi4OY+yYF0lR_5_VSg=tpJv^8Hz89J2*#mlkNO+F?WFbFrAOhprV*#?sGyu!oadL`}-Ynk&R)>t`_2!ik}Voj|HoTZsyVv1*UOho~gPgaR{kug_GWTPGo0hq05u z7hz48!RAm3SdUUn%{09_qOD?4qZ%v~EXaw(+*AQLuNy2k%S!9nL=~w7j?m#qKr>VQ zvY>JRUADx`piOUG1zNcn!5JKr_!y%IY3c_-#)c%N9V<7M3tXdiq&8J8K0X(8g7|d- zUI=Uf$@tjN1h_;J(cCU8j**5C6MFKbo0wFSdBG#4SDDmjGv)ahWDw-Vb+_y+*HHpC zFM;x5mOu8RAv9DA17Lx$W&DbV%72v4!cGT&iLbddaI7+pNDy2#0=FlvVl9|T70QXt z;H-iz({+DsCXPMP!fZ2^HvJ7TwZ0(YZK-1yn7RU?0%!EA1nZ^TNKfB&#L{GiKJP^t z)}2Ejg@PfO!mb}V2~|E^3ZrBtGG#qgNg%{2%TNf#MxKEmxj9cH0R)RDvtIl)sYhkGl?>-2K3OAS86fqF4sl=NZy?SZk`tFWoICx%b89$FIgm zm{Z?UU;@ZtX{dGE;6S>tca2MWE+MWVcZpkqjKzf*AHw{O;P+FTTLp~F5BNgY?rADR zAuwC!6prH*X9#}=4Iadi`b+v*?QDtSLXoLdv>JGFcNvU+lCU)bUx;0}=-fw#U_$&I zR9cc-%gCC2hVj#s57^Wq&^2qzCu-c2ym^~?Saf2K%0l`$Kop?rE$SYA)J4k2c6PO2 zwSCFi7ain|FEb8R1n)JH?+*tE_L>qjg*A%h)hU)`T_uHtXn@mH)UYZOSlzaHtO*{$ zGk^mFM+0mi_>Qynw!C0F?-L$nrYWDZ3=D=oOz`2TBw8w1tFJV1rCW zM|>R;N2P439CSkVl2*5w+kEy*s&L6&zfEQXt^uzBj&TJEctLn8D?Q-S~+&ZT+eQV&<10u zB}*uhFldPIB6AwPYDo1QmtdR>83hf>rPwEtj|xaRkOh*rNldPV3b@T}=udz>z3GAN zNioRFFyn=GlXCBQkbx96ljcy?2q@`;_yRwQ%FpPmv^dK%cAD!>?P4W09~T)fWJ~58 zq2hvSRu^6vH?d>10xU?8o_+)_Iy;T`1d%?c&JL_qe-zwMI8F6cl;xnVH zo9n4L;}^;u&6qMY`$FJ z#Cf{GW^BD6WM7wE%~T(=#aP?@qA*1nS{TYm9MQzKup!haz8*;lyRPmJKt1HH z{15TtZ06NxD`v$LI>@KA9eWt(*eX}sPQWE)-w9}!F z>MlZK-0y`AR6T1tgfmYut^Tqztf;=f4^Br6$)L}O(QQft20ofm;|SVle-_G49U8Jv zA8wV^^RQCTe$q~6+Gmf*=9_{mzF0CQYs4-o#+pmOqU_igW?HtL!9eH}O&T(L`TQV= zcI_2tGM&L=3a50x*SH7)$3PH<9J{SSG{9t;kwrPci(16UHRPZNO&k>ig@p!?+0P64 ziiUvRlTIuN&&!d;qrj45uOFV|r$8rvBYs5L^+x=JNpPK0*l$rk()vc!xym{@=f+Y| zy4mLpv77z0I^U5N*rIINs-+Or`ORx0Q2=EA4o3yHF=0NEo7{G(D0jZmzALJ?5Yevg zi+O!vB`6rr4r{}Kf#j-1UPhD3NmgV6KdN#5#T>;mdmj=4t=6?Z>Y5hVbCMLXgxcIo zC8cANv^bn<^iNgz7}3~}%-Lfq&ib)x#LiAk?<$7+Tn)e&FN^#d^ruGT%$-jwf zA!ehY%nH&Xj!iN^iacSlCOzbGhH=*FKEd|cg@yt96`+u!aiGaG5&kH+*EFnnbd#8f z!x2?v9YNo+@guzf3J}`khl8Kc#Kl`dN=&vFxYx-VrI>)v_SKiNi$;yY3zHdhFz4q{mpp-kF_;3j{LNQxfL zDWO|3xEpPas%w^Y!(DYRWo;^O|6E4bf0)B9b?AIr`Yy!+&^i`g_ja{DEYe}HLL7&1qq5Hq86Lqc z8WVZqxXMA1lOcD4^g^kE=6IJ3M|6N>#{en;Hrc?Nrg@{ETh=h{a|h z(|qI(tnS~azDf6nH98{uWgzmdH$}y1FTBgSmFHF?UzQHOmbNBe%nCmq=W^$GqqXyJ z9v6~z1C2g9q9Cd1N$ptqJWLV<6UmaWD|Q5}6=Au6=_m4?b*b>~j>qa)w-&F55!sCzr7fkG=TOL0&Y-9=-v0i{vTy_P+M?hGG)v7A_%~@ghm* z7{`6VlAf zZi_HC>APeQFXO~QB?5=_vT2e~^q$2AqU;z7lu1#sVzvq@&Q^kU`a79~Vav~k#yCt` ze=GR%-R(Yr8keA@3Ht>hno7gq7GZ^1zm~|ravWrKR5RwvloDQ{nc*I4s2lM1`kikz zoRBX*Kf3cUHoP`GpM11EXkJCCy(j@WE32~^8N6<9BQZ=c#^gsMf9`mpOF}XFW<)hz z%EQ`PBt=YWW;fK_EV(%(Oh_~v!QD|%FRE26qmNeP^7wH~+83jfo4x5Q=m5x+0^aW; zYGuRl&njta_Ezu~Pcu_~8S?>>UfQ`I=mE^@4J-5mNwnsEA3HbRmE4Q&hDG-i_Bv8( zCh_gOagQ|+hm=QB5|v823Rgg+L9Yb8CL49gJ&o>0+(yuQtYm(BIz8v+u=AoUcHVB& zZ~AQRR?MTTW(x&6)so1w(Zn0wTEnGM{{xZ+tdj=7tQA4WmmDy`zD&~j%Ssh-4dyTH zW*ky4G^gHEVS>i|Nb%7RjV*p^ENim+k!@Pxl}NOd*Iz)^M?m=dfrzm}?FEBiLE40xS8Rf+F zY-E85%yF)KP_0aOnd$p15Vi z0f7(!{@)w=eeU)Das0Er-+xE{dxO8I33{2Be<2HO7}{O=apzk^5r4F0cK{oPRe_bmS1aqxGl zecV50@n5Na+gtrl{)2x){F|ZHZwOQ3{}JLJwDfQMzZkJUasJK3;Wv&Z?LTnz|354p z{!IRFMfJavlQH}w`QO>~KdY7hbKL({?fg6S8PgxB|97>|e~$m(6m-8q-X#7B@;9pY zf6~+a3G;8VgWoXJ3V*=-*RuZmWBSM2{?BLiZ#?zy{8~zXpzG5Z-ndblt;?H a=~o$XkWc*~007+Quj|vHbK3f^yZ-~54*i1w literal 0 HcmV?d00001 diff --git a/updates/0.20/ver_0.269_files.txt b/updates/0.20/ver_0.269_files.txt new file mode 100644 index 0000000..72237c8 --- /dev/null +++ b/updates/0.20/ver_0.269_files.txt @@ -0,0 +1,4 @@ +F: ../admin/templates/shop-payment-method/view-list.php +F: ../autoload/admin/controls/class.ShopPaymentMethod.php +F: ../autoload/admin/factory/class.ShopPaymentMethod.php +F: ../autoload/admin/view/class.ShopPaymentMethod.php \ No newline at end of file diff --git a/updates/changelog.php b/updates/changelog.php index ef3cbf4..f272a35 100644 --- a/updates/changelog.php +++ b/updates/changelog.php @@ -1,3 +1,12 @@ +ver. 0.269 - 14.02.2026
    +- 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` +
    ver. 0.268 - 14.02.2026
    - 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` @@ -482,4 +491,3 @@ ver. 0.142
    - FIX - poprawa adresu strony głównej - diff --git a/updates/versions.php b/updates/versions.php index 02913c7..7ff553d 100644 --- a/updates/versions.php +++ b/updates/versions.php @@ -1,5 +1,5 @@