diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md index e17ccef..1450854 100644 --- a/CHANGELOG_de-DE.md +++ b/CHANGELOG_de-DE.md @@ -1,3 +1,6 @@ +# 1.2.9 +* Das Neuladen der verbleibenden Download-Daten in Shopware >= v6.3.2.0 wurde behoben. Der verbleibende Download kann aktualisiert werden, nachdem Sie auf "Jetzt herunterladen" geklickt haben + # 1.2.8 * Ein Hotfix zum Senden der Download-E-Mail in der Shopware version 6.3.3.0 wurde erstellt diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md index 9772479..a0c8e1b 100644 --- a/CHANGELOG_en-GB.md +++ b/CHANGELOG_en-GB.md @@ -1,3 +1,6 @@ +# 1.2.9 +* Fixed reload the remaining download data on Shopware >= v6.3.2.0, can update the remaining download after click download now + # 1.2.8 * Made a hotfix to send the download email on Shopware version 6.3.3.0 diff --git a/composer.json b/composer.json index 95161ec..b2d5583 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description":"ESD / Download plugin", "type":"shopware-platform-plugin", "keywords": ["esd", "download"], - "version":"1.2.8", + "version":"1.2.9", "license":"proprietary", "authors":[ { diff --git a/src/Resources/app/storefront/dist/storefront/js/sas-esd.js b/src/Resources/app/storefront/dist/storefront/js/sas-esd.js index 24e5a4e..aa094fe 100644 --- a/src/Resources/app/storefront/dist/storefront/js/sas-esd.js +++ b/src/Resources/app/storefront/dist/storefront/js/sas-esd.js @@ -1 +1 @@ -(window.webpackJsonp=window.webpackJsonp||[]).push([["sas-esd"],{"9uXL":function(e,n,t){"use strict";t.r(n);var o=t("FGIj"),r=t("p4AR");function i(e){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function u(e,n){for(var t=0;t - diff --git a/src/Resources/views/storefront/page/account/downloads/index.html.twig b/src/Resources/views/storefront/page/account/downloads/index.html.twig index 7a8b292..770be57 100644 --- a/src/Resources/views/storefront/page/account/downloads/index.html.twig +++ b/src/Resources/views/storefront/page/account/downloads/index.html.twig @@ -27,8 +27,7 @@ diff --git a/src/Resources/views/storefront/page/account/downloads/table.html.twig b/src/Resources/views/storefront/page/account/downloads/table.html.twig index 362410c..f7404f5 100644 --- a/src/Resources/views/storefront/page/account/downloads/table.html.twig +++ b/src/Resources/views/storefront/page/account/downloads/table.html.twig @@ -51,7 +51,7 @@ {% if esdOrder.esd.esdMedia|length %} - {{ "sasEsd.account.downloadTable.downloadButton"|trans|sw_sanitize }} diff --git a/src/Storefront/Controller/DownloadsController.php b/src/Storefront/Controller/DownloadsController.php index af1146a..69a6ca9 100644 --- a/src/Storefront/Controller/DownloadsController.php +++ b/src/Storefront/Controller/DownloadsController.php @@ -9,7 +9,6 @@ use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface; use Shopware\Core\Framework\Routing\Annotation\RouteScope; use Shopware\Core\Framework\Store\Services\StoreService; -use Shopware\Core\Framework\Uuid\Uuid; use Shopware\Core\PlatformRequest; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Shopware\Storefront\Controller\StorefrontController; @@ -37,21 +36,14 @@ class DownloadsController extends StorefrontController */ private $esdDownloadService; - /** - * @var StoreService - */ - private $storeService; - public function __construct( EntityRepositoryInterface $esdOrderRepository, EsdService $esdService, - EsdDownloadService $esdDownloadService, - StoreService $storeService + EsdDownloadService $esdDownloadService ) { $this->esdOrderRepository = $esdOrderRepository; $this->esdService = $esdService; $this->esdDownloadService = $esdDownloadService; - $this->storeService = $storeService; } /** @@ -66,18 +58,11 @@ public function getAccountDownloads(SalesChannelContext $context): Response /** @var EsdOrderCollection $esdOrdersCollection */ $esdOrdersCollection = $esdOrders->getEntities(); - $isReloadData = true; - $shopwareVersion = $this->storeService->getShopwareVersion(); - if ($shopwareVersion >= '6.3.2.0' && $shopwareVersion < '6.3.3.0') { - $isReloadData = false; - } - return $this->renderStorefront( 'storefront/page/account/downloads/index.html.twig', [ 'esdOrders' => $esdOrders, 'downloadLimits' => $this->esdDownloadService->getLimitDownloadNumberList($esdOrdersCollection), - 'isReloadData' => $isReloadData ] ); }