From e793cc165ff2921bcbf368b31a1440cdb8c10537 Mon Sep 17 00:00:00 2001 From: Miguel Peixe Date: Thu, 19 Sep 2024 14:30:14 -0300 Subject: [PATCH 1/3] fix(sync): remove localized number format --- includes/reader-activation/sync/class-woocommerce.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/reader-activation/sync/class-woocommerce.php b/includes/reader-activation/sync/class-woocommerce.php index e9515a8dd..b2e96cc84 100644 --- a/includes/reader-activation/sync/class-woocommerce.php +++ b/includes/reader-activation/sync/class-woocommerce.php @@ -234,7 +234,7 @@ private static function get_order_metadata( $order, $payment_page_url = false ) } $order_date_paid = $order->get_date_paid(); if ( $payment_received && ! empty( $order_date_paid ) ) { - $metadata['last_payment_amount'] = \wc_format_localized_price( $order->get_total() ); + $metadata['last_payment_amount'] = $order->get_total(); $metadata['last_payment_date'] = $order_date_paid->date( Metadata::DATE_FORMAT ); } @@ -270,7 +270,7 @@ private static function get_order_metadata( $order, $payment_page_url = false ) $metadata['recurring_payment'] = $current_subscription->get_total(); if ( $payment_received ) { - $metadata['last_payment_amount'] = \wc_format_localized_price( $current_subscription->get_total() ); + $metadata['last_payment_amount'] = $current_subscription->get_total(); $metadata['last_payment_date'] = $current_subscription->get_date( 'last_order_date_paid' ) ? $current_subscription->get_date( 'last_order_date_paid' ) : gmdate( Metadata::DATE_FORMAT ); } @@ -322,7 +322,7 @@ public static function get_contact_from_customer( $customer, $payment_page_url = $metadata['account'] = $customer->get_id(); $metadata['registration_date'] = $customer->get_date_created()->date( Metadata::DATE_FORMAT ); - $metadata['total_paid'] = \wc_format_localized_price( $customer->get_total_spent() ); + $metadata['total_paid'] = $customer->get_total_spent(); $order = self::get_current_product_order_for_sync( $customer ); From 23bd522cd72d9373117d5bd782d18371da54295d Mon Sep 17 00:00:00 2001 From: Miguel Peixe Date: Thu, 19 Sep 2024 14:55:16 -0300 Subject: [PATCH 2/3] fix: remove unused mock --- tests/mocks/wc-mocks.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/mocks/wc-mocks.php b/tests/mocks/wc-mocks.php index 918172d5b..119a6921a 100644 --- a/tests/mocks/wc-mocks.php +++ b/tests/mocks/wc-mocks.php @@ -123,9 +123,6 @@ public function get_status() { function wc_create_order( $data ) { return new WC_Order( $data ); } -function wc_format_localized_price( $price ) { - return '$' . $price; -} function wc_get_checkout_url() { return 'https://example.com/checkout'; } From 672131069a5a91d7e9da35a04892a311f37516ac Mon Sep 17 00:00:00 2001 From: Miguel Peixe Date: Thu, 19 Sep 2024 14:56:40 -0300 Subject: [PATCH 3/3] test: fix incorrect assertion --- tests/unit-tests/reader-activation-sync-woocommerce.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit-tests/reader-activation-sync-woocommerce.php b/tests/unit-tests/reader-activation-sync-woocommerce.php index 6afd272a7..7ca7a5825 100644 --- a/tests/unit-tests/reader-activation-sync-woocommerce.php +++ b/tests/unit-tests/reader-activation-sync-woocommerce.php @@ -104,7 +104,7 @@ public function test_payment_metadata_basic() { 'payment_page' => $payment_page_url, 'membership_status' => 'customer', 'product_name' => '', - 'last_payment_amount' => '$' . $order_data['total'], + 'last_payment_amount' => $order_data['total'], 'last_payment_date' => $today, 'payment_page_utm_source' => 'test_source', 'payment_page_utm_medium' => '', @@ -116,7 +116,7 @@ public function test_payment_metadata_basic() { 'billing_cycle' => '', 'recurring_payment' => '', 'next_payment_date' => '', - 'total_paid' => '$' . ( self::USER_DATA['meta_input']['wc_total_spent'] + $order_data['total'] ), + 'total_paid' => self::USER_DATA['meta_input']['wc_total_spent'] + $order_data['total'], 'account' => self::$user_id, 'registration_date' => $today, ], @@ -182,7 +182,7 @@ public function test_payment_metadata_from_customer() { self::$current_order = $order; $contact_data = Sync\WooCommerce::get_contact_from_customer( self::$user_id ); - $this->assertEquals( '$' . $order_data['total'], $contact_data['metadata']['last_payment_amount'] ); + $this->assertEquals( $order_data['total'], $contact_data['metadata']['last_payment_amount'] ); $this->assertEquals( gmdate( 'Y-m-d' ), $contact_data['metadata']['last_payment_date'] ); } @@ -208,7 +208,7 @@ public function test_payment_metadata_from_customer_with_last_order_failed() { ]; $order = \wc_create_order( $failed_order_data ); $contact_data = Sync\WooCommerce::get_contact_from_customer( self::$user_id ); - $this->assertEquals( '$' . $completed_order_data['total'], $contact_data['metadata']['last_payment_amount'] ); + $this->assertEquals( $completed_order_data['total'], $contact_data['metadata']['last_payment_amount'] ); $this->assertEquals( $completed_order_data['date_paid'], $contact_data['metadata']['last_payment_date'] ); } }