version 109

mollie · Sep 29, 2020 · 701ff06 · 701ff06
1 parent 7008bdd
commit 701ff06
Show file tree

Hide file tree

Showing 65 changed files with 3,480 additions and 20 deletions.
diff --git a/info.xml b/info.xml
@@ -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>
@@ -221,7 +225,7 @@
     <PaymentMethod>
       <Method>
         <Name>mollie</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>1</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -241,7 +245,7 @@
       </Method>
       <Method>
         <Name>mollie Kreditkarte</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>3</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -262,7 +266,7 @@
       </Method>
       <Method>
         <Name>mollie Apple Pay</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>3</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -282,7 +286,7 @@
       </Method>
       <Method>
         <Name>mollie Bancontact</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>4</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -302,7 +306,7 @@
       </Method>
       <Method>
         <Name>mollie Banktransfer</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>5</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -322,7 +326,7 @@
       </Method>
       <Method>
         <Name>mollie Belfius</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>6</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -342,7 +346,7 @@
       </Method>
       <Method>
         <Name>mollie DirectDebit</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>7</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -362,7 +366,7 @@
       </Method>
       <Method>
         <Name>mollie EPS</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>2</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -382,7 +386,7 @@
       </Method>
       <Method>
         <Name>mollie Giftcard</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>8</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -402,7 +406,7 @@
       </Method>
       <Method>
         <Name>mollie Giropay</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>9</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -422,7 +426,7 @@
       </Method>
       <Method>
         <Name>mollie iDEAL</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>10</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -442,7 +446,7 @@
       </Method>
       <Method>
         <Name>mollie ING HomePay</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>11</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -462,7 +466,7 @@
       </Method>
       <Method>
         <Name>mollie KBC</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>12</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -482,7 +486,7 @@
       </Method>
       <Method>
         <Name>mollie PayPal</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>13</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -502,7 +506,7 @@
       </Method>
       <Method>
         <Name>mollie paysafecard</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>14</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -522,7 +526,7 @@
       </Method>
       <Method>
         <Name>mollie SOFORT</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>15</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -542,7 +546,7 @@
       </Method>
       <Method>
         <Name>mollie Klarna Pay Later</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>16</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -562,7 +566,7 @@
       </Method>
       <Method>
         <Name>mollie Klarna Slice It</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>17</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -582,7 +586,7 @@
       </Method>
       <Method>
         <Name>mollie Przelewy24</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>17</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>
@@ -602,7 +606,7 @@
       </Method>
       <Method>
         <Name>mollie MyBank</Name>
-        <PictureURL></PictureURL>
+        <PictureURL>img/method/[email protected]</PictureURL>
         <Sort>17</Sort>
         <SendMail>0</SendMail>
         <Provider>mollie.com</Provider>

diff --git a/version/108/paymentmethod/JTLMollie.php b/version/108/paymentmethod/JTLMollie.php
@@ -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']);

diff --git a/version/109/adminmenu/info.php b/version/109/adminmenu/info.php
@@ -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);
+}