Merge pull request #6 from mollie/update-207

Update 207
mollie · Jun 27, 2022 · bab0b32 · bab0b32
2 parents dcb786b + 5951e53
commit bab0b32
Show file tree

Hide file tree

Showing 681 changed files with 14,031 additions and 540 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 vendor/
 .idea
+*.log
+*.cache
diff --git a/.htaccess b/.htaccess
@@ -0,0 +1,9 @@
+<Files workflow.php>
+    <IfModule mod_authz_core.c>
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order Allow,Deny
+        Allow from all
+    </IfModule>
+</Files>
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "scripts": {
     "phpcbf": "phpcbf --standard=PSR12 --encoding=utf8 -p ./version",
     "php-cs-fixer": "php-cs-fixer fix",
-    "fix": "phpcbf --standard=PSR12 --encoding=utf8 -p ./version; php-cs-fixer fix"
+    "fix": "php-cs-fixer fix; phpcbf --standard=PSR12 --encoding=utf8 -p ./version"
   },
   "require": {
     "ext-json": "*",

diff --git a/info.xml b/info.xml
@@ -45,9 +45,15 @@
             <SQL>204.sql</SQL>
         </Version>
         <Version nr="205">
-            <CreateDate>2021-08-10</CreateDate>
+            <CreateDate>2021-08-25</CreateDate>
             <SQL>205.sql</SQL>
         </Version>
+        <Version nr="206">
+            <CreateDate>2022-01-11</CreateDate>
+        </Version>
+        <Version nr="207">
+            <CreateDate>2022-06-10</CreateDate>
+        </Version>
         <Hooks>
             <Hook id="75">75_bestellungInDb.php</Hook>
             <Hook id="131">131_globalinclude.php</Hook>
@@ -57,6 +63,13 @@
             <Hook id="181">181_sync.php</Hook>
             <Hook id="210">210_storno.php</Hook>
         </Hooks>
+        <JS>
+            <file>
+                <name>applePay.js</name>
+                <priority>5</priority>
+                <position>body</position>
+            </file>
+        </JS>
         <Adminmenu>
             <Customlink sort="10">
                 <Name>Bestellungen</Name>
@@ -1102,7 +1115,7 @@
                     <ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
                     Guten Tag {$Kunde->cVorname} {$Kunde->cNachname},<br>vielen Dank für Ihre Bestellung bei {$Einstellungen.global.global_shopname}.<br><br><p>Leider konnten wir für die Bestellung <b>{$oPluginMail->Bestellung->cBestellNr}</b> bisher keinen Zahlungseingang feststellen.</p><p>Sollte es bei der Zahlung zu Problemen gekommen sein, können Sie diese über den folgenden Link einfach erneut versuchen.</p><p>Zu zahlender Betrag: {$oPluginMail->Amount}</p><p>Jetzt bezahlen: <a href="{$oPluginMail->PayURL}">{$oPluginMail->PayURL}</a></p>
                     {includeMailTemplate template=footer type=html}]]></ContentHtml>
-                    <ContentText><![CDATA[{{includeMailTemplate template=header type=text}
+                    <ContentText><![CDATA[{includeMailTemplate template=header type=text}
                     Guten Tag {$Kunde->cVorname} {$Kunde->cNachname},
 
                     vielen Dank für Ihre Bestellung bei {$Einstellungen.global.global_shopname}.

diff --git a/version/100/adminmenu/info.php b/version/100/adminmenu/info.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/adminmenu/orders.php b/version/100/adminmenu/orders.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/adminmenu/paymentmethods.php b/version/100/adminmenu/paymentmethods.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/class/Helper.php b/version/100/class/Helper.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/class/Model/AbstractModel.php b/version/100/class/Model/AbstractModel.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/class/Model/Payment.php b/version/100/class/Model/Payment.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/class/Mollie.php b/version/100/class/Mollie.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/frontend/131_globalinclude.php b/version/100/frontend/131_globalinclude.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/frontend/140_smarty.php b/version/100/frontend/140_smarty.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/frontend/144_notify.php b/version/100/frontend/144_notify.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/frontend/181_sync.php b/version/100/frontend/181_sync.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollie.php b/version/100/paymentmethod/JTLMollie.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieBancontact.php b/version/100/paymentmethod/JTLMollieBancontact.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieBanktransfer.php b/version/100/paymentmethod/JTLMollieBanktransfer.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieBelfius.php b/version/100/paymentmethod/JTLMollieBelfius.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieBitcoin.php b/version/100/paymentmethod/JTLMollieBitcoin.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieCreditCard.php b/version/100/paymentmethod/JTLMollieCreditCard.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieDirectDebit.php b/version/100/paymentmethod/JTLMollieDirectDebit.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieEPS.php b/version/100/paymentmethod/JTLMollieEPS.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieGiftcard.php b/version/100/paymentmethod/JTLMollieGiftcard.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieGiropay.php b/version/100/paymentmethod/JTLMollieGiropay.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieIDEAL.php b/version/100/paymentmethod/JTLMollieIDEAL.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieINGHomePay.php b/version/100/paymentmethod/JTLMollieINGHomePay.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieKBC.php b/version/100/paymentmethod/JTLMollieKBC.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieKlarnaPayLater.php b/version/100/paymentmethod/JTLMollieKlarnaPayLater.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieKlarnaSliceIt.php b/version/100/paymentmethod/JTLMollieKlarnaSliceIt.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMolliePayPal.php b/version/100/paymentmethod/JTLMolliePayPal.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMolliePaysafecard.php b/version/100/paymentmethod/JTLMolliePaysafecard.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/100/paymentmethod/JTLMollieSofort.php b/version/100/paymentmethod/JTLMollieSofort.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/adminmenu/info.php b/version/107/adminmenu/info.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/adminmenu/orders.php b/version/107/adminmenu/orders.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/adminmenu/paymentmethods.php b/version/107/adminmenu/paymentmethods.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/class/ExclusiveLock.php b/version/107/class/ExclusiveLock.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/class/Helper.php b/version/107/class/Helper.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/class/Model/AbstractModel.php b/version/107/class/Model/AbstractModel.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/class/Model/Payment.php b/version/107/class/Model/Payment.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */
 

diff --git a/version/107/class/Mollie.php b/version/107/class/Mollie.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright 2021 WebStollen GmbH
+ * @copyright 2022 WebStollen GmbH
  * @link https://www.webstollen.de
  */