Merge pull request #371 from woocommerce/PCP-423-when-paying-for-a-su…

…bscrition-an Add retry counter meta to order to avoid duplicate invoice error on c…
woocommerce · Nov 22, 2021 · 5469a93 · 5469a93
2 parents 016d726 + 626f480
commit 5469a93
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 40 deletions.
diff --git a/modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php b/modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php
@@ -121,9 +121,11 @@ public function from_wc_order( \WC_Order $order ): PurchaseUnit {
 		$payee           = $this->payee_repository->payee();
 		$wc_order_id     = $order->get_order_number();
 		$custom_id       = $this->prefix . $wc_order_id;
-		$invoice_id      = $this->prefix . $wc_order_id;
+		$retry           = $order->get_meta( 'ppcp-retry' ) ? '-' . $order->get_meta( 'ppcp-retry' ) : '';
+		$invoice_id      = $this->prefix . $wc_order_id . $retry;
 		$soft_descriptor = '';
-		$purchase_unit   = new PurchaseUnit(
+
+		$purchase_unit = new PurchaseUnit(
 			$amount,
 			$items,
 			$shipping,

diff --git a/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
@@ -253,13 +253,19 @@ function ( Authorization $authorization ): bool {
 						}
 					}
 
+					// Adds retry counter meta to avoid duplicate invoice id error on consequent tries.
+					$wc_order->update_meta_data( 'ppcp-retry', (int) $wc_order->get_meta( 'ppcp-retry' ) + 1 );
+					$wc_order->save_meta_data();
+
 					$this->session_handler->destroy_session_data();
 					wc_add_notice( $error_message, 'error' );
 
 					return $failure_data;
 				}
 
+				WC()->cart->empty_cart();
 				$this->session_handler->destroy_session_data();
+
 				return array(
 					'result'   => 'success',
 					'redirect' => $this->get_return_url( $wc_order ),

diff --git a/modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php b/modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php
@@ -189,8 +189,6 @@ public function process( \WC_Order $wc_order ): bool {
 			$wc_order->update_meta_data( AuthorizedPaymentsProcessor::CAPTURED_META_KEY, 'true' );
 			$wc_order->update_status( 'processing' );
 		}
-		WC()->cart->empty_cart();
-		$this->session_handler->destroy_session_data();
 		$this->last_error = '';
 		return true;
 	}

diff --git a/tests/PHPUnit/ApiClient/Factory/PurchaseUnitFactoryTest.php b/tests/PHPUnit/ApiClient/Factory/PurchaseUnitFactoryTest.php
@@ -25,6 +25,7 @@ public function testWcOrderDefault()
         $wcOrder = Mockery::mock(\WC_Order::class);
         $wcOrder
             ->expects('get_order_number')->andReturn($wcOrderId);
+        $wcOrder->expects('get_meta')->andReturn('');
         $amount = Mockery::mock(Amount::class);
         $amountFactory = Mockery::mock(AmountFactory::class);
         $amountFactory
@@ -89,6 +90,7 @@ public function testWcOrderShippingGetsDroppedWhenNoPostalCode()
         $wcOrder = Mockery::mock(\WC_Order::class);
         $wcOrder
             ->expects('get_order_number')->andReturn(1);
+		$wcOrder->expects('get_meta')->andReturn('');
         $amount = Mockery::mock(Amount::class);
         $amountFactory = Mockery::mock(AmountFactory::class);
         $amountFactory
@@ -144,6 +146,7 @@ public function testWcOrderShippingGetsDroppedWhenNoCountryCode()
         $wcOrder = Mockery::mock(\WC_Order::class);
         $wcOrder
             ->expects('get_order_number')->andReturn(1);
+		$wcOrder->expects('get_meta')->andReturn('');
         $amount = Mockery::mock(Amount::class);
         $amountFactory = Mockery::mock(AmountFactory::class);
         $amountFactory

diff --git a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
@@ -42,7 +42,7 @@ public function testProcessPaymentSuccess() {
         $orderId = 1;
         $wcOrder = Mockery::mock(\WC_Order::class);
 		$wcOrder->shouldReceive('get_customer_id')->andReturn(1);
-
+		$wcOrder->shouldReceive('get_meta')->andReturn('');
         $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $orderProcessor
@@ -106,6 +106,12 @@ function(\WC_Order $order) use ($wcOrder) : bool {
         when('wc_get_checkout_url')
 		->justReturn('test');
 
+		$woocommerce = Mockery::mock(\WooCommerce::class);
+		$cart = Mockery::mock(\WC_Cart::class);
+		when('WC')->justReturn($woocommerce);
+		$woocommerce->cart = $cart;
+		$cart->shouldReceive('empty_cart');
+
         $result = $testee->process_payment($orderId);
 
         $this->assertIsArray($result);

diff --git a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
@@ -88,8 +88,6 @@ public function testAuthorize() {
         $sessionHandler
             ->expects('order')
             ->andReturn($currentOrder);
-        $sessionHandler
-            ->expects('destroy_session_data');
 
         $orderEndpoint = Mockery::mock(OrderEndpoint::class);
         $orderEndpoint
@@ -129,15 +127,6 @@ public function testAuthorize() {
             $this->environment
         );
 
-        $cart = Mockery::mock(\WC_Cart::class);
-        $cart
-            ->expects('empty_cart');
-        $woocommerce = Mockery::mock(\WooCommerce::class);
-        when('WC')
-			->justReturn($woocommerce);
-
-        $woocommerce->cart = $cart;
-
         $wcOrder
             ->expects('update_meta_data')
             ->with(
@@ -211,8 +200,6 @@ public function testCapture() {
         $sessionHandler
             ->expects('order')
             ->andReturn($currentOrder);
-        $sessionHandler
-            ->expects('destroy_session_data');
         $orderEndpoint = Mockery::mock(OrderEndpoint::class);
         $orderEndpoint
             ->expects('patch_order_with')
@@ -234,21 +221,8 @@ public function testCapture() {
             ->shouldReceive('has')
             ->andReturnFalse();
 
-        $cart = Mockery::mock(\WC_Cart::class);
-        $cart
-			->shouldReceive('empty_cart');
-
-        $woocommerce = Mockery::Mock(\Woocommerce::class);
-		$woocommerce
-			->shouldReceive('__get')
-			->with('cart')
-			->set('cart', $cart);
-        when('WC')
-			->justReturn($woocommerce);
-
 		$logger = Mockery::mock(LoggerInterface::class);
 
-
 		$testee = new OrderProcessor(
             $sessionHandler,
             $orderEndpoint,
@@ -260,15 +234,6 @@ public function testCapture() {
             $this->environment
         );
 
-        $cart = Mockery::mock(\WC_Cart::class);
-        $cart
-            ->expects('empty_cart');
-        $woocommerce = Mockery::mock(\WooCommerce::class);
-        $woocommerce->cart = $cart;
-
-        when('WC')
-			->justReturn($woocommerce);
-
         $wcOrder
             ->expects('update_meta_data')
             ->with(