Skip to content

Commit

Permalink
version 102
Browse files Browse the repository at this point in the history
  • Loading branch information
C. Proske committed Apr 23, 2019
1 parent 7fe035f commit 6a69097
Show file tree
Hide file tree
Showing 90 changed files with 3,275 additions and 794 deletions.
Empty file modified README.md
100755 → 100644
View file
Empty file.
Empty file modified composer.json
100755 → 100644
View file
Empty file.
121 changes: 25 additions & 96 deletions composer.lock
100755 → 100644
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 17 additions & 9 deletions info.xml
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<jtlshop3plugin>
<Name>mollie</Name>
<Description>Zahlungsartplugin für mollie.com</Description>
<Description>Zahlungsartplugin für mollie.com</Description>
<Author>WebStollen</Author>
<URL>http://www.webstollen.de/</URL>
<XMLVersion>102</XMLVersion>
Expand All @@ -15,6 +15,12 @@
<Version nr="101">
<CreateDate>2019-02-26</CreateDate>
</Version>
<Version nr="102">
<CreateDate>2019-04-23</CreateDate>
</Version>
<Version nr="103">
<CreateDate>2019-04-23</CreateDate>
</Version>
<Hooks>
<Hook id="131">131_globalinclude.php</Hook>
<Hook id="144">144_notify.php</Hook>
Expand All @@ -38,23 +44,25 @@
<Name>Einstellungen</Name>
<Setting type="text" initialValue="" sort="10" conf="Y">
<Name>API Key:</Name>
<Description>Füge hier deinen mollie API Key ein</Description>
<Description>Füge hier deinen mollie API Key ein</Description>
<ValueName>api_key</ValueName>
</Setting>
<Setting type="selectbox" initialValue="S" sort="20" conf="Y">
<Name>Zahlungsart Daten syncronisiernen</Name>
<Description>Lädt Name / Bild für die jeweilige Sprache automatisch von mollie, und speichert diese in der Datenbank</Description>
<Description>Lädt Name / Bild für die jeweilige Sprache automatisch von mollie, und speichert diese
in der Datenbank
</Description>
<ValueName>paymentmethod_sync</ValueName>
<SelectboxOptions>
<Option value="N" sort="1"><![CDATA[Nein]]></Option>
<Option value="size1x" sort="2"><![CDATA[Ja, Bildgröße 1x]]></Option>
<Option value="size2x" sort="3"><![CDATA[Ja, Bildgröße 2x]]></Option>
<Option value="size1x" sort="2"><![CDATA[Ja, Bildgröße 1x]]></Option>
<Option value="size2x" sort="3"><![CDATA[Ja, Bildgröße 2x]]></Option>
<Option value="svg" sort="4"><![CDATA[Ja, Bild SVG]]></Option>
</SelectboxOptions>
</Setting>
<Setting type="selectbox" initialValue="N" sort="30" conf="Y">
<Name>Checkout Styles laden</Name>
<Description>Lädt Stylesheets für das Evo Template, um den Checkout zu verschönern.</Description>
<Description>Lädt Stylesheets für das Evo Template, um den Checkout zu verschönern.</Description>
<ValueName>load_styles</ValueName>
<SelectboxOptions>
<Option value="N" sort="1"><![CDATA[Nein]]></Option>
Expand Down Expand Up @@ -160,9 +168,9 @@
<ClassName>JTLMollieBanktransfer</ClassName>
<TemplateFile>tpl/bestellabschluss.tpl</TemplateFile>
<MethodLanguage iso="GER">
<Name>SEPA Überweisung</Name>
<Name>SEPA Überweisung</Name>
<ChargeName>mollie</ChargeName>
<InfoText>Bezahlen Sie bequem mit SEPA Überweisung.</InfoText>
<InfoText>Bezahlen Sie bequem mit SEPA Überweisung.</InfoText>
</MethodLanguage>
</Method>
<Method>
Expand Down Expand Up @@ -427,4 +435,4 @@
</Method>
</PaymentMethod>
</Install>
</jtlshop3plugin>
</jtlshop3plugin>
26 changes: 14 additions & 12 deletions version/100/adminmenu/info.php
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<?php

use ws_mollie\Helper;

require_once __DIR__ . '/../class/Helper.php';
try {
\ws_mollie\Helper::init();
Helper::init();

if (array_key_exists("action", $_REQUEST) && $_REQUEST['action'] === 'update-plugin') {
Shop::Smarty()->assign('defaultTabbertab', \ws_mollie\Helper::getAdminmenu('Info'));
\ws_mollie\Helper::selfupdate();
Shop::Smarty()->assign('defaultTabbertab', Helper::getAdminmenu('Info'));
Helper::selfupdate();
}

$svgQuery = http_build_query([
'p' => \ws_mollie\Helper::oPlugin()->cPluginID,
'v' => \ws_mollie\Helper::oPlugin()->nVersion,
'p' => Helper::oPlugin()->cPluginID,
'v' => Helper::oPlugin()->nVersion,
's' => defined('APPLICATION_VERSION') ? APPLICATION_VERSION : JTL_VERSION,
'd' => \ws_mollie\Helper::getDomain(),
'd' => Helper::getDomain(),
'php' => PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION,
]);

echo "<script type='application/javascript' src='//cdn.webstollen.com/plugin/js/ws.js?p=" . \ws_mollie\Helper::oPlugin()->cPluginID . '&v=' . \ws_mollie\Helper::oPlugin()->nVersion . "'></script>";
echo "<script type='application/javascript' src='//cdn.webstollen.com/plugin/js/ws.js?p=" . Helper::oPlugin()->cPluginID . '&v=' . Helper::oPlugin()->nVersion . "'></script>";
echo "<div id='ws-head-bar' class='row'>" .
" <div class='col-md-4 text-center'>" .
" <object data='//lic.dash.bar/info/licence?{$svgQuery}' type='image/svg+xml'>" .
Expand All @@ -37,15 +39,15 @@
'</div>';

try {
$latestRelease = \ws_mollie\Helper::getLatestRelease(array_key_exists('update', $_REQUEST));
if ((int)\ws_mollie\Helper::oPlugin()->nVersion < (int)$latestRelease->version) {
$latestRelease = Helper::getLatestRelease(array_key_exists('update', $_REQUEST));
if ((int)Helper::oPlugin()->nVersion < (int)$latestRelease->version) {
Shop::Smarty()->assign('update', $latestRelease);
}
} catch (\Exception $e) {
} catch (Exception $e) {
}

Shop::Smarty()->display(\ws_mollie\Helper::oPlugin()->cAdminmenuPfad . '/tpl/info.tpl');
Shop::Smarty()->display(Helper::oPlugin()->cAdminmenuPfad . '/tpl/info.tpl');
} catch (Exception $e) {
echo "<div class='alert alert-danger'>Fehler: {$e->getMessage()}</div>";
\ws_mollie\Helper::logExc($e);
Helper::logExc($e);
}
Loading

0 comments on commit 6a69097

Please sign in to comment.