ver. 0.320: API słowniki — ensure_producer; ProductRepository — producer_name w odpowiedzi

- DictionariesApiController: nowy endpoint POST ensure_producer (znajdź lub utwórz producenta)
- ProducerRepository: metoda ensureProducerForApi()
- ProductRepository: pole producer_name w odpowiedzi GET product
- ApiRouter: wstrzyknięto ProducerRepository do DictionariesApiController
- Zaktualizowano docs/API.md

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

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

autoload/Domain/Producer/ProducerRepository.php

@@ -357,4 +357,34 @@ class ProducerRepository
 
         return 0;
     }
+
+    /**
+     * Znajdź producenta po nazwie lub utwórz nowego (dla API).
+     *
+     * @return array{id: int, created: bool}
+     */
+    public function ensureProducerForApi(string $name): array
+    {
+        $name = trim($name);
+        if ($name === '') {
+            return ['id' => 0, 'created' => false];
+        }
+
+        $existing = $this->db->get('pp_shop_producer', 'id', ['name' => $name]);
+        if (!empty($existing)) {
+            return ['id' => (int)$existing, 'created' => false];
+        }
+
+        $this->db->insert('pp_shop_producer', [
+            'name'   => $name,
+            'status' => 1,
+            'img'    => null,
+        ]);
+        $id = (int)$this->db->id();
+        if ($id <= 0) {
+            return ['id' => 0, 'created' => false];
+        }
+
+        return ['id' => $id, 'created' => true];
+    }
 }

autoload/Domain/Product/ProductRepository.php

@@ -657,6 +657,7 @@ class ProductRepository
             'set_id' => $product['set_id'] !== null ? (int)$product['set_id'] : null,
             'product_unit_id' => $product['product_unit_id'] !== null ? (int)$product['product_unit_id'] : null,
             'producer_id' => $product['producer_id'] !== null ? (int)$product['producer_id'] : null,
+            'producer_name' => $this->resolveProducerName($product['producer_id']),
             'date_add' => $product['date_add'],
             'date_modify' => $product['date_modify'],
         ];
@@ -682,6 +683,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 +735,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);
@@ -1116,6 +1122,21 @@ class ProductRepository
         return $result;
     }
 
+    /**
+     * Zwraca nazwę producenta po ID (null jeśli brak).
+     *
+     * @param mixed $producerId
+     * @return string|null
+     */
+    private function resolveProducerName($producerId): ?string
+    {
+        if (empty($producerId)) {
+            return null;
+        }
+        $name = $this->db->get('pp_shop_producer', 'name', ['id' => (int)$producerId]);
+        return ($name !== false && $name !== null) ? (string)$name : null;
+    }
+
     /**
      * Szczegóły produktu (admin) — zastępuje factory product_details().
      */

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

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

autoload/api/ApiRouter.php

@@ -100,7 +100,8 @@ class ApiRouter
                 $transportRepo = new \Domain\Transport\TransportRepository($db);
                 $paymentRepo = new \Domain\PaymentMethod\PaymentMethodRepository($db);
                 $attrRepo = new \Domain\Attribute\AttributeRepository($db);
-                return new Controllers\DictionariesApiController($statusRepo, $transportRepo, $paymentRepo, $attrRepo);
+                $producerRepo = new \Domain\Producer\ProducerRepository($db);
+                return new Controllers\DictionariesApiController($statusRepo, $transportRepo, $paymentRepo, $attrRepo, $producerRepo);
             },
         ];
     }

autoload/api/Controllers/DictionariesApiController.php

@@ -3,6 +3,7 @@ namespace api\Controllers;
 
 use api\ApiRouter;
 use Domain\Attribute\AttributeRepository;
+use Domain\Producer\ProducerRepository;
 use Domain\ShopStatus\ShopStatusRepository;
 use Domain\Transport\TransportRepository;
 use Domain\PaymentMethod\PaymentMethodRepository;
@@ -13,17 +14,20 @@ class DictionariesApiController
     private $transportRepo;
     private $paymentRepo;
     private $attrRepo;
