From 241dc60f1d72fe8639e088109e64953264194baf Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Mon, 15 Mar 2021 10:54:36 +0100 Subject: [PATCH 1/4] Bugfix: Register the invoice item to make sure all quantities are updated correctly --- app/code/community/Mollie/Mpm/Model/Client/Orders.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/community/Mollie/Mpm/Model/Client/Orders.php b/app/code/community/Mollie/Mpm/Model/Client/Orders.php index 5be429a..cedbe11 100644 --- a/app/code/community/Mollie/Mpm/Model/Client/Orders.php +++ b/app/code/community/Mollie/Mpm/Model/Client/Orders.php @@ -535,6 +535,12 @@ public function createShipment(Mage_Sales_Model_Order_Shipment $shipment, Mage_S $payment->setTransactionId($transactionId); $payment->registerCaptureNotification($captureAmount, true); + foreach ($invoice->getAllItems() as $item) { + if ($item->getQty() > 0) { + $item->register(); + } + } + $order->save(); $sendInvoice = $this->mollieHelper->sendInvoice($order->getStoreId()); if ($invoice && !$invoice->getEmailSent() && $sendInvoice) { From 28044b081a04c5e9a3577a1fdf454e248308bc71 Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Mon, 15 Mar 2021 10:56:23 +0100 Subject: [PATCH 2/4] Bugfix: Replacing non-ascii characters would cause a PHP error --- app/code/community/Mollie/Mpm/Model/OrderLines.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/community/Mollie/Mpm/Model/OrderLines.php b/app/code/community/Mollie/Mpm/Model/OrderLines.php index f29d33f..761889e 100644 --- a/app/code/community/Mollie/Mpm/Model/OrderLines.php +++ b/app/code/community/Mollie/Mpm/Model/OrderLines.php @@ -510,8 +510,8 @@ public function getOpenForRefundQty($orderId) */ private function getProductName($name) { - $search = explode('', 'ç,æ,œ,á,é,í,ó,ú,à,è,ì,ò,ù,ä,ë,ï,ö,ü,ÿ,â,ê,î,ô,û,å,ø,Ø,Å,Á,À,Â,Ä,È,É,Ê,Ë,Í,Î,Ï,Ì,Ò,Ó,Ô,Ö,Ú,Ù,Û,Ü,Ÿ,Ç,Æ,Œ'); - $replace = explode('', 'c,ae,oe,a,e,i,o,u,a,e,i,o,u,a,e,i,o,u,y,a,e,i,o,u,a,o,O,A,A,A,A,A,E,E,E,E,I,I,I,I,O,O,O,O,U,U,U,U,Y,C,AE,OE'); + $search = explode(',', 'ç,æ,œ,á,é,í,ó,ú,à,è,ì,ò,ù,ä,ë,ï,ö,ü,ÿ,â,ê,î,ô,û,å,ø,Ø,Å,Á,À,Â,Ä,È,É,Ê,Ë,Í,Î,Ï,Ì,Ò,Ó,Ô,Ö,Ú,Ù,Û,Ü,Ÿ,Ç,Æ,Œ'); + $replace = explode(',', 'c,ae,oe,a,e,i,o,u,a,e,i,o,u,a,e,i,o,u,y,a,e,i,o,u,a,o,O,A,A,A,A,A,E,E,E,E,I,I,I,I,O,O,O,O,U,U,U,U,Y,C,AE,OE'); $name = str_replace($search, $replace, $name); return preg_replace('/[^A-Za-z0-9 -]/', '', $name); From 1d53b052b5a79966aaa817e05bb0f9fb7d8f717c Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Mon, 22 Mar 2021 10:54:13 +0100 Subject: [PATCH 3/4] Feature: Translated the components labels --- .../mpm/payment/form/creditcard-components.phtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml b/app/design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml index 16c26b1..2075d00 100644 --- a/app/design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml +++ b/app/design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml @@ -9,19 +9,19 @@ $code = $this->getMethodCode(); ?>