From 7e67b07582dc45a7ce7f7440d3c171aa62dd7e04 Mon Sep 17 00:00:00 2001 From: Magmodules Date: Wed, 27 Sep 2017 10:21:34 +0200 Subject: [PATCH] 1.1.2 --- Model/Mollie.php | 7 ++++++- README.md | 8 +++++--- composer.json | 4 ++-- etc/module.xml | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Model/Mollie.php b/Model/Mollie.php index 938612a21f6..45722a79616 100644 --- a/Model/Mollie.php +++ b/Model/Mollie.php @@ -309,9 +309,14 @@ public function processTransaction($orderId, $type = 'webhook') $order->save(); $invoice = $payment->getCreatedInvoice(); - $status = $this->mollieHelper->getStatusProcessing($storeId); $sendInvoice = $this->mollieHelper->sendInvoice($storeId); + if ($order->getIsVirtual()) { + $status = $order->getStatus(); + } else { + $status = $this->mollieHelper->getStatusProcessing($storeId); + } + if ($invoice && !$order->getEmailSent()) { $this->orderSender->send($order); $message = __('New order email sent'); diff --git a/README.md b/README.md index 1aeca39aaf0..927647efe56 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is the official Mollie extension for Magento® 2. ### Magento® Marketplace -This extension will also be available on the Magento® Marketplace when approved. +This extension is also available on the [Magento Marketplace](https://marketplace.magento.com/mollie-magento2.html) ### Manually @@ -39,9 +39,11 @@ This extension will also be available on the Magento® Marketplace when approved ## Requirements -This extension requires the [Mollie API client for PHP.](https://github.com/mollie/mollie-api-php) +1) For Magento® 2.1.x and Magento® 2.2.x -When using composer this will be installed automatically. +2) This extension requires the [Mollie API client for PHP.](https://github.com/mollie/mollie-api-php) + +When using composer of installation through the Magento® Marketplace this will be installed automatically. To install manually, enter the following command in your Magento® 2 root folder: ``` diff --git a/composer.json b/composer.json index a5336d522fc..35ab426a0dc 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { - "name": "mollie/Magento2", + "name": "mollie/magento2", "description": "Mollie Payment Module for Magento 2", - "version": "1.1.1", + "version": "1.1.2", "require": { "php": "~5.6.5|7.0.2|7.0.4|~7.0.6|~7.1.0", "mollie/mollie-api-php": "^1.9.3" diff --git a/etc/module.xml b/etc/module.xml index 294f2e6be51..fae88a95a2e 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,5 +1,5 @@ - +