Merge pull request #23 from payplug/qa-4-1

Release 4.1.1

Author: dan-payplug

src/Resources/public/js/app/components/payplug-transition-button-component.js

@@ -42,22 +42,24 @@ define(function(require) {
          * @inheritDoc
          */
         beforeTransit: function(eventData) {
-            if (this.options.maxAmount <= (this.options.totalValue * 100)) {
-                eventData.stopped = true;
+            if (~eventData.data.paymentMethod.indexOf("payplug")) {
+                if (this.options.maxAmount <= (this.options.totalValue * 100)) {
+                    eventData.stopped = true;
 
-                messenger.notificationFlashMessage(
-                    'warning',
-                    __('synolia.frontend.payment_method.checkout.payplug.maximum_amount.label')
-                );
-            }
+                    messenger.notificationFlashMessage(
+                        'warning',
+                        __('synolia.frontend.payment_method.checkout.payplug.maximum_amount.label')
+                    );
+                }
 
-            if (this.options.minAmount >= (this.options.totalValue * 100)) {
-                eventData.stopped = true;
+                if (this.options.minAmount >= (this.options.totalValue * 100)) {
+                    eventData.stopped = true;
 
-                messenger.notificationFlashMessage(
-                    'warning',
-                    __('synolia.frontend.payment_method.checkout.payplug.minimum_amount.label')
-                );
+                    messenger.notificationFlashMessage(
+                        'warning',
+                        __('synolia.frontend.payment_method.checkout.payplug.minimum_amount.label')
+                    );
+                }
             }
         },
     });

src/Service/Gateway.php

@@ -30,6 +30,8 @@ class Gateway
 {
     const FIRST_NAME_LAST_NAME_MAX_LENGTH = 100;
     const USER_AGENT_PRODUCT_NAME = 'PayPlug-OroCommerce';
+    const USER_AGENT_OROCOMMERCE_VERSION_PREFIX = 'OroCommerce/';
+    const PAYPLUG_MODULE_COMPOSER_NAME = 'payplug/payplug-orocommerce';
 
     /**
      * @var DoctrineHelper
@@ -140,6 +142,7 @@ public function treatNotify(PayplugConfigInterface $config): IVerifiableAPIResou
     public function createPayment(PaymentTransaction $paymentTransaction, PayplugConfigInterface $config)
     {
         $payplugClient = $this->initPayplugClientAndSetDebugModeForLogger($config);
+        $routerContext = $this->router->getContext();
 
         $this->logger->debug(__METHOD__ . ' BEGIN');
 
@@ -149,7 +152,12 @@ public function createPayment(PaymentTransaction $paymentTransaction, PayplugCon
             'shipping' => $this->getAddressValues(AddressType::TYPE_SHIPPING, $paymentTransaction),
             'billing' => $this->getAddressValues(AddressType::TYPE_BILLING, $paymentTransaction),
             'hosted_payment' => $this->getCallbackUrls($paymentTransaction),
-            'notification_url' => $this->getNotificationUrl($paymentTransaction)
+            'notification_url' => $this->getNotificationUrl($paymentTransaction),
+            'metadata' => [
+                'order_id' => $paymentTransaction->getEntityIdentifier(),
+                'customer_id' => $paymentTransaction->getFrontendOwner()->getId(),
+                'website' => sprintf('%s://%s', $routerContext->getScheme(), $routerContext->getHost()),
+            ]
         ];
 
         $this->logger->debug('Payment::create from data ' . $this->logger->anonymizeAndJsonEncodeArray($data));
@@ -179,11 +187,21 @@ public function refundPayment(
 
         $this->logger->debug(__METHOD__ . ' BEGIN');
         $amountToRefund = (int) round($amount * 100);
+        $routerContext = $this->router->getContext();
 
         $refund = null;
 
+        $data = [
+            'amount'   => $amountToRefund,
+            'metadata' => [
+                'order_id' => $paymentTransaction->getEntityIdentifier(),
+                'customer_id' => $paymentTransaction->getFrontendOwner()->getId(),
+                'website' => sprintf('%s://%s', $routerContext->getScheme(), $routerContext->getHost()),
+            ]
+        ];
+
         try {
-            $refund = Refund::create($paymentTransaction->getReference(), ['amount' => $amountToRefund], $payplugClient);
+            $refund = Refund::create($paymentTransaction->getReference(), $data, $payplugClient);
         } catch (PayplugException $exception) {
             $this->logger->debug($exception->getHttpResponse());
             throw new \Exception('Refund action cannot be performed');
@@ -214,7 +232,8 @@ protected function initPayplugClientAndSetDebugModeForLogger(PayplugConfigInterf
 
         HttpClient::addDefaultUserAgentProduct(
             self::USER_AGENT_PRODUCT_NAME,
-            $this->versionHelper->getVersion()
+            $this->versionHelper->getVersion(self::PAYPLUG_MODULE_COMPOSER_NAME),
+            self::USER_AGENT_OROCOMMERCE_VERSION_PREFIX . $this->versionHelper->getVersion()
         );
 
         return $client;