+    private $producerRepo;
 
     public function __construct(
         ShopStatusRepository $statusRepo,
         TransportRepository $transportRepo,
         PaymentMethodRepository $paymentRepo,
-        AttributeRepository $attrRepo
+        AttributeRepository $attrRepo,
+        ProducerRepository $producerRepo
     ) {
         $this->statusRepo = $statusRepo;
         $this->transportRepo = $transportRepo;
         $this->paymentRepo = $paymentRepo;
         $this->attrRepo = $attrRepo;
+        $this->producerRepo = $producerRepo;
     }
 
     public function statuses(): void
@@ -171,4 +175,34 @@ class DictionariesApiController
             'created' => !empty($result['created']),
         ]);
     }
+
+    public function ensure_producer(): void
+    {
+        if (!ApiRouter::requireMethod('POST')) {
+            return;
+        }
+
+        $body = ApiRouter::getJsonBody();
+        if (!is_array($body)) {
+            ApiRouter::sendError('BAD_REQUEST', 'Missing or invalid JSON body', 400);
+            return;
+        }
+
+        $name = trim((string) ($body['name'] ?? ''));
+        if ($name === '') {
+            ApiRouter::sendError('BAD_REQUEST', 'Missing name', 400);
+            return;
+        }
+
+        $result = $this->producerRepo->ensureProducerForApi($name);
+        if ((int) ($result['id'] ?? 0) <= 0) {
+            ApiRouter::sendError('INTERNAL_ERROR', 'Failed to ensure producer', 500);
+            return;
+        }
+
+        ApiRouter::sendSuccess([
+            'id'      => (int) ($result['id'] ?? 0),
+            'created' => !empty($result['created']),
+        ]);
+    }
 }

docs/API.md

@@ -219,6 +219,7 @@ Odpowiedz:
     "set_id": null,
     "product_unit_id": 1,
     "producer_id": 3,
+    "producer_name": "Nike",
     "date_add": "2026-01-15 10:00:00",
     "date_modify": "2026-02-19 12:00:00",
     "languages": {
@@ -237,7 +238,8 @@ Odpowiedz:
         "tab_description_1": null,
         "tab_name_2": null,
         "tab_description_2": null,
-        "canonical": null
+        "canonical": null,
+        "security_information": null
       }
     },
     "images": [
@@ -253,6 +255,9 @@ Odpowiedz:
         "value_names": {"pl": "Czerwony", "en": "Red"}
       }
     ],
