Merge pull request #152 from Dintero/develop

Version 1.7.1

.eslintrc.json

@@ -12,7 +12,7 @@
     "no-unused-vars":"off"
   },
   "extends": [
-    "plugin:@wordpress/eslint-plugin/esnext"
+    "plugin:@wordpress/eslint-plugin/recommended"
   ],
   "globals": {
     "dintero": false,

classes/class-dintero-checkout-embedded.php

@@ -23,6 +23,42 @@ public function __construct() {
 			add_filter( 'woocommerce_checkout_fields', array( $this, 'add_shipping_data_input' ) );
 			add_action( 'woocommerce_before_calculate_totals', array( $this, 'update_shipping_method' ), 1 );
 			add_action( 'woocommerce_after_calculate_totals', array( $this, 'update_dintero_checkout_session' ), 9999 );
+			add_action( 'woocommerce_checkout_update_order_review', array( $this, 'update_wc_customer' ) );
+		}
+	}
+
+	/**
+	 * Update the WC_Customer with the entered billing and shipping data.
+	 *
+	 * By default, only the fields required for calculating shipping are updated.
+	 *
+	 * @param  string $raw_post_data The checkout form data.
+	 * @return void
+	 */
+	public function update_wc_customer( $raw_post_data ) {
+		parse_str( $raw_post_data, $post_data );
+		$post_data = array_filter(
+			wc_clean( wp_unslash( $post_data ) ),
+			function ( $value ) {
+				return ! empty( $value );
+			}
+		);
+
+		isset( $post_data['billing_first_name'] ) && WC()->customer->set_billing_first_name( $post_data['billing_first_name'] );
+		isset( $post_data['billing_last_name'] ) && WC()->customer->set_billing_last_name( $post_data['billing_last_name'] );
+		isset( $post_data['billing_company'] ) && WC()->customer->set_billing_company( $post_data['billing_company'] );
+		isset( $post_data['billing_phone'] ) && WC()->customer->set_billing_phone( $post_data['billing_phone'] );
+		isset( $post_data['billing_email'] ) && WC()->customer->set_billing_email( $post_data['billing_email'] );
+
+		if ( isset( $post_data['ship_to_different_address'] ) ) {
+			isset( $post_data['shipping_first_name'] ) && WC()->customer->set_shipping_first_name( $post_data['shipping_first_name'] );
+			isset( $post_data['shipping_last_name'] ) && WC()->customer->set_shipping_last_name( $post_data['shipping_last_name'] );
+			isset( $post_data['shipping_company'] ) && WC()->customer->set_shipping_company( $post_data['shipping_company'] );
+
+			// Since WC 5.6.0.
+			if ( method_exists( WC()->customer, 'set_shipping_phone' ) && isset( $post_data['shipping_phone'] ) ) {
+				WC()->customer->set_shipping_phone( $post_data['shipping_phone'] );
+			}
 		}
 	}
 
@@ -126,5 +162,5 @@ public function update_dintero_checkout_session() {
 
 		Dintero()->api->update_checkout_session( $session_id );
 	}
-
-} new Dintero_Checkout_Embedded();
+}
+new Dintero_Checkout_Embedded();

classes/requests/helpers/class-dintero-checkout-cart.php

@@ -357,7 +357,6 @@ public function process_coupons() {
 	 * @return array An associative array representing the billing address.
 	 */
 	public function get_billing_address() {
-
 		$billing_address = array(
 			'first_name'     => WC()->customer->get_billing_first_name(),
 			'last_name'      => WC()->customer->get_billing_last_name(),
@@ -374,8 +373,8 @@ public function get_billing_address() {
 		/* Sanitize all values. Remove all empty elements (required by Dintero). */
 		return array_filter(
 			$billing_address,
-			function( $value ) {
-				return ! empty( sanitize_text_field( $value ) );
+			function ( $value ) {
+				return ! empty( wc_clean( $value ) );
 			}
 		);
 	}
@@ -405,8 +404,8 @@ public function get_shipping_address() {
 		/* Sanitize all values. Remove all empty elements (required by Dintero). */
 		return array_filter(
 			$shipping_address,
-			function( $value ) {
-				return ! empty( sanitize_text_field( $value ) );
+			function ( $value ) {
+				return ! empty( wc_clean( $value ) );
 			}
 		);
 	}

classes/requests/helpers/class-dintero-checkout-order.php

@@ -426,7 +426,7 @@ public function get_billing_address( $order ) {
 		return array_filter(
 			$billing_address,
 			function ( $value ) {
-				return ! empty( sanitize_text_field( $value ) );
+				return ! empty( wc_clean( $value ) );
 			}
 		);
 	}
@@ -458,7 +458,7 @@ public function get_shipping_address( $order ) {
 		return array_filter(
 			$shipping_address,
 			function ( $value ) {
-				return ! empty( sanitize_text_field( $value ) );
+				return ! empty( wc_clean( $value ) );
 			}
 		);
 	}

classes/requests/put/class-dintero-checkout-update-checkout-session.php

@@ -53,6 +53,19 @@ public function get_body() {
 			'remove_lock' => true,
 		);
 
+		// Only non-express checkout must be updated through API since the fields are entered in WC.
+		if ( 'checkout' === $this->settings['checkout_type'] ) {
+			$billing_address = $helper->get_billing_address();
+			if ( ! empty( $billing_address ) ) {
+				$body['order']['billing_address'] = $billing_address;
+			}
+
+			$shipping_address = $helper->get_shipping_address();
+			if ( ! empty( $shipping_address ) ) {
+				$body['order']['shipping_address'] = $shipping_address;
+			}
+		}
+
 		// Set if express or not.
 		if ( $this->is_express() && $this->is_embedded() ) {
 			$this->add_express_object( $body );

dintero-checkout-for-woocommerce.php

@@ -5,7 +5,7 @@
  * Description: Dintero offers a complete payment solution. Simplifying the payment process for you and the customer.
  * Author: Dintero, Krokedil
  * Author URI: https://krokedil.com/
- * Version: 1.7.0
+ * Version: 1.7.1
  * Text Domain: dintero-checkout-for-woocommerce
  * Domain Path: /languages
  *
@@ -22,7 +22,7 @@
 	exit;
 }
 
-define( 'DINTERO_CHECKOUT_VERSION', '1.7.0' );
+define( 'DINTERO_CHECKOUT_VERSION', '1.7.1' );
 define( 'DINTERO_CHECKOUT_URL', untrailingslashit( plugins_url( '/', __FILE__ ) ) );
 define( 'DINTERO_CHECKOUT_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
 define( 'DINTERO_CHECKOUT_MAIN_FILE', __FILE__ );

languages/dintero-checkout-for-woocommerce.pot

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/Dintero.Checkout.WooCommerce.V2\n"
-"POT-Creation-Date: 2023-09-20 13:14:32+00:00\n"
+"POT-Creation-Date: 2023-09-26 08:10:41+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"