diff --git a/Packlink/Controllers/Backend/PacklinkDefaultWarehouse.php b/Packlink/Controllers/Backend/PacklinkDefaultWarehouse.php index bb5efea..a8ee90d 100644 --- a/Packlink/Controllers/Backend/PacklinkDefaultWarehouse.php +++ b/Packlink/Controllers/Backend/PacklinkDefaultWarehouse.php @@ -1,8 +1,8 @@ getSupportedCountries(); foreach ($supportedCountries as $country) { - $country->registrationLink = str_replace('shopware', 'pro', $country->registrationLink); $country->name = Translation::get("configuration/country/{$country->code}"); } diff --git a/Packlink/Controllers/Backend/PacklinkRegistration.php b/Packlink/Controllers/Backend/PacklinkRegistration.php new file mode 100644 index 0000000..d82abd7 --- /dev/null +++ b/Packlink/Controllers/Backend/PacklinkRegistration.php @@ -0,0 +1,29 @@ +getSupportedCountries(); + + foreach ($supportedCountries as $country) { + $country->registrationLink = str_replace('shopware', 'pro', $country->registrationLink); + $country->name = Translation::get("configuration/country/{$country->code}"); + } + + Response::dtoEntitiesResponse($supportedCountries); + } +} diff --git a/Packlink/Resources/snippets/backend/packlink/configuration.ini b/Packlink/Resources/snippets/backend/packlink/configuration.ini index 966d011..113e667 100644 --- a/Packlink/Resources/snippets/backend/packlink/configuration.ini +++ b/Packlink/Resources/snippets/backend/packlink/configuration.ini @@ -123,6 +123,16 @@ configuration/country/TR = "Turkey" configuration/country/IE = "Ireland" configuration/country/GB = "United Kingdom" configuration/country/HU = "Hungary" +configuration/country/PL = "Poland" +configuration/country/CH = "Switzerland" +configuration/country/LU = "Luxembourg" +configuration/country/AR = "Argentina" +configuration/country/US = "United States" +configuration/country/BO = "Bolivia" +configuration/country/MX = "Mexico" +configuration/country/CL = "Chile" +configuration/country/CZ = "Czech Republic" +configuration/country/SE = "Sweden" configuration/importingservices = "We are importing the best shipping services for your shipments." configuration/takefewseconds = "This process could take a few seconds." configuration/troublereceivingservices = "We are having troubles getting shipping services." @@ -306,6 +316,16 @@ configuration/country/TR = "Türkei" configuration/country/IE = "Irland" configuration/country/HU = "Ungarn" configuration/country/GB = "Vereinigtes Königreich" +configuration/country/PL = "Polen" +configuration/country/CH = "Schweiz" +configuration/country/LU = "Luxemburg" +configuration/country/AR = "Argentinien" +configuration/country/US = "Vereinigte Staaten" +configuration/country/BO = "Bolivien" +configuration/country/MX = "Mexiko" +configuration/country/CL = "Chile" +configuration/country/CZ = "Tschechien" +configuration/country/SE = "Schweden" configuration/importingservices = "Die besten Versanddienste für Ihre Sendungen werden jetzt importiert." configuration/takefewseconds = "Dieser Vorgang könnte einige Sekunden dauern." configuration/troublereceivingservices = "Beim Abrufen der Versanddienste ist ein Problem aufgetreten." @@ -488,6 +508,16 @@ configuration/country/TR = "Turquie" configuration/country/IE = "Irlande" configuration/country/GB = "Royaume-Uni" configuration/country/HU = "Hongrie" +configuration/country/PL = "Pologne" +configuration/country/CH = "Suisse" +configuration/country/LU = "Luxembourg" +configuration/country/AR = "Argentine" +configuration/country/US = "États Unis" +configuration/country/BO = "Bolivie" +configuration/country/MX = "Mexique" +configuration/country/CL = "Chili" +configuration/country/CZ = "République Tchèque" +configuration/country/SE = "Suède" configuration/importingservices = "Nous importons les meilleurs services de livraison pour vos envois." configuration/takefewseconds = "Ce processus peut prendre quelques secondes." configuration/troublereceivingservices = "Nous rencontrons des problèmes dans l’importation des services de livraison." @@ -670,6 +700,16 @@ configuration/country/TR = "Turchia" configuration/country/IE = "Irlanda" configuration/country/GB = "Regno Unito" configuration/country/HU = "Ungheria" +configuration/country/PL = "Polonia" +configuration/country/CH = "Svizzera" +configuration/country/LU = "Lussemburgo" +configuration/country/AR = "Argentina" +configuration/country/US = "Stati Uniti" +configuration/country/BO = "Bolivia" +configuration/country/MX = "Messico" +configuration/country/CL = "Chile" +configuration/country/CZ = "Repubblica Ceca" +configuration/country/SE = "Svezia" configuration/importingservices = "Stiamo importando i migliori servizi di spedizione per le tue spedizioni." configuration/takefewseconds = "Questo processo potrebbe richiedere qualche istante." configuration/troublereceivingservices = "Si è verificato un problema durante l’acquisizione dei servizi di spedizione." @@ -852,6 +892,16 @@ configuration/country/TR = "Turquía" configuration/country/IE = "Irlanda" configuration/country/GB = "Reino Unido" configuration/country/HU = "Hungría" +configuration/country/PL = "Polonia" +configuration/country/CH = "Suiza" +configuration/country/LU = "Luxemburgo" +configuration/country/AR = "Argentina" +configuration/country/US = "Estados Unidos" +configuration/country/BO = "Bolivia" +configuration/country/MX = "México" +configuration/country/CL = "Chile" +configuration/country/CZ = "Republica checa" +configuration/country/SE = "Suecia" configuration/importingservices = "Estamos importando los mejores servicios de mensajería para tus envíos." configuration/takefewseconds = "Este proceso puede tardar unos segundos." configuration/troublereceivingservices = "We are having troubles getting shipping services." diff --git a/Packlink/Resources/views/backend/packlink_login/index.tpl b/Packlink/Resources/views/backend/packlink_login/index.tpl index c7ab739..70e2a91 100644 --- a/Packlink/Resources/views/backend/packlink_login/index.tpl +++ b/Packlink/Resources/views/backend/packlink_login/index.tpl @@ -35,7 +35,7 @@
{s name="login/country"}Select country to start{/s}
- +
diff --git a/Packlink/Services/BusinessLogic/ConfigurationService.php b/Packlink/Services/BusinessLogic/ConfigurationService.php index 1506dcd..534c89d 100644 --- a/Packlink/Services/BusinessLogic/ConfigurationService.php +++ b/Packlink/Services/BusinessLogic/ConfigurationService.php @@ -11,7 +11,6 @@ class ConfigurationService extends Configuration { const INTEGRATION_NAME = 'Shopware'; - const DEFAULT_VERSION = '1.0.0'; const ECOMMERCE_NAME = 'Shopware'; const DRAFT_SOURCE = 'module_shopware'; const MAX_TASK_INACTIVITY_PERIOD = 60; diff --git a/Packlink/composer.json b/Packlink/composer.json index fee3fc3..863386f 100755 --- a/Packlink/composer.json +++ b/Packlink/composer.json @@ -2,7 +2,7 @@ "name": "packlink/shopware", "description": "Packlink Shipping Shopware plugin", "type": "library", - "version": "1.0.0", + "version": "1.0.1", "repositories": [ { "type": "vcs", @@ -13,7 +13,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.6", - "packlink/integration-core": "2.1.3", + "packlink/integration-core": "2.3.0", "ext-json": "*", "ext-curl": "*", "ext-zip": "*", diff --git a/Packlink/composer.lock b/Packlink/composer.lock index 0273ac0..79dcd0a 100644 --- a/Packlink/composer.lock +++ b/Packlink/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "35f060ce7fed43729392275eab2cee0b", + "content-hash": "9de58031a71e1f9dbd943aa841b95f3c", "packages": [ { "name": "iio/libmergepdf", @@ -58,16 +58,16 @@ }, { "name": "packlink/integration-core", - "version": "2.1.3", + "version": "v2.3.0", "source": { "type": "git", "url": "git@github.com:packlink-dev/ecommerce_module_core.git", - "reference": "645d1641ba013b9cfaf3abb99b4ee828b41eb9c3" + "reference": "0f338cb6f8ef4b014e6a28a8c101d3ba4670af57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/645d1641ba013b9cfaf3abb99b4ee828b41eb9c3", - "reference": "645d1641ba013b9cfaf3abb99b4ee828b41eb9c3", + "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/0f338cb6f8ef4b014e6a28a8c101d3ba4670af57", + "reference": "0f338cb6f8ef4b014e6a28a8c101d3ba4670af57", "shasum": "" }, "require": { @@ -94,7 +94,7 @@ "proprietary" ], "description": "Packlink integrations core library", - "time": "2020-06-29T07:52:43+00:00" + "time": "2021-01-18T13:27:44+00:00" }, { "name": "setasign/fpdf", diff --git a/Packlink/plugin.xml b/Packlink/plugin.xml index 346d848..cfece75 100644 --- a/Packlink/plugin.xml +++ b/Packlink/plugin.xml @@ -5,7 +5,7 @@ - 1.0.0 + 1.0.1 (c) by Packlink Shipping S.L. proprietary https://pro.packlink.de/ diff --git a/PluginInstallation/1.0.1/Packlink.zip b/PluginInstallation/1.0.1/Packlink.zip new file mode 100644 index 0000000..2af88fb Binary files /dev/null and b/PluginInstallation/1.0.1/Packlink.zip differ diff --git a/PluginInstallation/1.0.1/Release notes 1.0.1.txt b/PluginInstallation/1.0.1/Release notes 1.0.1.txt new file mode 100644 index 0000000..e69de29