Merge pull request #292 from skyverge/v4-wc-3.4-compat

v4: Port WC 3.4 & GDPR changes

Author: ChaseWiseman

woocommerce/payment-gateway/assets/js/frontend/sv-wc-payment-gateway-payment-form.coffee

@@ -294,7 +294,7 @@ jQuery( document ).ready ($) ->
 			id_dasherized = @id_dasherized
 			csc_required  = @csc_required
 			$new_payment_method_selection = $( "div.js-wc-#{ id_dasherized }-new-payment-method-form" )
-			$csc_field = $new_payment_method_selection.find( '.js-sv-wc-payment-gateway-credit-card-form-csc' ).parent()
+			$csc_field = $new_payment_method_selection.find( '.js-sv-wc-payment-gateway-credit-card-form-csc' ).closest( '.form-row' )
 
 			# show/hide the saved payment methods when a saved payment method is de-selected/selected
 			$( "input.js-wc-#{ @id_dasherized }-payment-token" ).change ->
@@ -317,7 +317,7 @@ jQuery( document ).ready ($) ->
 					# move the CSC field back into its regular spot
 					if csc_required
 						$csc_field.removeClass( 'form-row-first' ).addClass( 'form-row-last' )
-						$new_payment_method_selection.find( '.js-sv-wc-payment-gateway-credit-card-form-expiry' ).parent().after( $csc_field )
+						$new_payment_method_selection.find( '.js-sv-wc-payment-gateway-credit-card-form-expiry' ).closest( '.form-row' ).after( $csc_field )
 			.change()
 
 			# display the 'save payment method' option for guest checkouts if the 'create account' option is checked

woocommerce/payment-gateway/assets/js/frontend/sv-wc-payment-gateway-payment-form.min.js

@@ -82,6 +82,9 @@ abstract class SV_WC_Payment_Gateway_Plugin extends SV_WC_Plugin {
 	/** @var boolean true if this gateway requires SSL for processing transactions, false otherwise */
 	private $require_ssl;
 
+	/** @var SV_WC_Payment_Gateway_Privacy payment gateway privacy handler instance */
+	protected $privacy_handler;
+
 	/** @var SV_WC_Payment_Gateway_Admin_User_Edit_Handler adds admin user edit payment gateway functionality */
 	private $admin_user_edit_handler;
 
@@ -276,6 +279,12 @@ public function lib_includes() {
 			require_once( $payment_gateway_framework_path . '/integrations/class-sv-wc-payment-gateway-integration-pre-orders.php' );
 		}
 
+		// privacy
+		if ( SV_WC_Plugin_Compatibility::is_wc_version_gte( '3.4' ) && class_exists( 'WC_Abstract_Privacy' ) ) {
+			require_once( "{$payment_gateway_framework_path}/class-sv-wc-payment-gateway-privacy.php" );
+			$this->privacy_handler = new SV_WC_Payment_Gateway_Privacy( $this );
+		}
+
 		// Admin user handler
 		if ( is_admin() ) {
 			require_once( $payment_gateway_framework_path . '/admin/class-sv-wc-payment-gateway-admin-user-handler.php' );
@@ -951,6 +960,19 @@ public function can_capture_charge( $gateway ) {
 	/** Getter methods ******************************************************/
 
 
+	/**
+	 * Gets the privacy handler instance.
+	 *
+	 * @since 4.9.2-dev
+	 *
+	 * @return SV_WC_Payment_Gateway_Privacy
+	 */
+	public function get_privacy_instance() {
+
+		return $this->privacy_handler;
+	}
+
+
 	/**
 	 * Get the admin user handler instance.
 	 *