Add plugin version to additionalDescription, payu rules default checked

PayU-EMEA · Nov 28, 2017 · 6ecbfee · 6ecbfee
1 parent 5b023fb
commit 6ecbfee
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/app/code/PayU/PaymentGateway/Api/PayUConfigInterface.php b/app/code/PayU/PaymentGateway/Api/PayUConfigInterface.php
@@ -238,4 +238,12 @@ public function getPaymentMethodsOrder();
      * @return bool
      */
     public function isCrediCardCurrencyRates();
+
+    /**
+     * Get plugin version
+     *
+     * @return string
+     */
+    public function getPluginVersion();
+
 }
diff --git a/app/code/PayU/PaymentGateway/Model/Config.php b/app/code/PayU/PaymentGateway/Model/Config.php
@@ -25,7 +25,7 @@ class Config implements PayUConfigInterface
     /**
      * Current Plugin Version
      */
-    const PLUGIN_VERSION = '1.0';
+    const PLUGIN_VERSION = '1.0.1';
 
     /**
      * @var \OpenPayU_Configuration
@@ -184,6 +184,14 @@ public function isCrediCardCurrencyRates()
         return (bool)$this->gatewayConfig->getValue('currency_rates', $this->storeId);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPluginVersion()
+    {
+        return static::PLUGIN_VERSION;
+    }
+
     /**
      * Check if selected pay method is enable
      *

diff --git a/app/code/PayU/PaymentGateway/Model/CreateOrderResolver.php b/app/code/PayU/PaymentGateway/Model/CreateOrderResolver.php
@@ -2,6 +2,7 @@
 
 namespace PayU\PaymentGateway\Model;
 
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
@@ -52,6 +53,11 @@ class CreateOrderResolver implements CreateOrderResolverInterface
      */
     private $order;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $metadata;
+
     /**
      * @var PayUGetMultiCurrencyPricingInterface
      */
@@ -84,6 +90,7 @@ class CreateOrderResolver implements CreateOrderResolverInterface
      * @param PayUMcpExchangeRateResolverInterface $exchangeRateResolver
      * @param PayUConfigInterface $payUConfig
      * @param StoreManagerInterface $storeManager
+     * @param ProductMetadataInterface $metadata
      */
     public function __construct(
         UrlInterface $urlBuilder,
@@ -94,7 +101,8 @@ public function __construct(
         PayUGetMultiCurrencyPricingInterface $currencyPricing,
         PayUMcpExchangeRateResolverInterface $exchangeRateResolver,
         PayUConfigInterface $payUConfig,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        ProductMetadataInterface $metadata
     ) {
         $this->urlBuilder = $urlBuilder;
         $this->availableLocale = $availableLocale;
@@ -105,6 +113,7 @@ public function __construct(
         $this->exchangeRateResolver = $exchangeRateResolver;
         $this->payUConfig = $payUConfig;
         $this->store = $storeManager->getStore();
+        $this->metadata = $metadata;
     }
 
     /**
@@ -122,6 +131,7 @@ public function resolve(
         $paymentData = [
             'txn_type' => 'A',
             'description' => $this->getOrderDescription(),
+            'additionalDescription' => $this->getAdditionalDescription(),
             'customerIp' => $this->order->getRemoteIp(),
             'extOrderId' => $this->getExtOrderId(),
             'totalAmount' => $this->getFormatAmount($this->order->getGrandTotalAmount()),
@@ -156,6 +166,16 @@ private function getOrderDescription()
         return __('Order %1 from store %2', $this->order->getOrderIncrementId(), $this->urlBuilder->getBaseUrl());
     }
 
+    /**
+     * Get additional description for order
+     *
+     * @return string
+     */
+    private function getAdditionalDescription()
+    {
+        return 'Magento 2 ver ' . $this->metadata->getVersion() . ' / Plugin ver ' . $this->payUConfig->getPluginVersion();
+    }
+
     /**
      * @return array
      */

diff --git a/...ode/PayU/PaymentGateway/view/frontend/web/js/view/payment/method-renderer/payu_gateway.js b/...ode/PayU/PaymentGateway/view/frontend/web/js/view/payment/method-renderer/payu_gateway.js
@@ -26,7 +26,7 @@ define(
                         locale: window.checkoutConfig.payment.payuGateway.locale,
                         methods: toArray(JSON.parse(window.checkoutConfig.payment.payuGateway.payByLinks)),
                         payuMethod: ko.observable(false),
-                        payuAgreement: ko.observable(false),
+                        payuAgreement: ko.observable(true),
                         agreementText: $t('You must accept the "Terms of a single PayU payment transaction"'),
                         enabledStatus: 'ENABLED'
                     },