Skip to content

Commit

Permalink
version 109
Browse files Browse the repository at this point in the history
  • Loading branch information
C. Proske committed Sep 29, 2020
1 parent 7008bdd commit 701ff06
Show file tree
Hide file tree
Showing 65 changed files with 3,480 additions and 20 deletions.
44 changes: 24 additions & 20 deletions info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<Version nr="108">
<CreateDate>2020-04-24</CreateDate>
</Version>
<Version nr="109">
<SQL>109.sql</SQL>
<CreateDate>2020-08-17</CreateDate>
</Version>
<Hooks>
<Hook id="131">131_globalinclude.php</Hook>
<Hook id="144">144_notify.php</Hook>
Expand Down Expand Up @@ -221,7 +225,7 @@
<PaymentMethod>
<Method>
<Name>mollie</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/mollie@2x.png</PictureURL>
<Sort>1</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -241,7 +245,7 @@
</Method>
<Method>
<Name>mollie Kreditkarte</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/creditcard@2x.png</PictureURL>
<Sort>3</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -262,7 +266,7 @@
</Method>
<Method>
<Name>mollie Apple Pay</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/applepay@2x.png</PictureURL>
<Sort>3</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -282,7 +286,7 @@
</Method>
<Method>
<Name>mollie Bancontact</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/bancontact@2x.png</PictureURL>
<Sort>4</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -302,7 +306,7 @@
</Method>
<Method>
<Name>mollie Banktransfer</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/banktransfer@2x.png</PictureURL>
<Sort>5</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -322,7 +326,7 @@
</Method>
<Method>
<Name>mollie Belfius</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/belfius@2x.png</PictureURL>
<Sort>6</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -342,7 +346,7 @@
</Method>
<Method>
<Name>mollie DirectDebit</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/directdebit@2x.png</PictureURL>
<Sort>7</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -362,7 +366,7 @@
</Method>
<Method>
<Name>mollie EPS</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/eps@2x.png</PictureURL>
<Sort>2</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -382,7 +386,7 @@
</Method>
<Method>
<Name>mollie Giftcard</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/giftcard@2x.png</PictureURL>
<Sort>8</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -402,7 +406,7 @@
</Method>
<Method>
<Name>mollie Giropay</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/giropay@2x.png</PictureURL>
<Sort>9</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -422,7 +426,7 @@
</Method>
<Method>
<Name>mollie iDEAL</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/ideal@2x.png</PictureURL>
<Sort>10</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -442,7 +446,7 @@
</Method>
<Method>
<Name>mollie ING HomePay</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/inghomepay@2x.png</PictureURL>
<Sort>11</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -462,7 +466,7 @@
</Method>
<Method>
<Name>mollie KBC</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/kbc@2x.png</PictureURL>
<Sort>12</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -482,7 +486,7 @@
</Method>
<Method>
<Name>mollie PayPal</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/paypal@2x.png</PictureURL>
<Sort>13</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -502,7 +506,7 @@
</Method>
<Method>
<Name>mollie paysafecard</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/paysafecard@2x.png</PictureURL>
<Sort>14</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -522,7 +526,7 @@
</Method>
<Method>
<Name>mollie SOFORT</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/sofort@2x.png</PictureURL>
<Sort>15</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -542,7 +546,7 @@
</Method>
<Method>
<Name>mollie Klarna Pay Later</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/klarna@2x.png</PictureURL>
<Sort>16</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -562,7 +566,7 @@
</Method>
<Method>
<Name>mollie Klarna Slice It</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/klarna@2x.png</PictureURL>
<Sort>17</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -582,7 +586,7 @@
</Method>
<Method>
<Name>mollie Przelewy24</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/Przelewy24@2x.png</PictureURL>
<Sort>17</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand All @@ -602,7 +606,7 @@
</Method>
<Method>
<Name>mollie MyBank</Name>
<PictureURL></PictureURL>
<PictureURL>img/method/mybank@2x.png</PictureURL>
<Sort>17</Sort>
<SendMail>0</SendMail>
<Provider>mollie.com</Provider>
Expand Down
1 change: 1 addition & 0 deletions version/108/paymentmethod/JTLMollie.php
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ public function finalizeOrder($order, $hash, $args)
$this->doLog("JTLMollie::finalizeOrder::locked ({$args['id']})", $logData, LOGLEVEL_DEBUG);
} else {
$this->doLog("JTLMollie::finalizeOrder::locked failed ({$args['id']})", $logData, LOGLEVEL_ERROR);
return false;
}

$oOrder = self::API()->orders->get($args['id'], ['embed' => 'payments']);
Expand Down
64 changes: 64 additions & 0 deletions version/109/adminmenu/info.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?php

use ws_mollie\Helper;

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

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

$svgQuery = http_build_query([
'p' => Helper::oPlugin()->cPluginID,
'v' => Helper::oPlugin()->nVersion,
's' => defined('APPLICATION_VERSION') ? APPLICATION_VERSION : JTL_VERSION,
'b' => defined('JTL_MINOR_VERSION') ? JTL_MINOR_VERSION : '0',
'd' => Helper::getDomain(),
'm' => base64_encode(Helper::getMasterMail(true)),
'php' => PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION . PHP_EXTRA_VERSION,
]);

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'>" .
" <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 = Helper::getLatestRelease(array_key_exists('update', $_REQUEST));
if ((int)Helper::oPlugin()->nVersion < (int)$latestRelease->version) {
Shop::Smarty()->assign('update', $latestRelease);
}

} catch (\Exception $e) {
}

Shop::Smarty()->display(Helper::oPlugin()->cAdminmenuPfad . '/tpl/info.tpl');

if (file_exists(__DIR__ . '/_addon.php')) {
try {
include __DIR__ . '/_addon.php';
} catch (Exception $e) {
}
}

} catch (Exception $e) {
echo "<div class='alert alert-danger'>Fehler: {$e->getMessage()}</div>";
Helper::logExc($e);
}
Loading

0 comments on commit 701ff06

Please sign in to comment.