From 4f66dbe42ce9e41e3c26ea5aa6e014838ac51561 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Tue, 24 Feb 2026 12:29:13 +0100 Subject: [PATCH] =?UTF-8?q?ver.=200.319:=20usuni=C4=99cie=20shopPRO=20eksp?= =?UTF-8?q?ortu=20produkt=C3=B3w=20+=20rozszerzenie=20API=20o=20custom=5Ff?= =?UTF-8?q?ields=20i=20security=5Finformation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Usunięto shopproExportProduct() z IntegrationsRepository - Usunięto shoppro_product_export() z IntegrationsController - Usunięto przycisk "Eksportuj do shopPRO" z ShopProductController - ProductRepository: dodano custom_fields i security_information do odpowiedzi API - Zaktualizowano docs/API.md i testy Co-Authored-By: Claude Sonnet 4.6 --- .../Integrations/IntegrationsRepository.php | 187 ------------------ autoload/Domain/Product/ProductRepository.php | 5 + .../Controllers/IntegrationsController.php | 10 - .../Controllers/ShopProductController.php | 8 - docs/API.md | 6 +- .../IntegrationsRepositoryTest.php | 2 +- .../IntegrationsControllerTest.php | 2 - updates/changelog.php | 13 +- updates/versions.php | 2 +- 9 files changed, 20 insertions(+), 215 deletions(-) diff --git a/autoload/Domain/Integrations/IntegrationsRepository.php b/autoload/Domain/Integrations/IntegrationsRepository.php index b43300d..1286ffc 100644 --- a/autoload/Domain/Integrations/IntegrationsRepository.php +++ b/autoload/Domain/Integrations/IntegrationsRepository.php @@ -780,118 +780,6 @@ class IntegrationsRepository return [ 'success' => true, 'message' => 'Produkt został zaimportowany.' ]; } - // ── ShopPRO export ────────────────────────────────────────── - - public function shopproExportProduct( int $productId ): array - { - $settings = $this->getSettings( 'shoppro' ); - $missingSetting = $this->missingShopproSetting( $settings, [ 'db_name', 'db_host', 'db_user' ] ); - if ( $missingSetting !== null ) { - return [ 'success' => false, 'message' => 'Brakuje konfiguracji shopPRO: ' . $missingSetting . '.' ]; - } - - $product = $this->db->get( 'pp_shop_products', '*', [ 'id' => $productId ] ); - if ( !$product ) { - return [ 'success' => false, 'message' => 'Nie znaleziono produktu do eksportu.' ]; - } - - $mdb2 = $this->shopproDb( $settings ); - - $mdb2->insert( 'pp_shop_products', [ - 'price_netto' => $product['price_netto'] ?? null, - 'price_brutto' => $product['price_brutto'] ?? null, - 'vat' => $product['vat'] ?? null, - 'stock_0_buy' => $product['stock_0_buy'] ?? 0, - 'quantity' => $product['quantity'] ?? 0, - 'wp' => $product['wp'] ?? null, - 'sku' => $product['sku'] ?? '', - 'ean' => $product['ean'] ?? '', - 'custom_label_0' => $product['custom_label_0'] ?? null, - 'custom_label_1' => $product['custom_label_1'] ?? null, - 'custom_label_2' => $product['custom_label_2'] ?? null, - 'custom_label_3' => $product['custom_label_3'] ?? null, - 'custom_label_4' => $product['custom_label_4'] ?? null, - 'additional_message' => $product['additional_message'] ?? 0, - 'additional_message_text' => $product['additional_message_text'] ?? null, - 'additional_message_required'=> $product['additional_message_required'] ?? 0, - 'weight' => $product['weight'] ?? null, - 'producer_id' => $product['producer_id'] ?? null, - ] ); - - $newProductId = (int) $mdb2->id(); - if ( $newProductId <= 0 ) { - return [ 'success' => false, 'message' => 'Podczas eksportowania produktu wystąpił błąd.' ]; - } - - $languages = $this->db->select( 'pp_shop_products_langs', '*', [ 'product_id' => $productId ] ); - if ( is_array( $languages ) ) { - foreach ( $languages as $lang ) { - $mdb2->insert( 'pp_shop_products_langs', [ - 'product_id' => $newProductId, - 'lang_id' => $lang['lang_id'] ?? '', - 'name' => $lang['name'] ?? '', - 'short_description' => $lang['short_description'] ?? null, - 'description' => $lang['description'] ?? null, - 'tab_name_1' => $lang['tab_name_1'] ?? null, - 'tab_description_1' => $lang['tab_description_1'] ?? null, - 'tab_name_2' => $lang['tab_name_2'] ?? null, - 'tab_description_2' => $lang['tab_description_2'] ?? null, - 'meta_title' => $lang['meta_title'] ?? null, - 'meta_description' => $lang['meta_description'] ?? null, - 'meta_keywords' => $lang['meta_keywords'] ?? null, - 'seo_link' => $lang['seo_link'] ?? null, - 'copy_from' => $lang['copy_from'] ?? null, - 'warehouse_message_zero' => $lang['warehouse_message_zero'] ?? null, - 'warehouse_message_nonzero'=> $lang['warehouse_message_nonzero'] ?? null, - 'canonical' => $lang['canonical'] ?? null, - 'xml_name' => $lang['xml_name'] ?? null, - 'security_information' => $lang['security_information'] ?? null, - ] ); - } - } - - $customFields = $this->db->select( 'pp_shop_products_custom_fields', '*', [ 'id_product' => $productId ] ); - if ( is_array( $customFields ) ) { - foreach ( $customFields as $field ) { - $mdb2->insert( 'pp_shop_products_custom_fields', [ - 'id_product' => $newProductId, - 'name' => (string)($field['name'] ?? ''), - 'type' => (string)($field['type'] ?? 'text'), - 'is_required' => !empty( $field['is_required'] ) ? 1 : 0, - ] ); - } - } - - $images = $this->db->select( 'pp_shop_products_images', '*', [ 'product_id' => $productId ] ); - if ( is_array( $images ) && count( $images ) > 0 ) { - $missingImageApiSetting = $this->missingShopproSetting( $settings, [ 'domain', 'api_key' ] ); - if ( $missingImageApiSetting !== null ) { - return [ 'success' => false, 'message' => 'Brakuje konfiguracji shopPRO dla wysylki zdjec: ' . $missingImageApiSetting . '.' ]; - } - } - - if ( is_array( $images ) ) { - foreach ( $images as $image ) { - $remoteImageSrc = $this->sendImageToShopproApi( - (string)($image['src'] ?? ''), - (int)$newProductId, - (string)($settings['domain'] ?? ''), - (string)($settings['api_key'] ?? ''), - (string)($image['alt'] ?? ''), - (int)($image['o'] ?? 0) - ); - if ( $remoteImageSrc === '' ) { - return [ 'success' => false, 'message' => 'Nie udalo sie wyslac zdjec produktu przez API shopPRO.' ]; - } - } - } - - return [ - 'success' => true, - 'message' => 'Produkt został wyeksportowany (ID: ' . $newProductId . ').', - ]; - } - private function missingShopproSetting( array $settings, array $requiredKeys ): ?string { foreach ( $requiredKeys as $requiredKey ) { @@ -915,79 +803,4 @@ class IntegrationsRepository ] ); } - private function sendImageToShopproApi( - string $src, - int $remoteProductId, - string $remoteDomain, - string $apiKey, - string $alt, - int $position - ): string - { - $src = trim( $src ); - if ( $src === '' ) { - return ''; - } - - $localSourcePath = '..' . $src; - if ( !is_file( $localSourcePath ) ) { - return ''; - } - - $content = @file_get_contents( $localSourcePath ); - if ( $content === false ) { - return ''; - } - - $remoteDomain = trim( $remoteDomain ); - if ( $remoteDomain === '' ) { - return ''; - } - - if ( strpos( $remoteDomain, 'http://' ) !== 0 && strpos( $remoteDomain, 'https://' ) !== 0 ) { - $remoteDomain = 'https://' . $remoteDomain; - } - $remoteDomain = rtrim( $remoteDomain, '/' ); - - $url = $remoteDomain . '/api.php?endpoint=products&action=upload_image'; - $payload = [ - 'id' => $remoteProductId, - 'file_name' => basename( $src ), - 'content_base64' => base64_encode( $content ), - 'alt' => $alt, - 'o' => $position, - ]; - - $ch = curl_init( $url ); - curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true ); - curl_setopt( $ch, CURLOPT_POST, true ); - curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( $payload, JSON_UNESCAPED_UNICODE ) ); - curl_setopt( $ch, CURLOPT_HTTPHEADER, [ - 'Content-Type: application/json', - 'Accept: application/json', - 'X-Api-Key: ' . $apiKey, - ] ); - curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false ); - curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false ); - $response = curl_exec( $ch ); - - if ( curl_errno( $ch ) ) { - curl_close( $ch ); - return ''; - } - - $httpCode = (int) curl_getinfo( $ch, CURLINFO_HTTP_CODE ); - curl_close( $ch ); - - if ( $httpCode >= 400 || $response === false ) { - return ''; - } - - $responseData = json_decode( (string) $response, true ); - if ( !is_array( $responseData ) || ( $responseData['status'] ?? '' ) !== 'ok' ) { - return ''; - } - - return (string)($responseData['data']['src'] ?? ''); - } } diff --git a/autoload/Domain/Product/ProductRepository.php b/autoload/Domain/Product/ProductRepository.php index 4d656b4..3ab2683 100644 --- a/autoload/Domain/Product/ProductRepository.php +++ b/autoload/Domain/Product/ProductRepository.php @@ -682,6 +682,7 @@ class ProductRepository 'tab_name_2' => $lang['tab_name_2'], 'tab_description_2' => $lang['tab_description_2'], 'canonical' => $lang['canonical'], + 'security_information' => $lang['security_information'] ?? null, ]; } } @@ -733,6 +734,10 @@ class ProductRepository } } + // Custom fields (Dodatkowe pola) + $customFields = $this->db->select('pp_shop_products_custom_fields', ['name', 'type', 'is_required'], ['id_product' => $id]); + $result['custom_fields'] = is_array($customFields) ? $customFields : []; + // Variants (only for parent products) if (empty($product['parent_id'])) { $result['variants'] = $this->findVariantsForApi($id); diff --git a/autoload/admin/Controllers/IntegrationsController.php b/autoload/admin/Controllers/IntegrationsController.php index 0116168..e182a90 100644 --- a/autoload/admin/Controllers/IntegrationsController.php +++ b/autoload/admin/Controllers/IntegrationsController.php @@ -265,16 +265,6 @@ class IntegrationsController exit; } - public function shoppro_product_export(): void - { - $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' ); - $result = $this->repository->shopproExportProduct( $productId ); - - \Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas eksportu produktu.') ); - header( 'Location: /admin/shop_product/view_list/' ); - exit; - } - private function fetchApiloListWithFeedback( string $type, string $label ): void { $result = $this->repository->apiloFetchListResult( $type ); diff --git a/autoload/admin/Controllers/ShopProductController.php b/autoload/admin/Controllers/ShopProductController.php index 94b61db..bdc288a 100644 --- a/autoload/admin/Controllers/ShopProductController.php +++ b/autoload/admin/Controllers/ShopProductController.php @@ -140,14 +140,6 @@ class ShopProductController } } - if ( $shopproEnabled ) { - $row['_actions'][] = [ - 'label' => 'Eksportuj do shopPRO', - 'url' => '/admin/integrations/shoppro_product_export/product_id=' . $id, - 'class' => 'btn btn-xs btn-system', - 'confirm' => 'Na pewno chcesz wyeksportowac ten produkt do shopPRO?', - ]; - } $rows[] = $row; } diff --git a/docs/API.md b/docs/API.md index 1b57aa9..faf0601 100644 --- a/docs/API.md +++ b/docs/API.md @@ -237,7 +237,8 @@ Odpowiedz: "tab_description_1": null, "tab_name_2": null, "tab_description_2": null, - "canonical": null + "canonical": null, + "security_information": null } }, "images": [ @@ -253,6 +254,9 @@ Odpowiedz: "value_names": {"pl": "Czerwony", "en": "Red"} } ], + "custom_fields": [ + {"name": "Napis na koszulce", "type": "text", "is_required": 1} + ], "variants": [ { "id": 101, diff --git a/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php b/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php index d97678c..8bd2771 100644 --- a/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php +++ b/tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php @@ -229,7 +229,7 @@ class IntegrationsRepositoryTest extends TestCase 'linkProduct', 'unlinkProduct', 'apiloAuthorize', 'apiloGetAccessToken', 'apiloKeepalive', 'apiloIntegrationStatus', 'apiloFetchList', 'apiloFetchListResult', 'apiloProductSearch', 'apiloCreateProduct', - 'getProductSku', 'shopproImportProduct', 'shopproExportProduct', + 'getProductSku', 'shopproImportProduct', ]; foreach ($expectedMethods as $method) { diff --git a/tests/Unit/admin/Controllers/IntegrationsControllerTest.php b/tests/Unit/admin/Controllers/IntegrationsControllerTest.php index 173aa34..3cd51db 100644 --- a/tests/Unit/admin/Controllers/IntegrationsControllerTest.php +++ b/tests/Unit/admin/Controllers/IntegrationsControllerTest.php @@ -118,7 +118,6 @@ class IntegrationsControllerTest extends TestCase 'shoppro_settings', 'shoppro_settings_save', 'shoppro_product_import', - 'shoppro_product_export', ]; foreach ($methods as $method) { @@ -158,7 +157,6 @@ class IntegrationsControllerTest extends TestCase 'apilo_product_select_delete', 'shoppro_settings_save', 'shoppro_product_import', - 'shoppro_product_export', ]; foreach ($voidMethods as $method) { diff --git a/updates/changelog.php b/updates/changelog.php index c456067..12a8375 100644 --- a/updates/changelog.php +++ b/updates/changelog.php @@ -1,5 +1,8 @@ +ver. 0.318 - 24.02.2026
+NEW - shopPRO export produktów + API endpoints (ensure_attribute, ensure_attribute_value, upload_image) +
ver. 0.317 - 23.02.2026
-FIX - klucz API: fix zapisu (brakowalo w whiteliście), przycisk Generuj losowy klucz, ulepszony routing API +FIX - klucz API: fix zapisu (brakowalo w whiteliĹ›cie), przycisk Generuj losowy klucz, ulepszony routing API
ver. 0.316 - 23.02.2026
FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields @@ -8,16 +11,16 @@ FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields FIX - PDOException w listowaniu atrybutow admin (SQLSTATE HY093)
ver. 0.314 - 23.02.2026
-FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamówienia +FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamĂłwienia
ver. 0.313 - 23.02.2026
-FIX - sync płatności Apilo (int cast na apilo_order_id PPxxxxxx dawał 0) + logowanie decyzji sync do pp_log +FIX - sync pĹ‚atnoĹ›ci Apilo (int cast na apilo_order_id PPxxxxxx dawaĹ‚ 0) + logowanie decyzji sync do pp_log
ver. 0.312 - 23.02.2026
-FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskończona pętla wysyłki, ceny 0.00 PLN, walidacja cen +FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskoĹ„czona pÄ™tla wysyĹ‚ki, ceny 0.00 PLN, walidacja cen
ver. 0.311 - 23.02.2026
-FIX - race condition callback płatności Apilo, persistence filtrów tabel admin, poprawki cen zamówień +FIX - race condition callback pĹ‚atnoĹ›ci Apilo, persistence filtrĂłw tabel admin, poprawki cen zamĂłwieĹ„
ver. 0.310 - 23.02.2026
NEW - Zakladka Logi w sekcji Integracje (podglad pp_log z paginacja, sortowaniem, filtrami) diff --git a/updates/versions.php b/updates/versions.php index f588557..fae6520 100644 --- a/updates/versions.php +++ b/updates/versions.php @@ -1,5 +1,5 @@