STRIPE-37: Stripe Split Order Payment (#33943)

- Implemented CI fixes
oroinc · Oct 5, 2022 · 5d36c1e · 5d36c1e
1 parent 932fdf9
commit 5d36c1e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 17 deletions.
diff --git a/src/Oro/Bundle/StripeBundle/Command/ReAuthorizeCronCommand.php b/src/Oro/Bundle/StripeBundle/Command/ReAuthorizeCronCommand.php
@@ -46,7 +46,8 @@ protected function configure()
         $this->setDescription('Cancels expiring Stripe authorization holds and places new ones instead.')
             ->setHelp(
                 <<<'HELP'
-The <info>%command.name%</info> command cancels expiring Stripe authorization holds and places new ones instead (payment card authorizations expire in Stripe after 7 days by default).
+The <info>%command.name%</info> command cancels expiring Stripe authorization holds and places new ones instead 
+(payment card authorizations expire in Stripe after 7 days by default).
 
   <info>php %command.full_name%</info>
 

diff --git a/src/Oro/Bundle/StripeBundle/EventListener/StripePaymentCallBackListener.php b/src/Oro/Bundle/StripeBundle/EventListener/StripePaymentCallBackListener.php
@@ -41,6 +41,10 @@ public function setLogger(LoggerInterface $logger): void
         $this->logger = $logger;
     }
 
+    /**
+     * @param AbstractCallbackEvent $event
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
     public function onReturn(AbstractCallbackEvent $event)
     {
         $paymentTransaction = $event->getPaymentTransaction();

diff --git a/src/Oro/Bundle/StripeBundle/Handler/ReAuthorizationHandler.php b/src/Oro/Bundle/StripeBundle/Handler/ReAuthorizationHandler.php
@@ -52,7 +52,7 @@ public function reAuthorize(): void
         /** @var StripePaymentConfig[] $configs */
         $configs = array_filter(
             (array)$this->paymentConfigsProvider->getConfigs(),
-            static fn(StripePaymentConfig $paymentConfig) => $paymentConfig->isReAuthorizationAllowed()
+            static fn (StripePaymentConfig $paymentConfig) => $paymentConfig->isReAuthorizationAllowed()
         );
 
         if (empty($configs)) {

diff --git a/src/Oro/Bundle/StripeBundle/Resources/public/js/app/components/stripe-payment-component.js b/src/Oro/Bundle/StripeBundle/Resources/public/js/app/components/stripe-payment-component.js
@@ -48,7 +48,7 @@ define(function(require) {
                         // Handle additional user actions (3D secure validation, etc.. )
                         const self = this;
 
-                        const intentErrorHandler = function () {
+                        const intentErrorHandler = function(result) {
                             mediator.execute(
                                 'showFlashMessage',
                                 'error',
@@ -61,7 +61,7 @@ define(function(require) {
                             );
                         };
 
-                        const exceptionHandler = function (error) {
+                        const exceptionHandler = function(error) {
                             console.log(error);
                             mediator.execute(
                                 'showFlashMessage',
@@ -73,27 +73,27 @@ define(function(require) {
                         const stripe = stripeClient.getStripeInstance(this.options);
                         if (_.has(response, 'payment_intent_client_secret')) {
                             stripe.handleCardAction(response.payment_intent_client_secret)
-                                .then(function (result) {
+                                .then(function(result) {
                                     if (result.error) {
-                                        intentErrorHandler();
+                                        intentErrorHandler(result);
                                     } else if (result.hasOwnProperty('paymentIntent')) {
-                                        const paymentIntentId = result.paymentIntent.id;
+                                        const intentId = result.paymentIntent.id;
                                         mediator.execute(
                                             'redirectTo',
-                                            {url: eventData.responseData.returnUrl + '?paymentIntentId=' + paymentIntentId},
+                                            {url: eventData.responseData.returnUrl + '?paymentIntentId=' + intentId},
                                             {redirect: true}
                                         );
                                     }
                                 })
                                 .catch(exceptionHandler)
-                                .always(function () {
+                                .always(function() {
                                     mediator.execute('hideLoading');
                                 });
                         } else if (_.has(response, 'setup_intent_client_secret')) {
                             stripe.confirmCardSetup(response.setup_intent_client_secret)
-                                .then(function (result) {
+                                .then(function(result) {
                                     if (result.error) {
-                                        intentErrorHandler();
+                                        intentErrorHandler(result);
                                     } else if (result.hasOwnProperty('setupIntent')) {
                                         const setupIntentId = result.setupIntent.id;
                                         mediator.execute(
@@ -104,12 +104,16 @@ define(function(require) {
                                     }
                                 })
                                 .catch(exceptionHandler)
-                                .always(function () {
+                                .always(function() {
                                     mediator.execute('hideLoading');
                                 });
                         }
                     } else if (_.has(eventData.responseData, 'partiallyPaidUrl')) {
-                        mediator.execute('redirectTo', {url: eventData.responseData.partiallyPaidUrl}, {redirect: true});
+                        mediator.execute(
+                            'redirectTo',
+                            {url: eventData.responseData.partiallyPaidUrl},
+                            {redirect: true}
+                        );
                     } else {
                         mediator.execute('redirectTo', {url: eventData.responseData.errorUrl}, {redirect: true});
                     }

diff --git a/src/Oro/Bundle/StripeBundle/Tests/Behat/Mock/Client/StripeGatewayMock.php b/src/Oro/Bundle/StripeBundle/Tests/Behat/Mock/Client/StripeGatewayMock.php
@@ -110,7 +110,7 @@ private function createSetupIntentObject()
     private function getStatus(string $card): string
     {
         return match ($card) {
-        self::NO_AUTH_CARD => 'succeeded',
+            self::NO_AUTH_CARD => 'succeeded',
             self::AUTH_CARD => 'requires_action',
             self::ERROR_CARD => 'error',
         };

diff --git a/src/Oro/Bundle/StripeBundle/Tests/Functional/DataFixtures/LoadPaymentTransactions.php b/src/Oro/Bundle/StripeBundle/Tests/Functional/DataFixtures/LoadPaymentTransactions.php
@@ -88,7 +88,9 @@ class LoadPaymentTransactions extends AbstractFixture implements ContainerAwareI
 
     public function load(ObjectManager $manager): void
     {
-        $transactionExpireHours = $this->container->getParameter('oro_stripe.authorization_transaction_expiration_hours');
+        $transactionExpireHours = $this->container
+            ->getParameter('oro_stripe.authorization_transaction_expiration_hours');
+
         $expireDate = (new \DateTime('now', new \DateTimeZone('UTC')))
             ->modify(sprintf('-%d hour', $transactionExpireHours + 1));
 

diff --git a/src/Oro/Bundle/StripeBundle/Tests/Unit/Client/StripeGatewayTest.php b/src/Oro/Bundle/StripeBundle/Tests/Unit/Client/StripeGatewayTest.php
@@ -38,6 +38,9 @@
 use Stripe\SetupIntent;
 use Stripe\StripeClient;
 
+/**
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ */
 class StripeGatewayTest extends TestCase
 {
     use SetReflectionPropertyTrait;

diff --git a/src/Oro/Bundle/StripeBundle/Tests/Unit/Model/SetupIntentResponseTest.php b/src/Oro/Bundle/StripeBundle/Tests/Unit/Model/SetupIntentResponseTest.php
@@ -31,6 +31,10 @@ public function testResponseObject(
         $this->assertEquals($expected, $responseData['data']);
     }
 
+    /**
+     * @return \Generator
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function responseDataProvider(): \Generator
     {
         yield [

diff --git a/src/Oro/Bundle/StripeBundle/Tests/Unit/Notification/ReAuthorizeMessageNotificationsTest.php b/src/Oro/Bundle/StripeBundle/Tests/Unit/Notification/ReAuthorizeMessageNotificationsTest.php
@@ -113,7 +113,11 @@ public function testSendAuthorizationFailed()
         $this->doctrineHelper->expects($this->never())
             ->method('getSingleEntityIdentifier');
 
-        $this->messageNotifications->sendAuthorizationFailed($paymentTransaction, ['[email protected]']);
+        $this->messageNotifications->sendAuthorizationFailed(
+            $paymentTransaction,
+            ['[email protected]'],
+            'Payment card declined'
+        );
     }
 
     public function testSendAuthorizationFailedWhenEntityIsNotOrder()
@@ -188,4 +192,4 @@ public function testSendAuthorizationFailedWhenEntityIsNotOrder()
             'Payment card declined'
         );
     }
-}
+}