Skip to content

Commit

Permalink
1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Magmodules committed Sep 27, 2017
1 parent 5d7223b commit 7e67b07
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
7 changes: 6 additions & 1 deletion Model/Mollie.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
```
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Mollie_Payment" setup_version="1.1.1">
<module name="Mollie_Payment" setup_version="1.1.2">
</module>
</config>

0 comments on commit 7e67b07

Please sign in to comment.