Skip to content

Commit

Permalink
init version 101
Browse files Browse the repository at this point in the history
  • Loading branch information
C. Proske committed Feb 26, 2019
1 parent 8dd2e2f commit 0f79108
Show file tree
Hide file tree
Showing 40 changed files with 2,178 additions and 38 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
vendor/
.idea
12 changes: 6 additions & 6 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ If you have no experience with this, then leave the installation of this module
1. Download the latest version of the module (the '.zip' file) via the [Releases page](https://github.com/mollie/mollie-JTL/releases)
2. Go to the administration panel of your JTL-Shop
3. In your administration panel, select the *'Plugins'* menu and then choose *'Pluginverwaltung'*
4. Click the *'Upload'* tab, select *'Auswählen'* and then upload the '.zip' file which you downloaded earlier
5. After the module has been uploaded, go to the *'Verfügbar'* tag, activate the checkbox for 'mollie' and press *'Installieren'*
4. Click the *'Upload'* tab, select *'Auswählen'* and then upload the '.zip' file which you downloaded earlier
5. After the module has been uploaded, go to the *'Verfügbar'* tag, activate the checkbox for 'mollie' and press *'Installieren'*
6. Switching back to the *'Aktiviert'* tab you select the config button ![](https://cdn.webstollen.com/plugin/ws_mollie/cogs.png)
7. Enter your API Key in the Form on the *'Einstellungen'* tab and save the data.

Expand Down Expand Up @@ -90,8 +90,8 @@ for more than 40,000 websites.

Because payments are guaranteed, this payment method is a huge surplus for your online store.

### ING HomePay
[ING HomePay](https://www.mollie.com/en/payments/ing-homepay). Mollie allows you to quickly and easily accept payments with ING Home'Pay.
### ING Home?Pay
[ING Home?Pay](https://www.mollie.com/en/payments/ing-homepay). Mollie allows you to quickly and easily accept payments with ING Home'Pay.

It only takes 10 minutes to start receiving payments and there are no hidden fees involved, you only pay for successful transactions.

Expand Down Expand Up @@ -126,10 +126,10 @@ There is no need to set a redirect URL or webhook. The module automatically does
**Can I only accept Orders where the Payment is made already?**

* You can configure each Payment method to "save orders after payment"
* In your administration panel go to *"Storefront > Zahlungsarten > Übersicht"*. Choose the desired payment method
* In your administration panel go to *"Storefront > Zahlungsarten > Übersicht"*. Choose the desired payment method
* Set *'Zahlung vor Bestellabschluss'* to *'Ja'*

# Support #

Do you have problems with the installation or do you think the module contains a bug? Open a Ticket
at [ws-url.de/help](https://ws-url.de/help) with a accurate description of the problem.
at [ws-url.de/help](https://ws-url.de/help) with a accurate description of the problem.
2 changes: 1 addition & 1 deletion composer.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"roave/security-advisories": "dev-master",
"mollie/mollie-api-php": "^2.2"
"mollie/mollie-api-php": "^2.6.1"
},
"license": "Proprietary",
"authors": [
Expand Down
116 changes: 94 additions & 22 deletions composer.lock
100644 → 100755

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

21 changes: 12 additions & 9 deletions info.xml
100644 → 100755
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 @@ -12,6 +12,9 @@
<SQL>100.sql</SQL>
<CreateDate>2019-02-11</CreateDate>
</Version>
<Version nr="101">
<CreateDate>2019-02-26</CreateDate>
</Version>
<Hooks>
<Hook id="131">131_globalinclude.php</Hook>
<Hook id="144">144_notify.php</Hook>
Expand All @@ -35,23 +38,23 @@
<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&#xA; in der Datenbank&#xA; </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 @@ -157,9 +160,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 All @@ -177,7 +180,7 @@
<ClassName>JTLMollieBelfius</ClassName>
<TemplateFile>tpl/bestellabschluss.tpl</TemplateFile>
<MethodLanguage iso="GER">
<Name>SEPA Überweisung</Name>
<Name>Belfius</Name>
<ChargeName>mollie</ChargeName>
<InfoText>Bezahlen Sie bequem mit Belfius.</InfoText>
</MethodLanguage>
Expand Down
52 changes: 52 additions & 0 deletions version/101/adminmenu/info.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php

require_once __DIR__ . '/../class/Helper.php';
try {
\ws_mollie\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();
}

$svgQuery = http_build_query([
'p' => \ws_mollie\Helper::oPlugin()->cPluginID,
'v' => \ws_mollie\Helper::oPlugin()->nVersion,
's' => defined('APPLICATION_VERSION') ? APPLICATION_VERSION : JTL_VERSION,
'd' => \ws_mollie\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 "<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'>" .
" <img src='//lic.dash.bar/info/licence.png?{$svgQuery}' width='370' height='20' alt='Lizenz Informationen'>" .
' </object>' .
' </div>' .
" <div class='col-md-4 text-center'>" .
" <object data='//lic.dash.bar/info/version?{$svgQuery}' type='image/svg+xml'>" .
" <img src='//lic.dash.bar/info/version.png?{$svgQuery}' width='370' height='20' alt='Update Informationen'>" .
' </object>' .
' </div>' .
" <div class='col-md-4 text-center'>" .
" <object data='//lic.dash.bar/info/help?{$svgQuery}' type='image/svg+xml'>" .
" <img src='//lic.dash.bar/info/help.png?{$svgQuery}' width='370' height='20' alt='Plugin informationen'>" .
' </object>' .
' </div>' .
'</div>';

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

} catch (\Exception $e) {
}

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

0 comments on commit 0f79108

Please sign in to comment.