Version 2.1.7

mollie · Nov 2, 2016 · f4ce3d4 · f4ce3d4
1 parent 607f582
commit f4ce3d4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/doneren-met-mollie.php b/doneren-met-mollie.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Doneren met Mollie
 Description: Donaties ontvangen via Mollie
-Version: 2.1.6
+Version: 2.1.7
 Author: Nick Dijkstra
 Author URI: http://nickdijkstra.nl
 Text Domain: doneren-met-mollie
@@ -15,7 +15,7 @@
 
 // Plugin Version
 if (!defined('DMM_VERSION')) {
-    define('DMM_VERSION', '2.1.6');
+    define('DMM_VERSION', '2.1.7');
 }
 
 // Plugin Folder Path

diff --git a/includes/class-admin.php b/includes/class-admin.php
@@ -439,7 +439,7 @@ private function dmm_tab_settings_general()
                             <label><?php esc_html_e('Payment description', DMM_TXT_DOMAIN);?></label>
                         </th>
                         <td class="forminp">
-                            <input type="text" size="50" name="dmm_payment_description" value="<?php echo esc_attr(get_option('dmm_payment_description', DMM_PAYMENT_DESCRIPTION));?>"><br>
+                            <input type="text" size="50" name="dmm_payment_description" value="<?php echo esc_attr(get_option('dmm_payment_description'));?>"><br>
                             <small><?php printf(esc_html__('You can use: %s', DMM_TXT_DOMAIN), '{id} {name} {email} {project} {amount} {company}');?></small>
                         </td>
                     </tr>

diff --git a/includes/class-start.php b/includes/class-start.php
@@ -258,9 +258,8 @@ public function dmm_donate_form()
                             $secret
                         ));
 
-                        $firstAmount = ($_POST['dmm_method'] == 'mistercash' ? 0.02 : 0.01);
                         $payment = $mollie->payments->create(array(
-                            'amount'        => $firstAmount,
+                            'amount'        => $amount,
                             'customerId'    => $customer->id,
                             'recurringType' => 'first',
                             "description"   => $description,
@@ -280,7 +279,7 @@ public function dmm_donate_form()
                         $payment->id,
                         (isset($customer) ? $customer->id : null),
                         $donation_id,
-                        isset($firstAmount) ? $firstAmount : $amount,
+                        $amount,
                         isset($_POST['dmm_name']) ? $_POST['dmm_name'] : null,
                         isset($_POST['dmm_email']) ? $_POST['dmm_email'] : null,
                         isset($_POST['dmm_project']) ? $_POST['dmm_project'] : null,

diff --git a/includes/class-webhook.php b/includes/class-webhook.php
@@ -126,11 +126,13 @@ protected function handle_request($query)
                     ));
 
                     $sub_id = $this->wpdb->insert_id;
+                    $interval = $this->dmm_get_interval($customer->sub_interval);
                     $subscription = $mollie->customers_subscriptions->withParentId($customer->customer_id)->create(array(
                         "amount"      => $customer->sub_amount,
-                        "interval"    => $this->dmm_get_interval($customer->sub_interval),
+                        "interval"    => $interval,
                         "description" => $customer->sub_description,
                         "webhookUrl"  => $dmm_webhook . 'sub/' . $sub_id,
+                        "startDate"   => date('Y-m-d', strtotime("+" . $interval, strtotime(date('Y-m-d')))),
                     ));
 
                     $this->wpdb->query($this->wpdb->prepare("UPDATE " . DMM_TABLE_DONATIONS . " SET subscription_id = %s WHERE id = %d",

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: ndijkstra
 Tags: mollie,doneren,donate,ideal,mistercash,bancontact,bitcoin,creditcard,paypal,sofort,belfius,overboeking,recurring,incasso,debit,herhaalbetalingen,sepa,subscriptions,kbc,cbc
 Requires at least: 3.0.1
 Tested up to: 4.6.1
-Stable tag: 2.1.6
+Stable tag: 2.1.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -39,6 +39,9 @@ Naast eenmalige donaties is deze plugin ook goed bruikbaar om periodiek bedragen
 
 == Changelog ==
 
+= 2.1.7 =
+* Eerste bedrag bij herhaalbetaling (recurring) meteen bedrag voor eerste termijn ipv €0,01
+
 = 2.1.6 =
 * E-mailadres mogelijk in omschrijving met variabele {email}
 * Update Mollie API client naar v1.7.1