Project-Pro/shopPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ver. 0.319: usunięcie shopPRO eksportu produktów + rozszerzenie API o custom_fields i security_information

Browse Source 
- 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 <noreply@anthropic.com>
This commit is contained in:
Jacek Pyziak
2026-02-24 12:29:13 +01:00
parent 4e720c5689
commit 4f66dbe42c
9 changed files with 20 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
autoload/Domain/Integrations/IntegrationsRepository.php
View File

@@ -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'] ?? '');
}
}

5
autoload/Domain/Product/ProductRepository.php
View File

@@ -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);

10
autoload/admin/Controllers/IntegrationsController.php
View File

@@ -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 );

8
autoload/admin/Controllers/ShopProductController.php
View File

@@ -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;
}

6
docs/API.md
View File

@@ -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,

2
tests/Unit/Domain/Integrations/IntegrationsRepositoryTest.php
View File

@@ -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) {

2
tests/Unit/admin/Controllers/IntegrationsControllerTest.php
View File

@@ -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) {

13
updates/changelog.php
View File

@@ -1,5 +1,8 @@
<b>ver. 0.318 - 24.02.2026</b><br />
NEW - shopPRO export produktów + API endpoints (ensure_attribute, ensure_attribute_value, upload_image)
<hr>
<b>ver. 0.317 - 23.02.2026</b><br />
FIX - klucz API: fix zapisu (brakowalo w whiteliście), przycisk Generuj losowy klucz, ulepszony routing API
FIX - klucz API: fix zapisu (brakowalo w whiteliście), przycisk Generuj losowy klucz, ulepszony routing API
<hr>
<b>ver. 0.316 - 23.02.2026</b><br />
FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields
@@ -8,16 +11,16 @@ FIX - migracja brakujacej kolumny type w pp_shop_products_custom_fields
FIX - PDOException w listowaniu atrybutow admin (SQLSTATE HY093)
<hr>
<b>ver. 0.314 - 23.02.2026</b><br />
FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamĂłwienia
FIX - naprawa globalnej wyszukiwarki admin (Content-Type, Cache-Control, POST, try/catch), NEW - title strony z numerem zamĂłwienia
<hr>
<b>ver. 0.313 - 23.02.2026</b><br />
FIX - sync płatności Apilo (int cast na apilo_order_id PPxxxxxx dawał 0) + logowanie decyzji sync do pp_log
FIX - sync płatności Apilo (int cast na apilo_order_id PPxxxxxx dawał 0) + logowanie decyzji sync do pp_log
<hr>
<b>ver. 0.312 - 23.02.2026</b><br />
FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskończona pętla wysyłki, ceny 0.00 PLN, walidacja cen
FIX - krytyczne bugi integracji Apilo: curl_getinfo po curl_close, nieskończona pętla wysyłki, ceny 0.00 PLN, walidacja cen
<hr>
<b>ver. 0.311 - 23.02.2026</b><br />
FIX - race condition callback płatności Apilo, persistence filtrów tabel admin, poprawki cen zamówień
FIX - race condition callback płatności Apilo, persistence filtrów tabel admin, poprawki cen zamówień
<hr>
<b>ver. 0.310 - 23.02.2026</b><br />
NEW - Zakladka Logi w sekcji Integracje (podglad pp_log z paginacja, sortowaniem, filtrami)

2
updates/versions.php
View File

@@ -1,5 +1,5 @@
<?
$current_ver = 317;
$current_ver = 319;
for ($i = 1; $i <= $current_ver; $i++)
{