Skip to content

Commit

Permalink
#163, setting request url, update plugin version
Browse files Browse the repository at this point in the history
  • Loading branch information
kmWebStollen committed Sep 19, 2022
1 parent 6de77d4 commit 210dac3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
<Version nr="207">
<CreateDate>2022-06-10</CreateDate>
</Version>
<Version nr="208">
<CreateDate>2022-09-19</CreateDate>
</Version>
<Hooks>
<Hook id="75">75_bestellungInDb.php</Hook>
<Hook id="131">131_globalinclude.php</Hook>
Expand Down Expand Up @@ -186,6 +189,19 @@
<Option value="N" sort="3"><![CDATA[Nein, ich mache alles manuell.]]></Option>
</SelectboxOptions>
</Setting>
<Setting type="selectbox" initialValue="N" sort="52" conf="Y">
<Name>Tracking URL den Versandinformationen anfügen?</Name>
<Description>
<![CDATA[Soll die Tracking URL für OrderAPI Methoden an Mollie gesendet werden?
Achtung wenn die Tracking URL nicht im korrekt URL Format ist, wird dies von mollie abgelehnt. In diesem Fall kann der gesamte Versandstatus nicht an mollie übergeben werden.]]>
</Description>
<ValueName>trackingActive</ValueName>
<SelectboxOptions>
<Option value="N" sort="1"><![CDATA[Nein]]></Option>
<Option value="Y" sort="2"><![CDATA[Ja]]></Option>
</SelectboxOptions>
</Setting>

<Setting type="selectbox" initialValue="N" sort="40" conf="Y">
<Name>Bestellungen automatisch stornieren</Name>
<Description>Wenn diese Einstellung aktiviert ist, werden komplett Stornierte Bestellungen auch bei
Expand Down
2 changes: 1 addition & 1 deletion version/208/class/Shipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function loadRequest(&$options = [])
'carrier' => utf8_encode($oVersand->getLogistik()),
'code' => utf8_encode($oVersand->getIdentCode()),
];
if ($oVersand->getLogistikVarUrl()) {
if ($oVersand->getLogistikVarUrl() && (Helper::getSetting('trackingActive') === 'Y')) {
$tracking['url'] = utf8_encode($oVersand->getLogistikURL());
}
$this->tracking = $tracking;
Expand Down

0 comments on commit 210dac3

Please sign in to comment.