Merge pull request #202 from mollie/5.6.5

5.6.5
mollie · Mar 22, 2021 · 508bfc1 · 508bfc1
2 parents df2c52b + 201484c
commit 508bfc1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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) {

diff --git 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);

diff --git a/app/code/community/Mollie/Mpm/etc/config.xml b/app/code/community/Mollie/Mpm/etc/config.xml
@@ -33,7 +33,7 @@
 <config>
     <modules>
         <Mollie_Mpm>
-            <version>5.6.4</version>
+            <version>5.6.5</version>
         </Mollie_Mpm>
     </modules>
     <global>

diff --git a/...design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml b/...design/frontend/base/default/template/mollie/mpm/payment/form/creditcard-components.phtml
@@ -9,24 +9,24 @@ $code = $this->getMethodCode();
 ?>
 <div class="form-list" id="payment_form_<?php echo $this->escapeHtml($code) ?>" style="display:none">
     <div class="card-container">
-        <label for="card-holder">Card Holder</label>
+        <label for="card-holder"><?php echo __('Card Holder'); ?></label>
         <div id="card-holder"></div>
         <div id="card-holder-error" class="component-error"></div>
 
-        <label for="card-number">Card Number</label>
+        <label for="card-number"><?php echo __('Card Number'); ?></label>
         <div id="card-number"></div>
         <div id="card-number-error" class="component-error"></div>
 
-        <label for="expiry-date">Expiry Date</label>
+        <label for="expiry-date"><?php echo __('Expiry Date'); ?></label>
         <div id="expiry-date"></div>
         <div id="expiry-date-error" class="component-error"></div>
 
-        <label for="verification-code">Verification Code</label>
+        <label for="verification-code"><?php echo __('Verification Code'); ?></label>
         <div id="verification-code"></div>
         <div id="verification-code-error" class="component-error"></div>
     </div>
 </div>
 
 <input type="hidden" name="cardToken" />
 
-<script>mollieComponentsInstance.mount();</script>
+<script>mollieComponentsInstance.mount();</script>