Skip to content

Commit

Permalink
1.8.1
Browse files Browse the repository at this point in the history
* WooCommeerce: 3Dsecure amount mismatch issue fixed
* WooCommerce: Separated Payment for order feature support
* Common: Debug Mode now has no effect when not activated
  • Loading branch information
straightvisions-matthias-bathke committed Dec 4, 2014
1 parent c1a5f77 commit 7590289
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
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.
8 changes: 4 additions & 4 deletions lib/integration/woocommerce.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 '<script>
paymill_form_checkout_id = ".checkout";
paymill_form_checkout_id = ".checkout, #order_review";
paymill_form_checkout_submit_id = "#place_order";
paymill_shop_name = "woocommerce";
</script>';
Expand Down
6 changes: 1 addition & 5 deletions paymill.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
Author URI: http://elbnetz.com
*/
Expand Down Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7590289

Please sign in to comment.