+    "custom_fields": [
+      {"name": "Napis na koszulce", "type": "text", "is_required": 1}
+    ],
     "variants": [
       {
         "id": 101,
@@ -468,6 +473,31 @@ GET api.php?endpoint=dictionaries&action=attributes
 
 Zwraca aktywne atrybuty z wartosciami i wielojezycznymi nazwami.
 
+#### Znajdz lub utworz producenta
+```
+POST api.php?endpoint=dictionaries&action=ensure_producer
+Content-Type: application/json
+
+{
+  "name": "Nike"
+}
+```
+
+Zwraca istniejacego producenta po nazwie lub tworzy nowego. Uzyc przed tworzeniem produktu, jesli producent moze nie istniec.
+
+Odpowiedz:
+```json
+{
+  "status": "ok",
+  "data": {
+    "id": 5,
+    "created": false
+  }
+}
+```
+
+`created: true` gdy producent zostal nowo dodany, `false` gdy juz istnial.
+
 Odpowiedz:
 ```json
 {
@@ -514,4 +544,4 @@ UPDATE pp_settings SET value = 'twoj-klucz-api' WHERE param = 'api_key';
 - Kontrolery: `autoload/api/Controllers/`
   - `OrdersApiController` — zamowienia (5 akcji)
   - `ProductsApiController` — produkty (8 akcji: list, get, create, update, variants, create_variant, update_variant, delete_variant)
-  - `DictionariesApiController` — slowniki (4 akcje: statuses, transports, payment_methods, attributes)
+  - `DictionariesApiController` — slowniki (5 akcji: statuses, transports, payment_methods, attributes, ensure_producer)

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

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

tests/Unit/api/Controllers/DictionariesApiControllerTest.php

@@ -4,6 +4,7 @@ namespace Tests\Unit\api\Controllers;
 use PHPUnit\Framework\TestCase;
 use api\Controllers\DictionariesApiController;
 use Domain\Attribute\AttributeRepository;
+use Domain\Producer\ProducerRepository;
 use Domain\ShopStatus\ShopStatusRepository;
 use Domain\Transport\TransportRepository;
 use Domain\PaymentMethod\PaymentMethodRepository;
@@ -14,6 +15,7 @@ class DictionariesApiControllerTest extends TestCase
     private $mockTransportRepo;
     private $mockPaymentRepo;
     private $mockAttrRepo;
+    private $mockProducerRepo;
     private $controller;
 
     protected function setUp(): void
@@ -22,12 +24,14 @@ class DictionariesApiControllerTest extends TestCase
         $this->mockTransportRepo = $this->createMock(TransportRepository::class);
         $this->mockPaymentRepo = $this->createMock(PaymentMethodRepository::class);
         $this->mockAttrRepo = $this->createMock(AttributeRepository::class);
+        $this->mockProducerRepo = $this->createMock(ProducerRepository::class);
 
         $this->controller = new DictionariesApiController(
             $this->mockStatusRepo,
             $this->mockTransportRepo,
             $this->mockPaymentRepo,
-            $this->mockAttrRepo
+            $this->mockAttrRepo,
+            $this->mockProducerRepo
         );
 
         $_SERVER['REQUEST_METHOD'] = 'GET';

updates/0.30/ver_0.318_manifest.json

@@ -0,0 +1,30 @@
+{
+    "changelog":  "NEW - shopPRO export produktów + API endpoints (ensure_attribute, ensure_attribute_value, upload_image)",
+    "version":  "0.318",
+    "files":  {
+                  "added":  [
+
+                            ],
+                  "deleted":  [
+
+                              ],
+                  "modified":  [
+                                   "admin/templates/integrations/shoppro-settings.php",
+                                   "autoload/Domain/Attribute/AttributeRepository.php",
+                                   "autoload/Domain/Integrations/IntegrationsRepository.php",
+                                   "autoload/Domain/Product/ProductRepository.php",
+                                   "autoload/admin/Controllers/IntegrationsController.php",
+                                   "autoload/admin/Controllers/ShopProductController.php",
+                                   "autoload/api/Controllers/DictionariesApiController.php",
+                                   "autoload/api/Controllers/ProductsApiController.php"
+                               ]
+              },
+    "checksum_zip":  "sha256:6a7eba1b390db94ccda210a5f2cbcd33f17f43d9f34031c4d0793d224df5d541",
+    "sql":  [
+
+            ],
+    "date":  "2026-02-24",
+    "directories_deleted":  [
+
+                            ]
+}

updates/0.30/ver_0.319_manifest.json

@@ -0,0 +1,26 @@
+{
+    "changelog":  "FIX - usunięcie shopPRO eksportu produktów; API produktu: dodano custom_fields i security_information",
+    "version":  "0.319",
+    "files":  {
+                  "added":  [
+
+                            ],
+                  "deleted":  [
+
+                              ],
+                  "modified":  [
+                                   "autoload/Domain/Integrations/IntegrationsRepository.php",
+                                   "autoload/Domain/Product/ProductRepository.php",
+                                   "autoload/admin/Controllers/IntegrationsController.php",
+                                   "autoload/admin/Controllers/ShopProductController.php"
+                               ]
+              },
+    "checksum_zip":  "sha256:99e07eb85aeca1c96607e95c90408bfbc166d97c0b999cc9eb033c6a4f208b97",
+    "sql":  [
+
+            ],
+    "date":  "2026-02-24",
+    "directories_deleted":  [
+
+                            ]
+}

updates/versions.php

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