From 7590289d0508b2aea4b7b4de894f9958999b2757 Mon Sep 17 00:00:00 2001 From: Matthias Reuter Date: Thu, 4 Dec 2014 16:08:07 +0100 Subject: [PATCH] 1.8.1 * WooCommeerce: 3Dsecure amount mismatch issue fixed * WooCommerce: Separated Payment for order feature support * Common: Debug Mode now has no effect when not activated --- CHANGES.md | 6 ++++++ FAQ.md | 7 ++++++- lib/integration/woocommerce.inc.php | 8 ++++---- paymill.php | 6 +----- readme.txt | 14 ++++++++++++-- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8e553d7..481a38e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,12 @@ Changelog ========= +1.8.1 +----- +* WooCommeerce: 3Dsecure amount mismatch issue fixed +* WooCommerce: Separated Payment for order feature support +* Common: Debug Mode now has no effect when not activated + 1.8.0 ----- * Cart66: Final released diff --git a/FAQ.md b/FAQ.md index a287cb1..1749277 100644 --- a/FAQ.md +++ b/FAQ.md @@ -64,4 +64,9 @@ Yes, here's an example shortcode with all currently available parameters: '[paym Are there actions/filters/hooks in the Pay Button? -------------------------------------------------- Yes, all of them have 1 parameter as array with several vars. -You may use var_dump to get their content and structure. \ No newline at end of file +You may use var_dump to get their content and structure. + +Does WooCommerce Subscriptions Integration allows setup fees? How are Coupons applied? +-------------------------------------------------- +Yes, but it's working through a workaround. There are two transactions made, one for the subscription and one for initial fee. +Subscriptions fee cannot be changed, even through coupons. Please be aware that coupons are working on initial fee only. \ No newline at end of file diff --git a/lib/integration/woocommerce.inc.php b/lib/integration/woocommerce.inc.php index 5bf4c73..77dd49f 100644 --- a/lib/integration/woocommerce.inc.php +++ b/lib/integration/woocommerce.inc.php @@ -566,7 +566,7 @@ private function processProducts(){ $GLOBALS['paymill_loader']->request_transaction->setPayment($this->paymentClass->getPaymentID()); } $GLOBALS['paymill_loader']->request_transaction->setClient($this->client->getId()); - $GLOBALS['paymill_loader']->request_transaction->setDescription($_SERVER['HTTP_HOST'].': '.$this->order_desc); + $GLOBALS['paymill_loader']->request_transaction->setDescription($this->order_desc); $GLOBALS['paymill_loader']->request->setSource(serialize($GLOBALS['paymill_source'])); $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_transaction); @@ -617,7 +617,7 @@ public function process_payment($order_id){ // client retrieved, now we are ready to process the payment if($this->client->getId() !== false && strlen($this->client->getId()) > 0){ $this->order_id = $order_id; - $this->order_desc = __('Order #','paymill').$this->order_id; + $this->order_desc = $_SERVER['HTTP_HOST'].': '.__('Order #','paymill').$this->order_id.__(', Customer-ID #','paymill').get_current_user_id(); $this->order = new WC_Order($this->order_id); $cart = $woocommerce->cart->get_cart(); $cart = reset($cart); @@ -693,13 +693,13 @@ public function payment_fields(){ // settings $GLOBALS['paymill_active'] = true; - $cart_total = $woocommerce->cart->total*100; + $cart_total = WC_Payment_Gateway::get_order_total()*100; $currency = get_woocommerce_currency(); $no_logos = true; // form ids echo ''; diff --git a/paymill.php b/paymill.php index c2e6c5f..1de471a 100644 --- a/paymill.php +++ b/paymill.php @@ -3,7 +3,7 @@ Plugin Name: Paymill Plugin URI: https://www.paymill.com Description: Payments made easy -Version: 1.8.0 +Version: 1.8.1 Author: Matthias Reuter info@straightvisions.com Author URI: http://elbnetz.com */ @@ -31,10 +31,6 @@ /*define('paymill_BENCHMARK', true); require_once(PAYMILL_DIR.'lib/benchmark.inc.php'); paymill_doBenchmark(false,'init'); // start benchmark*/ - }else{ - define('paymill_BENCHMARK', false); - error_reporting(0); - ini_set('display_errors',0); } // load translation diff --git a/readme.txt b/readme.txt index cc30871..ededde5 100644 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === PAYMILL for WordPress === Contributors: Matthias Reuter Donate link: -Tags: paymill, creditcard, elv, payment, woocommerce, paybutton, shopp, shopplugin, marketpress, magic members, magicmembers, mgm, ecommerce, debitcard, subscriptions +Tags: paymill, creditcard, elv, sepa, payment, woocommerce, paybutton, shopp, shopplugin, marketpress, magic members, magicmembers, mgm, cart66, ecommerce, debitcard, subscriptions Requires at least: 4.0 Tested up to: 4.0 -Stable tag: 1.8.0 +Stable tag: 1.8.1 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -136,6 +136,10 @@ The Pay Button is made for customizing and you should make intensive use of CSS Additionally, you may want to replace the default order form with your own. Create a custom theme file on 'THEME_DIR/paymill/pay_button.php' (it will replace '/paymill/lib/tpl/pay_button.php') += Does WooCommerce Subscriptions Integration allows setup fees? How are Coupons applied? = +Yes, but it's working through a workaround. There are two transactions made, one for the subscription and one for initial fee. +Subscriptions fee cannot be changed, even through coupons. Please be aware that coupons are working on initial fee only. + == Screenshots == 1. Common Settings @@ -148,6 +152,12 @@ custom theme file on 'THEME_DIR/paymill/pay_button.php' (it will replace '/paymi == Changelog == += 1.8.1 = + +* WooCommeerce: 3Dsecure amount mismatch issue fixed +* WooCommerce: Separated Payment for order feature support +* Common: Debug Mode now has no effect when not activated + = 1.8.0 = * Cart66: Final released