Merge pull request #19 from Shape-and-Shift/1.4.2

Upgraded to be compatible with Shopware version 6.4

CHANGELOG_de-DE.md

@@ -1,3 +1,7 @@
+# 1.4.2
+* Aktualisiert, um mit Version 6.4 kompatibel zu sein.
+* Mail senden behoben
+
 # 1.4.1
 * Korrigierte js-Kompressionsdatei für Version 1.4.0
 

CHANGELOG_en-GB.md

@@ -1,3 +1,7 @@
+# 1.4.2
+* Upgraded to be compatible with version 6.4
+* Fixed send mail
+
 # 1.4.1
 * Fixed js compress file for version 1.4.0
 

composer.json

@@ -3,7 +3,7 @@
     "description":"ESD / Download plugin",
     "type":"shopware-platform-plugin",
     "keywords": ["esd", "download"],
-    "version":"1.4.1",
+    "version":"1.4.2",
     "license":"proprietary",
     "authors":[
         {

src/Event/EsdDownloadPaymentStatusPaidEvent.php

@@ -71,6 +71,15 @@ public function getEsdOrderListIds(): array
         return $this->templateData['esdOrderListIds'];
     }
 
+    public function getEsdMediaFiles(): array
+    {
+        if (empty($this->templateData['esdMediaFiles'])) {
+            return [];
+        }
+
+        return $this->templateData['esdMediaFiles'];
+    }
+
     public static function getAvailableData(): EventDataCollection
     {
         return (new EventDataCollection())

src/Message/SendMailHandler.php

@@ -2,19 +2,26 @@
 
 namespace Sas\Esd\Message;
 
-use Shopware\Core\Content\MailTemplate\Service\MailService;
+use Shopware\Core\Content\Mail\Service\MailService as MailService;
+use Shopware\Core\Content\MailTemplate\Service\MailService as MailServiceV63;
+
 use Shopware\Core\Framework\MessageQueue\Handler\AbstractMessageHandler;
 
 class SendMailHandler extends AbstractMessageHandler
 {
     /**
-     * @var MailService
+     * @var MailService|MailServiceV63|null
      */
     private $mailService;
 
-    public function __construct(MailService $mailService)
+    public function __construct(?MailService $mailService, ?MailServiceV63 $mailServiceV63)
     {
-        $this->mailService = $mailService;
+        if ($mailServiceV63) {
+            $this->mailService = $mailServiceV63;
+        } else {
+            $this->mailService = $mailService;
+        }
+
     }
 
     /**

src/Resources/app/administration/src/module/sas-esd/component/sas-esd-serial-overview/sas-esd-serial-overview.scss

@@ -1,6 +1,6 @@
 @import "~scss/variables";
 $sw-products-variants-generated-variants-toolbar-background: #f8f9fa;
-$sw-products-variants-generated-variants-toolbar-border: $color-steam-cloud;
+$sw-products-variants-generated-variants-toolbar-border: $color-gray-300;
 
 .sas-esd-serial-overview {
     .sw-card__content {

src/Resources/app/administration/src/module/sas-esd/view/sas-product-detail-esd/index.js

@@ -236,8 +236,10 @@ Component.register('sas-product-detail-esd', {
         },
 
         onDeleteSelectedMedia() {
-            Object.keys(this.selectedItems).forEach((mediaId) => {
-                this.onDeleteMediaItem(mediaId);
+            Object.values(this.selectedItems).forEach((item) => {
+                if (item.media && item.media.id) {
+                    this.onDeleteMediaItem(item.media.id);
+                }
             });
         },
 

src/Resources/app/administration/src/module/sas-esd/view/sas-product-detail-esd/sas-product-detail-esd.html.twig

@@ -28,7 +28,7 @@
                           :allowColumnEdit="true"
                           :allowInlineEdit="true"
                           :compactMode="false"
-                          @selection-change="onSelectionChanged"
+                          @selection-change="(esdMedia) => onSelectionChanged(esdMedia)"
                           @inline-edit-save="onInlineEditSave"
                           :isLoading="isStoreLoading || isLoading">
                 <template #preview-fileName="{ item }">
@@ -53,7 +53,7 @@
                 </template>
 
                 <template #actions="{ item }">
-                    <sw-context-menu-item variant="danger" @click="onDeleteMediaItem(item.id)">
+                    <sw-context-menu-item variant="danger" @click="onDeleteMediaItem(item.media.id)">
                         {{ $tc('global.default.delete') }}
                     </sw-context-menu-item>
                 </template>

src/Resources/app/administration/src/module/sas-esd/view/sas-product-detail-esd/sas-product-detail-esd.scss

@@ -11,8 +11,8 @@
     }
 
     .sw-data-grid__table {
-        border-top: solid 1px $color-steam-cloud;
-        border-bottom: solid 1px $color-steam-cloud;
+        border-top: solid 1px $color-gray-300;
+        border-bottom: solid 1px $color-gray-300;
     }
 
     .sw-field--switch,

src/Resources/config/services.xml

@@ -143,7 +143,8 @@
 
         <!-- Message -->
         <service id="Sas\Esd\Message\SendMailHandler">
-            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MailService"/>
+            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MailService" on-invalid="null"/>
+            <argument type="service" id="Shopware\Core\Content\Mail\Service\MailService" on-invalid="null"/>
             <tag name="messenger.message_handler"/>
         </service>
 

src/SasEsd.php

@@ -70,15 +70,27 @@ protected function dropDatabaseTable(): void
         /** @var Connection $connection */
         $connection = $this->container->get(Connection::class);
 
-        $connection->executeQuery('SET FOREIGN_KEY_CHECKS=0;');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd`');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd_order`');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd_serial`');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd_media`');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd_download_history`');
-        $connection->executeQuery('DROP TABLE IF EXISTS `sas_product_esd_video`');
-        $connection->executeUpdate('ALTER TABLE `product` DROP COLUMN `esd`');
-        $connection->executeQuery('SET FOREIGN_KEY_CHECKS=1;');
+        if (method_exists($connection,'executeStatement')) {
+            $connection->executeStatement('SET FOREIGN_KEY_CHECKS=0;');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd`');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd_order`');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd_serial`');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd_media`');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd_download_history`');
+            $connection->executeStatement('DROP TABLE IF EXISTS `sas_product_esd_video`');
+            $connection->executeStatement('ALTER TABLE `product` DROP COLUMN `esd`');
+            $connection->executeStatement('SET FOREIGN_KEY_CHECKS=1;');
+        } else {
+            $connection->exec('SET FOREIGN_KEY_CHECKS=0;');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd`');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd_order`');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd_serial`');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd_media`');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd_download_history`');
+            $connection->exec('DROP TABLE IF EXISTS `sas_product_esd_video`');
+            $connection->exec('ALTER TABLE `product` DROP COLUMN `esd`');
+            $connection->exec('SET FOREIGN_KEY_CHECKS=1;');
+        }
     }
 
     private function rmdirRecursive($dir): void

src/Service/EsdOrderService.php

@@ -211,6 +211,10 @@ public function fetchSerials(EsdEntity $esd, Context $context): ?EntitySearchRes
     public function isEsdOrder(OrderEntity $order): bool
     {
         foreach ($order->getLineItems() as $lineItem) {
+            if (!$lineItem->getProduct()) {
+                continue;
+            }
+
             /** @var EsdEntity $esd */
             $esd = $lineItem->getProduct()->getExtension('esd');
             if (empty($esd)) {