Skip to content

Commit 1eee24e

Browse files
QualityWorksQualityWorks
authored
Merge pull request #161 from mollie/9.1.1
9.1.1
2 parents 351c124 + fc15950 commit 1eee24e

File tree

4 files changed

+53
-46
lines changed

4 files changed

+53
-46
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
# Changelog #
44

5+
#### Changes in release 9.1.1
6+
+ Small fix for rounding differences
7+
+ Only show refund button for Mollie payments
8+
+ Changed search value in vqmod xml due to irregular issues on some servers
9+
510
#### Changes in release 9.1.0
611
+ Fixed double form post in confirmation template
712
+ Fixed bug for rounding differences more than 0.01

‎catalog/controller/payment/mollie/base.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,8 @@ public function payment()
532532
foreach($lines as $line) {
533533
$orderLineTotal += $line['totalAmount']['value'];
534534
}
535+
536+
$orderLineTotal = number_format($orderLineTotal, 2, '.', '');
535537

536538
if($orderTotal > $orderLineTotal) {
537539
$amountDiff = number_format(($orderTotal - $orderLineTotal), 2, '.', '');

‎catalog/controller/payment/mollie/helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class MollieHelper
77
{
8-
const PLUGIN_VERSION = "9.1.0";
8+
const PLUGIN_VERSION = "9.1.1";
99

1010
// All available modules. These should correspond to the Mollie_API_Object_Method constants.
1111
const MODULE_NAME_BANKTRANSFER = "banktransfer";

‎vqmod/xml/mollie.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<modification>
22
<id>Quality Works - Mollie</id>
3-
<version>1.2.1</version>
3+
<version>1.2.2</version>
44
<vqmver>2.3.0</vqmver>
55
<author>Quality Works</author>
66

7-
<file name="catalog/controller/event/compatibility.php" error="skip">
7+
<file name="catalog/controller/event/compatibility.php" error="log">
88
<operation>
99
<search position="replace"><![CDATA['model/' . $route . '.php']]></search>
1010
<add><![CDATA['model/'.((strpos($route,'get') !== false) ? dirname($route) : $route).'.php']]></add>
1111
</operation>
1212
</file>
13-
<file name="admin/controller/event/compatibility.php" error="skip">
13+
<file name="admin/controller/event/compatibility.php" error="log">
1414
<operation>
1515
<search position="after" index="1"><![CDATA[$route = $part[1] . '/' . $part[2];]]></search>
1616
<add><![CDATA[if(array_key_exists(3, $part)) {
@@ -20,8 +20,8 @@
2020
</file>
2121

2222
<!-- Shipment creation for Klarna method for versions older than 2.2 -->
23-
<file name="admin/model/sale/order.php" error="skip">
24-
<operation error="skip">
23+
<file name="admin/model/sale/order.php" error="log">
24+
<operation error="log">
2525
<search position="before"><![CDATA[public function getOrderHistories($order_id, $start = 0, $limit = 10) {]]></search>
2626
<add><![CDATA[//Get order reference id for mollie payment
2727
public function getOrderID($order_id)
@@ -35,8 +35,8 @@
3535
}]]></add>
3636
</operation>
3737
</file>
38-
<file name="catalog/controller/api/order.php" error="skip">
39-
<operation error="skip">
38+
<file name="catalog/controller/api/order.php" error="log">
39+
<operation error="log">
4040
<search position="after" index="3"><![CDATA[$this->model_checkout_order->addOrderHistory]]></search>
4141
<add><![CDATA[// Shipment creation for Klarna for versions older than 2.2
4242
if(VERSION < "2.2") {
@@ -48,8 +48,8 @@
4848
} ]]></add>
4949
</operation>
5050
</file>
51-
<file name="admin/controller/sale/order.php" error="skip">
52-
<operation error="skip">
51+
<file name="admin/controller/sale/order.php" error="log">
52+
<operation error="log">
5353
<search position="before" index="4"><![CDATA[$this->data['success']]]></search>
5454
<add><![CDATA[// Shipment creation for Klarna for versions older than 2.2
5555
if(VERSION <= "1.5.6.4") {
@@ -64,18 +64,18 @@
6464

6565
<!-- Showing mollie payment status on order info page -->
6666
<file name="admin/controller/sale/order.php">
67-
<operation error="skip">
67+
<operation error="log">
6868
<search position="after" index="2"><![CDATA[$data['payment_method'] = $order_info['payment_method'];]]></search>
6969
<add><![CDATA[$data['payment_status'] = $this->model_sale_order->getMolliePayment($this->request->get['order_id'])['bank_status'];]]></add>
7070
</operation>
71-
<operation error="skip">
71+
<operation error="log">
7272
<search position="after" index="2"><![CDATA[$this->data['payment_method'] = $order_info['payment_method'];]]></search>
7373
<add><![CDATA[$this->data['payment_status'] = $this->model_sale_order->getMolliePayment($this->request->get['order_id'])['bank_status'];]]></add>
7474
</operation>
7575
</file>
7676

7777
<file name="admin/model/sale/order.php">
78-
<operation error="skip">
78+
<operation error="log">
7979
<search position="before"><![CDATA[public function getOrder($order_id)]]></search>
8080
<add><![CDATA[public function getMolliePayment($order_id) {
8181
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "mollie_payments` WHERE order_id = '" . (int)$order_id . "'");
@@ -91,7 +91,7 @@
9191
</file>
9292

9393
<file name="admin/view/template/sale/order_info.tpl">
94-
<operation error="skip">
94+
<operation error="log">
9595
<search position="replace"><![CDATA[<td><?php echo $payment_method; ?></td>]]></search>
9696
<add><![CDATA[<td><?php echo $payment_method; ?>&nbsp;&nbsp;
9797
<?php if($payment_status == 'paid') { ?>
@@ -111,15 +111,15 @@
111111
<?php } elseif($payment_status == 'refunded') { ?>
112112
<span id="payment-status" class="label label-primary"><?php echo strtoupper($payment_status); ?></span>
113113
<?php } ?>
114-
<?php if(($payment_status != 'expired') && ($payment_status != 'refunded') && ($payment_status != 'failed') && ($payment_status != 'canceled')) { ?>
114+
<?php if(($payment_status) && ($payment_status != 'expired') && ($payment_status != 'refunded') && ($payment_status != 'failed') && ($payment_status != 'canceled')) { ?>
115115
<a href="javascript:void(0)" id="button-refund" class="label label-primary"><?php echo $button_refund; ?></a>
116116
<?php } ?>
117117
</td>]]></add>
118118
</operation>
119119
</file>
120120

121121
<file name="admin/view/template/sale/order_info.twig">
122-
<operation error="skip">
122+
<operation error="log">
123123
<search position="replace"><![CDATA[<td>{{ payment_method }}</td>]]></search>
124124
<add><![CDATA[<td>{{ payment_method }}&nbsp;&nbsp;
125125
{% if(payment_status == 'paid') %}
@@ -139,7 +139,7 @@
139139
n {% elseif(payment_status == 'refunded') %}
140140
<span id="payment-status" class="label label-primary">{{ payment_status | upper }}</span>
141141
{% endif %}
142-
{% if((payment_status != 'expired') and (payment_status != 'refunded') and (payment_status != 'failed') and (payment_status != 'canceled')) %}
142+
{% if((payment_status) and (payment_status != 'expired') and (payment_status != 'refunded') and (payment_status != 'failed') and (payment_status != 'canceled')) %}
143143
<a href="javascript:void(0)" id="button-refund" class="label label-primary">{{ button_refund }}</a>
144144
{% endif %}
145145
</td>]]></add>
@@ -148,64 +148,64 @@
148148

149149
<!-- Ignore token check -->
150150
<file name="admin/controller/startup/login.php">
151-
<operation error="skip">
151+
<operation error="log">
152152
<search position="after"><![CDATA['common/login',]]></search>
153153
<add><![CDATA['extension/payment/mollie_bancontact/mollieConnectCallback',
154154
'payment/mollie_bancontact/mollieConnectCallback',]]></add>
155155
</operation>
156156
</file>
157157

158158
<file name="admin/controller/common/home.php">
159-
<operation error="skip">
159+
<operation error="log">
160160
<search position="after" index="1" offset="2"><![CDATA[if (isset($part[1])) {]]></search>
161161
<add><![CDATA[if (isset($part[2])) {
162162
$route .= '/' . $part[2];
163163
}]]></add>
164164
</operation>
165-
<operation error="skip">
165+
<operation error="log">
166166
<search position="after" index="2"><![CDATA['common/login',]]></search>
167167
<add><![CDATA['extension/payment/mollie_bancontact/mollieConnectCallback',
168168
'payment/mollie_bancontact/mollieConnectCallback',]]></add>
169169
</operation>
170170
</file>
171171

172172
<file name="catalog/view/theme/*/template/common/header.tpl">
173-
<operation error="skip">
173+
<operation error="log">
174174
<search position="before"><![CDATA[</head>]]></search>
175175
<add><![CDATA[<script src="catalog/view/javascript/mollie.js" type="text/javascript"></script>]]></add>
176176
</operation>
177177
</file>
178178

179179
<file name="catalog/view/theme/*/template/common/header.twig">
180-
<operation error="skip">
180+
<operation error="log">
181181
<search position="before"><![CDATA[</head>]]></search>
182182
<add><![CDATA[<script src="catalog/view/javascript/mollie.js" type="text/javascript"></script>]]></add>
183183
</operation>
184184
</file>
185185

186186
<!-- Order refund button -->
187187
<file name="admin/controller/sale/order.php">
188-
<operation error="skip">
188+
<operation error="log">
189189
<search position="before"><![CDATA[class ControllerSaleOrder]]></search>
190190
<add><![CDATA[require_once(dirname(DIR_SYSTEM) . "/catalog/controller/payment/mollie/helper.php");]]></add>
191191
</operation>
192-
<operation error="skip">
192+
<operation error="log">
193193
<search position="after"><![CDATA[$data['button_ip_add']]]></search>
194194
<add><![CDATA[$data['button_refund'] = $this->language->get('button_refund');]]></add>
195195
</operation>
196-
<operation error="skip">
196+
<operation error="log">
197197
<search position="after"><![CDATA[$this->data['button_add_history']]]></search>
198198
<add><![CDATA[$this->data['button_refund'] = $this->language->get('button_refund');]]></add>
199199
</operation>
200-
<operation error="skip">
200+
<operation error="log">
201201
<search position="after"><![CDATA[public function info() {]]></search>
202202
<add><![CDATA[
203203
if(version_compare(VERSION, '2.0', '<') == true) {
204204
$this->data['isVersion15x'] = true;
205205
$data['isVersion15x'] = true;
206206
}]]></add>
207207
</operation>
208-
<operation error="skip">
208+
<operation error="log">
209209
<search position="before" index="2"><![CDATA[$data['shipping']]]></search>
210210
<add><![CDATA[if (version_compare(VERSION, '2.3.0.2', '>') == true) {
211211
$token = 'user_token=' . $this->session->data['user_token'];
@@ -215,7 +215,7 @@
215215
216216
$data['refund'] = $this->url->link('sale/order/refund', $token . '&order_id=' . (int)$this->request->get['order_id'], true);]]></add>
217217
</operation>
218-
<operation error="skip">
218+
<operation error="log">
219219
<search position="before"><![CDATA[public function index()]]></search>
220220
<add><![CDATA[
221221
protected function getAPIClient()
@@ -287,7 +287,7 @@
287287
</file>
288288

289289
<file name="admin/model/sale/order.php">
290-
<operation error="skip">
290+
<operation error="log">
291291
<search position="before"><![CDATA[public function getOrder($order_id)]]></search>
292292
<add><![CDATA[public function getMollieOrderDetails($order_id) {
293293
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "mollie_payments` WHERE order_id = '" . (int)$order_id . "'");
@@ -307,8 +307,8 @@
307307
</file>
308308

309309
<file name="admin/language/en-gb/sale/order.php">
310-
<operation error="skip">
311-
<search position="bottom"><![CDATA[]]></search>
310+
<operation error="log">
311+
<search position="after"><![CDATA[// Text]]></search>
312312
<add><![CDATA[$_['button_refund'] = 'Refund';
313313
$_['text_order_not_found'] = 'Mollie order details not found!';
314314
$_['text_no_refund'] = 'Refund cannot be processed!';
@@ -319,7 +319,7 @@
319319
</file>
320320

321321
<file name="admin/language/english/sale/order.php">
322-
<operation error="skip">
322+
<operation error="log">
323323
<search position="after"><![CDATA[// Text]]></search>
324324
<add><![CDATA[$_['button_refund'] = 'Refund';
325325
$_['text_order_not_found'] = 'Mollie order details not found!';
@@ -331,8 +331,8 @@
331331
</file>
332332

333333
<file name="admin/language/de-de/sale/order.php">
334-
<operation error="skip">
335-
<search position="bottom"><![CDATA[]]></search>
334+
<operation error="log">
335+
<search position="after"><![CDATA[// Text]]></search>
336336
<add><![CDATA[$_['button_refund'] = 'Rückerstattung';
337337
$_['text_order_not_found'] = 'Mollie Bestelldetails nicht gefunden!';
338338
$_['text_no_refund'] = 'Rückerstattung kann nicht bearbeitet werden!';
@@ -343,7 +343,7 @@
343343
</file>
344344

345345
<file name="admin/language/german/sale/order.php">
346-
<operation error="skip">
346+
<operation error="log">
347347
<search position="after"><![CDATA[// Text]]></search>
348348
<add><![CDATA[$_['button_refund'] = 'Rückerstattung';
349349
$_['text_order_not_found'] = 'Mollie Bestelldetails nicht gefunden!';
@@ -355,8 +355,8 @@
355355
</file>
356356

357357
<file name="admin/language/nl-nl/sale/order.php">
358-
<operation error="skip">
359-
<search position="bottom"><![CDATA[]]></search>
358+
<operation error="log">
359+
<search position="after"><![CDATA[// Text]]></search>
360360
<add><![CDATA[$_['button_refund'] = 'Terugbetaling';
361361
$_['text_order_not_found'] = 'Mollie bestelgegevens niet gevonden!';
362362
$_['text_no_refund'] = 'Restitutie kan niet worden verwerkt!';
@@ -367,7 +367,7 @@
367367
</file>
368368

369369
<file name="admin/language/dutch/sale/order.php">
370-
<operation error="skip">
370+
<operation error="log">
371371
<search position="after"><![CDATA[// Text]]></search>
372372
<add><![CDATA[$_['button_refund'] = 'Terugbetaling';
373373
$_['text_order_not_found'] = 'Mollie bestelgegevens niet gevonden!';
@@ -379,8 +379,8 @@
379379
</file>
380380

381381
<file name="admin/language/es-es/sale/order.php">
382-
<operation error="skip">
383-
<search position="bottom"><![CDATA[]]></search>
382+
<operation error="log">
383+
<search position="after"><![CDATA[// Text]]></search>
384384
<add><![CDATA[$_['button_refund'] = 'Reembolso';
385385
$_['text_order_not_found'] = '¡No se han encontrado los detalles del pedido de Mollie!';
386386
$_['text_no_refund'] = '¡No se puede procesar el reembolso!';
@@ -391,7 +391,7 @@
391391
</file>
392392

393393
<file name="admin/language/spanish/sale/order.php">
394-
<operation error="skip">
394+
<operation error="log">
395395
<search position="after"><![CDATA[// Text]]></search>
396396
<add><![CDATA[$_['button_refund'] = 'Reembolso';
397397
$_['text_order_not_found'] = '¡No se han encontrado los detalles del pedido de Mollie!';
@@ -403,8 +403,8 @@
403403
</file>
404404

405405
<file name="admin/language/fr-fr/sale/order.php">
406-
<operation error="skip">
407-
<search position="bottom"><![CDATA[]]></search>
406+
<operation error="log">
407+
<search position="after"><![CDATA[// Text]]></search>
408408
<add><![CDATA[$_['button_refund'] = 'Rembourser';
409409
$_['text_order_not_found'] = 'Détails de commande Mollie non trouvés!';
410410
$_['text_no_refund'] = 'Le remboursement ne peut être traité!';
@@ -415,7 +415,7 @@
415415
</file>
416416

417417
<file name="admin/language/french/sale/order.php">
418-
<operation error="skip">
418+
<operation error="log">
419419
<search position="after"><![CDATA[// Text]]></search>
420420
<add><![CDATA[$_['button_refund'] = 'Rembourser';
421421
$_['text_order_not_found'] = 'Détails de commande Mollie non trouvés!';
@@ -427,7 +427,7 @@
427427
</file>
428428

429429
<file name="admin/view/template/sale/order_info.tpl">
430-
<operation error="skip">
430+
<operation error="log">
431431
<search position="before"><![CDATA[<?php echo $footer; ?>]]></search>
432432
<add><![CDATA[
433433
<script type="text/javascript"><!--
@@ -522,7 +522,7 @@ $('.alert').remove();
522522
</file>
523523

524524
<file name="admin/view/template/sale/order_info.twig">
525-
<operation error="skip">
525+
<operation error="log">
526526
<search position="before"><![CDATA[{{ footer }}]]></search>
527527
<add><![CDATA[
528528
<script type="text/javascript"><!--

0 commit comments

Comments
 (0)