1.6.9

* MarketPress: Beta released
* Common: Allows overriding language files by placing them into
/wp-content/languages/paymill/
* PayButton: Order Form optimized
* PayButton: Feature for price/currency format
* Shopp: Paymill as Payment Gateway wasn't recognized due to last
changes in shopplugin - fixed
* Shopp: Errors wasn't shown on checkout process - fixed
* Shopp: Compatibility with new checkout button achieved

CHANGES.md

@@ -3,6 +3,16 @@
 Changelog
 =========
 
+1.6.9
+-----
+* MarketPress: Beta released
+* Common: Allows overriding language files by placing them into /wp-content/languages/paymill/
+* PayButton: Order Form optimized
+* PayButton: Feature for price/currency format
+* Shopp: Paymill as Payment Gateway wasn't recognized due to last changes in shopplugin - fixed
+* Shopp: Errors wasn't shown on checkout process - fixed
+* Shopp: Compatibility with new checkout button achieved
+
 1.6.8
 -----
 * WooCommerce: Issue with order completion fixed

README.md

@@ -7,7 +7,7 @@ PAYMILL for WordPress
 * Tags: paymill, creditcard, elv, payment, woocommerce, paybutton, ecommerce, debitcard, subscriptions
 * Requires at least: 3.9
 * Tested up to: 3.9
-* Stable tag: 1.6.8
+* Stable tag: 1.6.9
 * 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.
@@ -21,15 +21,15 @@ Requires:
 * WordPress 3.9.x or higher
 
 Supported Shops including subscriptions support:
-* WooCommerce (2.1.x)
+* WooCommerce (2.1.x) + WooCommerce Subscriptions (1.5.x)
 * Magic Members (1.8.x)
 * Pay Button (independent, light-weight payment form)
 
 Supported Shops without subscriptions support (yet):
-* ShopPlugin (1.3.x)
+* ShopPlugin (1.3.4)
 
 work in progress:
-* MarketPress (2.9.x)
+* MarketPress (2.9.x) - 95% completed
 
 
 Service Description

copy_this/shopp/wp-content/shopp-addons/paymill.php

@@ -10,6 +10,11 @@
  * @since 1.2
  * @subpackage PaymillShopp
  **/
+
+/*
+class PaymillShopp extends GatewayFramework implements GatewayModule {
+
+*/
 
 if(defined('PAYMILL_DIR') && file_exists(PAYMILL_DIR.'lib/integration/shopplugin.inc.php')){
 	require_once(PAYMILL_DIR.'lib/integration/shopplugin.inc.php');

lib/config.inc.php

@@ -24,7 +24,8 @@ public function __construct() {
 			$this->paymill_pay_button_settings = array_merge( array(
 				'number_decimal' => '.',
 				'number_thousands' => ',',
-				'currency' => 'EUR'
+				'currency' => 'EUR',
+				'currency_format' => '%n%s'
 			), $this->paymill_pay_button_settings );
 
 			if(isset($this->paymill_general_settings['api_key_private']) && isset($this->paymill_general_settings['api_key_public']) && $this->paymill_general_settings['api_key_private'] != '' && $this->paymill_general_settings['api_key_public'] != ''){
@@ -132,6 +133,7 @@ public function paymill_register_pay_button_settings(){
 				'number_decimal'	=> __('Number Format: Decimal Point', 'paymill'),
 				'number_thousands'	=> __('Number Format: Thousands Seperator', 'paymill'),
 				'currency'			=> __('Currency', 'paymill'),
+				'currency_format'	=> __('Currency Format', 'paymill'),
 				'email_outgoing'	=> __('Outgoing Email', 'paymill'),
 				'email_incoming'	=> __('Incoming Email', 'paymill'),
 				'thankyou_url'		=> __('Thank You URL', 'paymill'),
@@ -173,7 +175,6 @@ public function paymill_register_pay_button_settings(){
 			// shipping
 			add_settings_section( 'section_pay_button_shipping', false, array( &$this, 'section_pay_button_shipping_desc' ), $this->setting_keys['paymill_pay_button_settings'] );
 
-			//var_dump($this->paymill_pay_button_settings['flat_shipping']);
 			if(isset($this->paymill_pay_button_settings['flat_shipping'])){
 				if(isset($this->paymill_pay_button_settings['flat_shipping'][count($this->paymill_pay_button_settings['flat_shipping'])]['flat_shipping_country']) && strlen($this->paymill_pay_button_settings['flat_shipping'][count($this->paymill_pay_button_settings['flat_shipping'])]['flat_shipping_country']) > 0){
 					$shipping = count($this->paymill_pay_button_settings['flat_shipping'])+5;
@@ -359,6 +360,7 @@ class="regular-text code" '.($value ? 'checked="checked"' : '').' />
 				'surname',
 				'street',
 				'number',
+				'state',
 				'zip',
 				'city',
 				/*'email',*/
@@ -431,6 +433,7 @@ private function paymill_do_settings_fields($page, $section){
 
 			$descriptions['no_default_css']					= __('Advanced users want to fully customize the payment button. Disabling default CSS from Pay Button will make that much easier.', 'paymill');
 			$descriptions['currency']						= __('Currency, <a href="http://en.wikipedia.org/wiki/ISO_4217#Active_codes" target="_blank">ISO 4217</a> e.g. "EUR" or "GBP"', 'paymill');
+			$descriptions['currency_format']				= __('Currency Format - use the following variables: %n = number, %s = symbol.', 'paymill');
 			$descriptions['api_key_private']				= __('Insert your Paymill <strong>PRIVATE</strong> API key.', 'paymill');
 			$descriptions['api_key_public']					= __('Insert your Paymill <strong>PUBLIC</strong> API key.', 'paymill');
 

lib/css/paymill.css

@@ -73,6 +73,12 @@
 	display:block;
 	clear:both;
 }
+#paymill_payment_form .paymill_card_cvc .cvc_desc{
+	line-height:30px;
+	display:inline-block;
+	height:30px;
+	margin-left:5px;
+}
 #paymill_payment_form #paymill_card_number{
 	background-image:url('../img/payment_logos.png');
 	background-repeat:no-repeat;