1.10.4

* MarketPress: Error upon payment activation fixed
* WooCommerce: Official support for custom intervals (e.g. every 3rd
month) added
* WooCommerce: Different bugs in order processing and subscription
handling fixed

CHANGES.md

@@ -2,25 +2,16 @@
 
 Changelog
 =========
+1.10.4
+-----
+* MarketPress: Error upon payment activation fixed
+* WooCommerce: Official support for custom intervals (e.g. every 3rd month) added
+* WooCommerce: Different bugs in order processing and subscription handling fixed
 
 1.10.3
 -----
 * Common: Integration of PayFrame to enable use of SAQ A for easier PCI DSS 3.0 compliance.
 
-PayFrame
-We’ve introduced a “payment form” option for easier compliance with PCI requirements.
-
-In addition to having a payment form directly integrated in your checkout page, you
-can use our embedded PayFrame solution to ensure that payment data never
-touches your website.
-
-PayFrame is enabled by default, but you can choose between both options in the
-plugin settings. Later this year, we’re bringing you the ability to customise the
-appearance and text content of the PayFrame version.
-
-To learn more about the benefits of PayFrame, please visit our FAQ:
-https://www.paymill.com/en/faq/howdoespaymillspayframesolutionwork
-
 1.10.2
 -----
 * Subscriptions: "required_offer_or_amount_and_currency_and_interval" error fixed

README.md

@@ -7,7 +7,7 @@ PAYMILL for WordPress
 * Tags: paymill, creditcard, elv, payment, woocommerce, paybutton, ecommerce, debitcard, subscriptions
 * Requires at least: 4.2.2
 * Tested up to: 4.2.2
-* Stable tag: 1.10.3
+* Stable tag: 1.10.4
 * License: [GPLv3 or later](http://www.gnu.org/licenses/gpl-3.0.html)
 
 With PAYMILL you are able to provide credit card based payments for your customers.
@@ -46,6 +46,21 @@ Accept payments in up to 100 currencies.
 All major card brands like MasterCard, VISA, American Express, Diner's Club, Maestro etc. supported.
 Available in 40 countries across Europe so far.
 
+Pay Frame
+=========
+
+We’ve introduced a “payment form” option for easier compliance with PCI requirements.
+
+In addition to having a payment form directly integrated in your checkout page, you
+can use our embedded PayFrame solution to ensure that payment data never
+touches your website.
+
+PayFrame is enabled by default, but you can choose between both options in the
+plugin settings. Later this year, we’re bringing you the ability to customise the
+appearance and text content of the PayFrame version.
+
+To learn more about the benefits of PayFrame, please visit our FAQ:
+https://www.paymill.com/en/faq/how-does-paymills-payframe-solution-work
 
 Team
 ====

lib/css/paymill.css

@@ -130,7 +130,7 @@ paymill_#form_credit, paymill_#form_elv{
 .paymill_payment_logos{
 	margin-bottom:10px;
 }
-.paymill_payment_logos img{
+.paymill_payment_logos img, .payment_method_paymill label img{
 	display:inline;
 }
 

lib/errors.inc.php

@@ -49,6 +49,10 @@ public function getErrors($function=false,$flush=false){
 			$this->errors = array();
 		}
 	}
+
+	public function reset(){
+		$this->errors		= array();
+	}
 }
 
 ?>

lib/integration/marketpress.inc.php

@@ -19,10 +19,10 @@ class MP_Gateway_Paymill_for_WordPress extends MP_Gateway_API {
 	var $plugin_name = 'paymill-for-wordpress';
 
 	//name of your gateway, for the admin side.
-	var $admin_name = '';
+	var $admin_name = 'Paymill for WordPress';
 
 	//public name of your gateway, for lists and such.
-	var $public_name = '';
+	var $public_name = 'Paymill';
 
 	//url for an image for your checkout method. Displayed on checkout form if set
 	var $method_img_url = '';
@@ -164,7 +164,7 @@ function on_creation() {
 
 		//set names here to be able to translate
 		$this->admin_name					= __('Paymill for WordPress', 'paymill');
-		$this->public_name					= $this->method_button_img_url = $settings['gateways']['paymill-for-wordpress']['name'];
+		$this->public_name					= $settings['gateways']['paymill-for-wordpress']['name'] ? $settings['gateways']['paymill-for-wordpress']['name'] : 'Paymill';
 
 		//button img
 		$this->method_img_url				=  $this->method_button_img_url = $settings['gateways']['paymill-for-wordpress']['image-url'];

lib/integration/subscriptions.inc.php

@@ -42,7 +42,7 @@ public function details($sub_id){
 	public function create($client, $offer, $payment, $startAt=false, $periodOfValidity=false){
 		if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_create'); // benchmark
 		load_paymill(); // this function-call can and should be used whenever working with Paymill API
-		
+
 		try{
 			$GLOBALS['paymill_loader']->request_subscription->setClient($client);
 			$GLOBALS['paymill_loader']->request_subscription->setOffer($offer);