Release 1.1.10

Author: NicoEigenmannCW

README.md

@@ -13,11 +13,11 @@ This repository contains the PostFinance Checkout WooCommerce plugin that enable
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.9/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.10/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/woocommerce/blob/1.1.9/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/woocommerce/blob/1.1.10/LICENSE) for more information.
 
 
 

assets/js/frontend/checkout.js

@@ -174,6 +174,12 @@ jQuery(function($) {
 		},
 
 		register_method : function(method_id, configuration_id, container_id) {
+			if (typeof window.IframeCheckoutHandler == 'undefined') {
+				this.payment_methods[method_id] = {
+						height : 0
+				    };
+				return;
+			}
 
 		    if (typeof this.payment_methods[method_id] != 'undefined'
 			    && $('#' + container_id).find("iframe").length > 0) {

changelog.txt

@@ -75,6 +75,10 @@
 
 * Fix - Issue in Checkout Javascript
 
+= 1.1.10 - September 07, 2018 =
+
+* Tweak - Fall back to payment page, if iframe can not be initialized
+
 = 1.1.2 - May 22, 2018 =
 
 * Fix - Issue with refunds

docs/en/documentation.html

@@ -145,7 +145,7 @@ public function get_settings(){
 		$settings = array(
 		    array(
 		        'links' => array(
-		            'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.9/docs/en/documentation.html' => __('Documentation', 'woo-postfinancecheckout'),
+		            'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.10/docs/en/documentation.html' => __('Documentation', 'woo-postfinancecheckout'),
 		            'https://www.postfinance-checkout.ch/user/signup' => __('Sign Up', 'woo-postfinancecheckout')
 		        ),
 		        'type' => 'postfinancecheckout_links',

includes/admin/class-wc-postfinancecheckout-admin-settings-page.php

@@ -298,7 +298,7 @@ public function payment_fields(){
 		parent::payment_fields();
 		?>
 
-<div id="payment-form-<?php echo $this->id?>"></div>
+<div id="payment-form-<?php echo $this->id?>"><input type="hidden" id="postfinancecheckout-iframe-possible-<?php echo $this->id?>" name="postfinancecheckout-iframe-possible-<?php echo $this->id?>" value="false" /></div>
 <div id="postfinancecheckout-method-configuration-<?php echo $this->id?>"
 	class="postfinancecheckout-method-configuration" style="display: none;"
 	data-method-id="<?php echo $this->id; ?>"
@@ -336,12 +336,13 @@ public function process_payment($order_id){
 			    $existing = WC_PostFinanceCheckout_Entity_Transaction_Info::load_by_order_id($order_id);
 			    if($existing->get_id() > 0 && $existing->get_state() != \PostFinanceCheckout\Sdk\Model\TransactionState::PENDING){
 			        WooCommerce_PostFinanceCheckout::instance()->add_notice(__('There was an issue, while processing your order. Please try again or use another payment method.', 'woo-postfinancecheckout'), 'error');
+			        $order = wc_get_order($order_id);
 			        $order->update_status( 'failed' );
 			        WC()->session->set('reload_checkout', true);
 			        return array(
 			            'result' => 'failure'
 			        );
-			    }			    
+			    }
 			}
 
 			$order = wc_get_order($order_id);
@@ -354,11 +355,23 @@ public function process_payment($order_id){
 			$order->delete_meta_data('_wc_postfinancecheckout_restocked');
 
 			$order->save();
+			
 			$result =array(
 			    'result' => 'success',
 			    'postfinancecheckout' => 'true'
 			);
+			$no_iframe = isset($_POST['postfinancecheckout-iframe-possible-'.$this->id]) && $_POST['postfinancecheckout-iframe-possible-'.$this->id] == 'false';
+			if($no_iframe){
+			    $result = array(
+			        'result' => 'success',
+			        'redirect' => $transaction_service->get_payment_page_url($transaction->getLinkedSpaceId(), $transaction->getId()).'&paymentMethodConfigurationId='.$this->get_payment_method_configuration()->get_configuration_id()
+			    );
+	        }	
+			
 			if($is_order_pay_endpoint){
+			    if($no_iframe){
+			        return $result;
+			    }		    
 			    wp_send_json( $result );
 			    exit;
 			}

includes/class-wc-postfinancecheckout-gateway.php

@@ -260,7 +260,7 @@ private static function parse_update_notice($content, $new_version){
 	public static function plugin_row_meta( $links, $file ) {
 	    if ( WC_POSTFINANCECHECKOUT_PLUGIN_BASENAME === $file ) {
 	        $row_meta = array(
-	            'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.9/docs/en/documentation.html" aria-label="' . esc_attr__('View Documentation', 'woo-postfinancecheckout') . '">' . esc_html__('Documentation', 'woo-postfinancecheckout') . '</a>',
+	            'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.10/docs/en/documentation.html" aria-label="' . esc_attr__('View Documentation', 'woo-postfinancecheckout') . '">' . esc_html__('Documentation', 'woo-postfinancecheckout') . '</a>',
 	        );
 
 	        return array_merge( $links, $row_meta );

includes/class-wc-postfinancecheckout-migration.php

@@ -100,6 +100,15 @@ public function get_javascript_url(){
 		$transaction = $this->get_transaction_from_session();
 		return $this->get_transaction_service()->buildJavaScriptUrl($transaction->getLinkedSpaceId(), $transaction->getId());
 	}
+	
+	/**
+	 * Returns the URL to PostFinance Checkout's JavaScript library that is necessary to display the payment form.
+	 *
+	 * @return string
+	 */
+	public function get_payment_page_url($space_id, $transaction_id){
+	    return $this->get_transaction_service()->buildPaymentPageUrl($space_id, $transaction_id);
+	}
 
 	/**
 	 * Returns the transaction with the given id.

includes/service/class-wc-postfinancecheckout-service-transaction.php

@@ -86,7 +86,6 @@ protected function authorize(\PostFinanceCheckout\Sdk\Model\Transaction $transac
     		$status = apply_filters('wc_postfinancecheckout_authorized_status', 'on-hold', $order);
     		$order->add_meta_data("_postfinancecheckout_authorized", "true", true);
     		$order->update_status($status);
-    		
     		if (isset(WC()->cart)) {
     			WC()->cart->empty_cart();
     		}
@@ -97,8 +96,7 @@ protected function waiting(\PostFinanceCheckout\Sdk\Model\Transaction $transacti
 		if (!$order->get_meta('_postfinancecheckout_manual_check', true)) {
 		    do_action('wc_postfinancecheckout_completed', $transaction , $order);
 			$status = apply_filters('wc_postfinancecheckout_completed_status', 'postf-waiting', $order);
-			$order->update_status($status);
-			
+			$order->update_status($status);			
 		}
 	}
 

includes/webhook/class-wc-postfinancecheckout-webhook-transaction.php

@@ -3,7 +3,7 @@ Contributors: customwebgmbh
 Tags: woocommerce PostFinance Checkout, woocommerce, PostFinance Checkout, payment, e-commerce, webshop, psp, invoice, packing slips, pdf, customer invoice, processing
 Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 1.1.9
+Stable tag: 1.1.10
 License: Apache 2
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -23,7 +23,7 @@ To use this extension, a PostFinance Checkout account is required. Sign up on [P
 
 == Documentation ==
 
-Additional documentation for this plugin is available [here](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.9/docs/en/documentation.html).
+Additional documentation for this plugin is available [here](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.10/docs/en/documentation.html).
 
 == Installation ==
 
@@ -52,7 +52,6 @@ Additional documentation for this plugin is available [here](https://plugin-docu
 == Changelog ==
 
 
-= 1.1.9 - August 30, 2018 =
+= 1.1.10 - September 07, 2018 =
 
-* Tweak - Settings descriptions
-* Doc - Improved documentation
+* Tweak - Fall back to payment page, if iframe can not be initialized