ver. 0.269: ShopPaymentMethod refactor + Apilo keepalive

2026-02-14 15:22:02 +01:00
parent 5e5d3d068a
commit 818cd7f2c0
31 changed files with 1832 additions and 269 deletions
--- 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<int, array{id:mixed,name:mixed}>|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
--- a/autoload/Domain/PaymentMethod/PaymentMethodRepository.php
+++ b/autoload/Domain/PaymentMethod/PaymentMethodRepository.php
@@ -0,0 +1,309 @@
+<?php
+namespace Domain\PaymentMethod;
+
+class PaymentMethodRepository
+{
+    private const MAX_PER_PAGE = 100;
+
+    private $db;
+
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * @return array{items: array<int, array<string, mixed>>, 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<int, array<string, mixed>>
+     */
+    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<int, array<string, mixed>>
+     */
+    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<int, array<string, mixed>>
+     */
+    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;
+    }
+}
--- 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;
+    }
 }
--- a/autoload/admin/Controllers/ShopPaymentMethodController.php
+++ b/autoload/admin/Controllers/ShopPaymentMethodController.php
@@ -0,0 +1,290 @@
+<?php
+namespace admin\Controllers;
+
+use Domain\PaymentMethod\PaymentMethodRepository;
+use admin\ViewModels\Common\PaginatedTableViewModel;
+use admin\ViewModels\Forms\FormAction;
+use admin\ViewModels\Forms\FormEditViewModel;
+use admin\ViewModels\Forms\FormField;
+use admin\ViewModels\Forms\FormTab;
+
+class ShopPaymentMethodController
+{
+    private PaymentMethodRepository $repository;
+
+    public function __construct(PaymentMethodRepository $repository)
+    {
+        $this->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' => '<a href="/admin/shop_payment_method/edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
+                'status' => $status === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
+                '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;
+    }
+}
--- 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;

--- a/autoload/admin/controls/class.ShopPaymentMethod.php
+++ b/autoload/admin/controls/class.ShopPaymentMethod.php
@@ -1,11 +0,0 @@
-<?php
-namespace admin\controls;
-class ShopPaymentMethod
-{
-  public static function view_list()
-  {
-    return \Tpl::view( 'shop-payment-method/view-list', [
-      'apilo_payment_types_list' => unserialize( \admin\factory\Integrations::apilo_settings( 'payment-types-list' ) ),
-    ] );
-  }
-}
--- 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' ) ),
    ] );
  }
--- 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 );
--- a/autoload/admin/factory/class.ShopPaymentMethod.php
+++ b/autoload/admin/factory/class.ShopPaymentMethod.php
@@ -1,10 +0,0 @@
-<?php
-namespace admin\factory;
-class ShopPaymentMethod
-{
-  public static function payments_list()
-  {
-    global $mdb;
-    return $mdb -> select( 'pp_shop_payment_methods', '*', [ 'ORDER' => [ 'name' => 'ASC'] ] );
-  }
-}
--- a/autoload/admin/view/class.ShopPaymentMethod.php
+++ b/autoload/admin/view/class.ShopPaymentMethod.php
@@ -1,6 +0,0 @@
-<?php
-namespace admin\view;
-class ShopPaymentMethod
-{
-
-}
--- a/autoload/front/factory/class.ShopPaymentMethod.php
+++ b/autoload/front/factory/class.ShopPaymentMethod.php
@@ -3,72 +3,64 @@ namespace front\factory;

 class ShopPaymentMethod
 {
+  private static function repo(): \Domain\PaymentMethod\PaymentMethodRepository
+  {
+    global $mdb;
+    return new \Domain\PaymentMethod\PaymentMethodRepository( $mdb );
+  }
+
  // 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 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;
  }
 }
--- a/autoload/shop/class.PaymentMethod.php
+++ b/autoload/shop/class.PaymentMethod.php
@@ -1,19 +1,24 @@
-<?
+<?php
 namespace shop;
+
 class PaymentMethod implements \ArrayAccess
 {
-  // lista dostępnych form płatności
-  static public function method_list()
+  private static function repo(): \Domain\PaymentMethod\PaymentMethodRepository
  {
    global $mdb;
-    return $mdb -> 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 );
  }
-}
+}