Skip to content

Commit bab0b32

Browse files
kmWebStollenkmWebStollen
authored
Merge pull request #6 from mollie/update-207
Update 207
2 parents dcb786b + 5951e53 commit bab0b32

File tree

681 files changed

+14031
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

681 files changed

+14031
-540
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
vendor/
22
.idea
3+
*.log
4+
*.cache

‎.htaccess‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Files workflow.php>
2+
<IfModule mod_authz_core.c>
3+
Require all granted
4+
</IfModule>
5+
<IfModule !mod_authz_core.c>
6+
Order Allow,Deny
7+
Allow from all
8+
</IfModule>
9+
</Files>

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"phpcbf": "phpcbf --standard=PSR12 --encoding=utf8 -p ./version",
77
"php-cs-fixer": "php-cs-fixer fix",
8-
"fix": "phpcbf --standard=PSR12 --encoding=utf8 -p ./version; php-cs-fixer fix"
8+
"fix": "php-cs-fixer fix; phpcbf --standard=PSR12 --encoding=utf8 -p ./version"
99
},
1010
"require": {
1111
"ext-json": "*",

‎info.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@
4545
<SQL>204.sql</SQL>
4646
</Version>
4747
<Version nr="205">
48-
<CreateDate>2021-08-10</CreateDate>
48+
<CreateDate>2021-08-25</CreateDate>
4949
<SQL>205.sql</SQL>
5050
</Version>
51+
<Version nr="206">
52+
<CreateDate>2022-01-11</CreateDate>
53+
</Version>
54+
<Version nr="207">
55+
<CreateDate>2022-06-10</CreateDate>
56+
</Version>
5157
<Hooks>
5258
<Hook id="75">75_bestellungInDb.php</Hook>
5359
<Hook id="131">131_globalinclude.php</Hook>
@@ -57,6 +63,13 @@
5763
<Hook id="181">181_sync.php</Hook>
5864
<Hook id="210">210_storno.php</Hook>
5965
</Hooks>
66+
<JS>
67+
<file>
68+
<name>applePay.js</name>
69+
<priority>5</priority>
70+
<position>body</position>
71+
</file>
72+
</JS>
6073
<Adminmenu>
6174
<Customlink sort="10">
6275
<Name>Bestellungen</Name>
@@ -1102,7 +1115,7 @@
11021115
<ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
11031116
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>
11041117
{includeMailTemplate template=footer type=html}]]></ContentHtml>
1105-
<ContentText><![CDATA[{{includeMailTemplate template=header type=text}
1118+
<ContentText><![CDATA[{includeMailTemplate template=header type=text}
11061119
Guten Tag {$Kunde->cVorname} {$Kunde->cNachname},
11071120
11081121
vielen Dank für Ihre Bestellung bei {$Einstellungen.global.global_shopname}.

‎version/100/adminmenu/info.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

‎version/100/adminmenu/orders.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

‎version/100/adminmenu/paymentmethods.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

‎version/100/class/Helper.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

‎version/100/class/Model/AbstractModel.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

‎version/100/class/Model/Payment.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
2+
23
/**
3-
* @copyright 2021 WebStollen GmbH
4+
* @copyright 2022 WebStollen GmbH
45
* @link https://www.webstollen.de
56
*/
67

0 commit comments

Comments
 (0)