Merge pull request #112 from payplug/qa

1.18.0

Author: dan-payplug

Block/OneyInfo.php

@@ -5,6 +5,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Model\Order;
 use Payplug\Exception\PayplugException;
+use Payplug\Payments\Gateway\Config\OneyWithoutFees;
 use Payplug\Payments\Helper\Data;
 use Payplug\Payments\Helper\Oney;
 use Payplug\Payments\Logger\Logger;
@@ -36,8 +37,13 @@ protected function buildPaymentDetails($payment, $order)
         $paymentDetails['Status'] = $status;
 
         $oneyOption = str_replace('oney_', '', $payment->payment_method['type']);
-        if (isset(Oney::ALLOWED_OPERATIONS_BY_PAYMENT[$order->getPayment()->getMethod()][$oneyOption])) {
-            $paymentDetails['Oney option'] = __('Payment in %1', Oney::ALLOWED_OPERATIONS_BY_PAYMENT[$order->getPayment()->getMethod()][$oneyOption]);
+        $paymentMethod = $order->getPayment()->getMethod();
+        if (isset(Oney::ALLOWED_OPERATIONS_BY_PAYMENT[$paymentMethod][$oneyOption])) {
+            $key = 'Payment in %1';
+            if ($paymentMethod === OneyWithoutFees::METHOD_CODE) {
+                $key = 'Payment in %1 without fees';
+            }
+            $paymentDetails['Oney option'] = __($key, Oney::ALLOWED_OPERATIONS_BY_PAYMENT[$paymentMethod][$oneyOption]);
         }
 
         return $paymentDetails;

Gateway/Config/OneyWithoutFees.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Payplug\Payments\Gateway\Config;
+
+class OneyWithoutFees extends PayplugPayment
+{
+    const METHOD_CODE = 'payplug_payments_oney_without_fees';
+}

Helper/Config.php

@@ -20,7 +20,7 @@ class Config extends AbstractHelper
     const PAYMENT_PAGE_REDIRECT = 'redirect';
     const PAYMENT_PAGE_EMBEDDED = 'embedded';
 
-    const MODULE_VERSION = '1.17.0';
+    const MODULE_VERSION = '1.18.0';
 
     /**
      * @var WriterInterface

Helper/Data.php

@@ -24,6 +24,7 @@
 use Payplug\Payments\Gateway\Config\InstallmentPlan;
 use Payplug\Payments\Gateway\Config\Ondemand;
 use Payplug\Payments\Gateway\Config\Oney;
+use Payplug\Payments\Gateway\Config\OneyWithoutFees;
 use Payplug\Payments\Gateway\Config\Standard;
 use Payplug\Payments\Model\Order\Payment;
 use Payplug\Payments\Model\Order\Processing;
@@ -290,6 +291,9 @@ public function canUpdatePayment($order)
             Oney::METHOD_CODE => [
                 Order::STATE_PAYMENT_REVIEW
             ],
+            OneyWithoutFees::METHOD_CODE => [
+                Order::STATE_PAYMENT_REVIEW
+            ],
         ];
         if (!in_array($order->getState(), $allowedStates[$order->getPayment()->getMethod()])) {
             return false;
@@ -406,7 +410,7 @@ public function isOrderValidated($order)
         }
 
         // If Oney payment is still being reviewed, order is validated but still in Payment Review state
-        if ($order->getPayment()->getMethod() == Oney::METHOD_CODE && $order->getState() == Order::STATE_PAYMENT_REVIEW) {
+        if (($order->getPayment()->getMethod() == Oney::METHOD_CODE || $order->getPayment()->getMethod() == OneyWithoutFees::METHOD_CODE) && $order->getState() == Order::STATE_PAYMENT_REVIEW) {
             return true;
         }
 
@@ -531,7 +535,8 @@ public function isCodePayplugPayment($code)
         return $code == Standard::METHOD_CODE ||
             $code == \Payplug\Payments\Gateway\Config\InstallmentPlan::METHOD_CODE ||
             $code == Ondemand::METHOD_CODE ||
-            $code == Oney::METHOD_CODE;
+            $code == Oney::METHOD_CODE ||
+            $code == OneyWithoutFees::METHOD_CODE;
     }
 
     /**

Helper/Oney.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Pricing\Helper\Data as PricingHelper;
 use Payplug\Exception\PayplugException;
 use Payplug\OneySimulation;
+use Payplug\Payments\Gateway\Config\OneyWithoutFees;
 use Payplug\Payments\Logger\Logger;
 use Payplug\Payments\Model\OneySimulation\Option;
 use Payplug\Payments\Model\OneySimulation\Result;
@@ -27,6 +28,10 @@ class Oney extends AbstractHelper
             'x3_with_fees' => '3x',
             'x4_with_fees' => '4x',
         ],
+        \Payplug\Payments\Gateway\Config\OneyWithoutFees::METHOD_CODE => [
+            'x3_without_fees' => '3x',
+            'x4_without_fees' => '4x',
+        ],
     ];
 
     const MAX_ITEMS = 1000;
@@ -71,6 +76,16 @@ class Oney extends AbstractHelper
      */
     private $customerSession;
 
+    /**
+     * @var \Magento\Payment\Helper\Data
+     */
+    private $paymentHelper;
+
+    /**
+     * @var string
+     */
+    private $oneyMethod;
+
     /**
      * @param Context               $context
      * @param Config                $payplugConfig
@@ -81,6 +96,7 @@ class Oney extends AbstractHelper
      * @param Logger                $logger
      * @param CheckoutSession       $checkoutSession
      * @param CustomerSession       $customerSession
+     * @param \Magento\Payment\Helper\Data $paymentHelper
      */
     public function __construct(
         Context $context,
@@ -91,7 +107,8 @@ public function __construct(
         Resolver $localeResolver,
         Logger $logger,
         CheckoutSession $checkoutSession,
-        CustomerSession $customerSession
+        CustomerSession $customerSession,
+        \Magento\Payment\Helper\Data $paymentHelper
     ) {
         parent::__construct($context);
 
@@ -103,6 +120,7 @@ public function __construct(
         $this->logger = $logger;
         $this->checkoutSession = $checkoutSession;
         $this->customerSession = $customerSession;
+        $this->paymentHelper = $paymentHelper;
     }
 
     /**
@@ -118,7 +136,12 @@ public function canDisplayOney(): bool
             return false;
         }
 
-        $isActive = $this->scopeConfig->getValue('payment/payplug_payments_oney/active', ScopeInterface::SCOPE_STORE, $storeId);
+        $oneyPaymentMethod = $this->getOneyMethod();
+        if ($oneyPaymentMethod === '') {
+            return false;
+        }
+
+        $isActive = $this->scopeConfig->getValue('payment/' . $oneyPaymentMethod . '/active', ScopeInterface::SCOPE_STORE, $storeId);
         if (!$isActive) {
             return false;
         }
@@ -179,18 +202,22 @@ public function getOneyAmounts($storeId = null, $currency = null)
 
     /**
      * @param string $countryCode
+     * @param bool   $throwException
      *
      * @return bool
      *
      * @throws \Exception
      */
-    private function validateCountry($countryCode): bool
+    private function validateCountry($countryCode, $throwException = true): bool
     {
         $storeId = $this->storeManager->getStore()->getId();
         $oneyCountries = $this->scopeConfig->getValue(Config::CONFIG_PATH . 'oney_countries', ScopeInterface::SCOPE_STORE, $storeId);
         $oneyCountries = json_decode($oneyCountries, true);
 
         if (!in_array($countryCode, $oneyCountries)) {
+            if (!$throwException) {
+                return false;
+            }
             $countryNames = [];
             $locale = $this->localeResolver->getLocale();
             foreach ($oneyCountries as $oneyCountryCode) {
@@ -318,6 +345,9 @@ private function validateCheckoutCountries($billingCountry, $shippingCountry)
         if (!empty($billingCountry) && !empty($shippingCountry) && $billingCountry !== $shippingCountry) {
             throw new \Exception(__('Shipping and billing adresses must be both in the same country.'));
         }
+        if (!$this->validateCountry($billingCountry, false)) {
+            throw new \Exception(__('Unavailable for the specified country'));
+        }
     }
 
     /**
@@ -409,6 +439,7 @@ public function getOneySimulation($amount = null, $countryCode = null, $qty = nu
             if ($validationOnly) {
                 $simulationResult = new Result();
                 $simulationResult->setSuccess(true);
+                $simulationResult->setMethod($paymentMethod);
 
                 return $simulationResult;
             } else {
@@ -422,6 +453,7 @@ public function getOneySimulation($amount = null, $countryCode = null, $qty = nu
             $simulationResult = new Result();
             $simulationResult->setSuccess(false);
             $simulationResult->setMessage($e->getMessage());
+            $simulationResult->setMethod($paymentMethod);
 
             return $simulationResult;
         }
@@ -437,6 +469,7 @@ private function getMockSimulationResult($paymentMethod)
         $simulationResult = new Result();
         $simulationResult->setSuccess(true);
         $simulationResult->setMessage(__('Your payment schedule simulation is temporarily unavailable. You will find this information at the payment stage.'));
+        $simulationResult->setMethod($paymentMethod);
 
         $operations = self::ALLOWED_OPERATIONS_BY_PAYMENT[$paymentMethod] ?? [];
 
@@ -474,6 +507,7 @@ private function getSimulation($amount, $countryCode, $paymentMethod): Result
         $result = new Result();
         $result->setSuccess(true);
         $result->setAmount($amount);
+        $result->setMethod($paymentMethod);
 
         foreach ($operations as $operation => $type) {
             if (!isset($simulations[$operation])) {
@@ -511,8 +545,22 @@ private function getSimulation($amount, $countryCode, $paymentMethod): Result
     /**
      * @return string
      */
-    public function getOneyMethod()
+    private function getOneyMethod()
     {
-        return \Payplug\Payments\Gateway\Config\Oney::METHOD_CODE;
+        if ($this->oneyMethod === null) {
+            $oneyMethods = [
+                \Payplug\Payments\Gateway\Config\Oney::METHOD_CODE,
+                OneyWithoutFees::METHOD_CODE,
+            ];
+            $this->oneyMethod = '';
+            foreach ($oneyMethods as $oneyMethod) {
+                if ($this->paymentHelper->getMethodInstance($oneyMethod)->isAvailable()) {
+                    $this->oneyMethod = $oneyMethod;
+                    break;
+                }
+            }
+        }
+
+        return $this->oneyMethod;
     }
 }

Model/OneySimulation/Result.php

@@ -10,6 +10,7 @@ class Result extends DataObject
     const KEY_MESSAGE = 'message';
     const KEY_OPTIONS = 'options';
     const KEY_AMOUNT = 'amount';
+    const KEY_METHOD = 'method';
 
     /**
      * @return bool|null
@@ -88,4 +89,22 @@ public function setAmount($amount): self
     {
         return $this->setData(self::KEY_AMOUNT, $amount);
     }
+
+    /**
+     * @return string|null
+     */
+    public function getMethod()
+    {
+        return $this->_getData(self::KEY_METHOD);
+    }
+
+    /**
+     * @param string|null $method
+     *
+     * @return $this
+     */
+    public function setMethod($method): self
+    {
+        return $this->setData(self::KEY_METHOD, $method);
+    }
 }

Model/Payment/OneyWithoutFees/ConfigProvider.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Payplug\Payments\Model\Payment\OneyWithoutFees;
+
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Payment\Model\MethodInterface;
+use Payplug\Payments\Gateway\Config\OneyWithoutFees;
+
+class ConfigProvider implements ConfigProviderInterface
+{
+    /**
+     * @var string
+     */
+    private $methodCode = OneyWithoutFees::METHOD_CODE;
+
+    /**
+     * @var MethodInterface
+     */
+    private $method;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Repository           $assetRepo
+     * @param RequestInterface     $request
+     * @param PaymentHelper        $paymentHelper
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Repository $assetRepo,
+        RequestInterface $request,
+        PaymentHelper $paymentHelper
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->assetRepo = $assetRepo;
+        $this->request = $request;
+        $this->method = $paymentHelper->getMethodInstance($this->methodCode);
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->method->isAvailable() ? [
+            'payment' => [
+                $this->methodCode => [
+                    'logo' => $this->getViewFileUrl('Payplug_Payments::images/oney_without_fees/3x4x.svg'),
+                    'logo_ko' => $this->getViewFileUrl('Payplug_Payments::images/oney_without_fees/3x4x-alt.svg'),
+                ],
+            ],
+        ] : [];
+    }
+
+    /**
+     * Retrieve url of a view file
+     *
+     * @param string $fileId
+     * @param array  $params
+     *
+     * @return string
+     */
+    private function getViewFileUrl($fileId, array $params = [])
+    {
+        try {
+            $params = array_merge(['_secure' => $this->request->isSecure()], $params);
+            return $this->assetRepo->getUrlWithParams($fileId, $params);
+        } catch (LocalizedException $e) {
+            return null;
+        }
+    }
+}

Observer/CreditMemoCheckRefundedAmountObserver.php

@@ -11,6 +11,7 @@
 use Magento\Sales\Model\OrderRepository;
 use Payplug\Exception\PayplugException;
 use Payplug\Payments\Gateway\Config\Oney;
+use Payplug\Payments\Gateway\Config\OneyWithoutFees;
 use Payplug\Payments\Helper\Data;
 use Payplug\Payments\Logger\Logger;
 
@@ -78,7 +79,7 @@ public function execute(EventObserver $observer)
             $payplugPayment = $this->helper->getOrderPayment($order->getIncrementId());
             $payment = $payplugPayment->retrieve($order->getStoreId());
 
-            if ($order->getPayment()->getMethod() === Oney::METHOD_CODE) {
+            if ($order->getPayment()->getMethod() === Oney::METHOD_CODE || $order->getPayment()->getMethod() === OneyWithoutFees::METHOD_CODE) {
                 if (time() < $payment->refundable_after) {
                     $this->messageManager->addErrorMessage(
                         __('The refund will be possible 48 hours after the last payment or refund transaction.')