Merge pull request #3620 from plentymarkets/fix/small_feedback_about_…

…gpsr_display Fix/small feedback about gpsr display
plentymarkets · Dec 4, 2024 · 31049a5 · 31049a5
2 parents e0fa89e + a7c8e9a
commit 31049a5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/config.json b/config.json
@@ -993,7 +993,7 @@
                                 "caption": "Config.itemManufacturerTown"
                             },
                             {
-                                "value": "country",
+                                "value": "countryId",
                                 "caption": "Config.itemManufacturerCountry"
                             },
                             {

diff --git a/resources/lang/de/Widget.properties b/resources/lang/de/Widget.properties
@@ -784,14 +784,14 @@ dataFieldBarcodeType = "Typ"
 dataFieldBarcodeCode = "Code"
 ; Data Fields - Manufacturer
 dataFieldManufacturer = "Hersteller"
-dataFieldManufacturerName = "Herstellername"
+dataFieldManufacturerName = "Hersteller Name"
 dataFieldManufacturerExternalName = "Externer Herstellername"
 dataFieldManufacturerLogo = "Herstellerlogo"
 dataFieldManufacturerHomepage = "Hersteller Homepage"
-dataFieldManufacturerStreet = "Herstellerstraße"
-dataFieldManufacturerHouseNo = "Hergestellte Hausnummer"
+dataFieldManufacturerStreet = "Hersteller Straße"
+dataFieldManufacturerHouseNo = "Hersteller Hausnummer"
 dataFieldManufacturerPostCode = "Hersteller Postleitzahl"
-dataFieldManufacturerTown = "Hersteller Ort"
+dataFieldManufacturerTown = "Hersteller Stadt"
 dataFieldManufacturerCountry = "Hersteller Land"
 dataFieldManufacturerPhoneNo = "Hersteller Telefonnummer"
 dataFieldManufacturerFaxNo = "Hersteller Faxnummer"
@@ -802,7 +802,7 @@ dataFieldManufacturerResponsibleName = "EU-Verantwortlicher Name"
 dataFieldManufacturerResponsibleStreet = "EU-Verantwortlicher Straße"
 dataFieldManufacturerResponsibleHouseNo = "EU-Verantwortlicher Hausnummer"
 dataFieldManufacturerResponsiblePostCode = "EU-Verantwortlicher Postleitzahl"
-dataFieldManufacturerResponsibleTown = "EU-Verantwortlicher Ort"
+dataFieldManufacturerResponsibleTown = "EU-Verantwortlicher Stadt"
 dataFieldManufacturerResponsibleCountry = "EU-Verantwortlicher Land"
 dataFieldManufacturerResponsibleEmail = "EU-Verantwortlicher E-Mail"
 dataFieldManufacturerResponsiblePhoneNo = "EU-Verantwortlicher Telefonnummer"

diff --git a/src/Builders/EuManufacturer/EuManufacturerBuilder.php b/src/Builders/EuManufacturer/EuManufacturerBuilder.php
@@ -56,9 +56,9 @@ public function withDetailedAddress(): EuManufacturerBuilder
      */
     public function withGeneralAddress(): EuManufacturerBuilder
     {
+        $this->generalAddressBuilder->withPostCode();
         $this->generalAddressBuilder->withCity();
         $this->generalAddressBuilder->withCountry();
-        $this->generalAddressBuilder->withPostCode();
         $this->results[] = $this->generalAddressBuilder->build();
 
         return $this;

diff --git a/src/Wizard/ShopWizard/Config/ItemViewConfig.php b/src/Wizard/ShopWizard/Config/ItemViewConfig.php
@@ -75,7 +75,7 @@ class ItemViewConfig
         "itemManufacturerHouseNo"           => "houseNo",
         "itemManufacturerPostcode"          => "postcode",
         "itemManufacturerTown"              => "town",
-        "itemManufacturerCountry"           => "country",
+        "itemManufacturerCountry"           => "countryId",
         "itemManufacturerTelephoneNumber"   => "phoneNumber",
         "itemManufacturerFaxNumber"         => "faxNumber",
         "itemManufacturerEmail"             => "email",