Merge branch 'master' of https://github.com/ratepay/magento2-module

ratepay · Nov 2, 2021 · 9aea22d · 9aea22d
2 parents 30ce4b9 + b249625
commit 9aea22d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 11 deletions.
diff --git a/Model/Api/SendConfirmationDeliver.php b/Model/Api/SendConfirmationDeliver.php
@@ -144,7 +144,7 @@ public function sendRatepayDeliverCall($order, $paymentMethod, $inv = null)
             $inv = $order;
         }
 
-        $sandbox = (bool)$this->rpDataHelper->getRpConfigData($paymentMethod, 'sandbox', $this->storeManager->getStore()->getId());
+        $sandbox = (bool)$this->rpDataHelper->getRpConfigData($paymentMethod, 'sandbox', $order->getStore()->getId());
         $head = $this->rpLibraryModel->getRequestHead($order, 'CONFIRMATION_DELIVER', null, null, null, null, $this->getTrackingInfo($order));
         $content = $this->rpLibraryModel->getRequestContent($inv, 'CONFIRMATION_DELIVER');
 

diff --git a/Model/Handler/Refund.php b/Model/Handler/Refund.php
@@ -90,7 +90,7 @@ protected function addAdjustmentsToDb($order, $creditMemo)
         if ($creditMemo->getAdjustmentPositive() > 0) {
             $this->artNumRefund = 'adj-ref'.$this->orderAdjustment->getNextArticleNumberCounter($order->getId(), 'positive');
             $is_specialitem = false;
-            if ($this->rpDataHelper->getRpConfigData('ratepay_general', 'creditmemo_discount_type') == CreditmemoDiscountType::SPECIAL_ITEM) {
+            if ($this->rpDataHelper->getRpConfigData('ratepay_general', 'creditmemo_discount_type', $order->getStore()->getId()) == CreditmemoDiscountType::SPECIAL_ITEM) {
                 $is_specialitem = true;
             }
             $this->orderAdjustment->addOrderAdjustment($order->getId(), 'positive', $this->artNumRefund, $creditMemo->getAdjustmentPositive(), $creditMemo->getBaseAdjustmentPositive(), $is_specialitem);

diff --git a/Model/LibraryModel.php b/Model/LibraryModel.php
@@ -69,7 +69,7 @@ public function addAdjustments($creditmemo, $artNumRefund, $artNumFee)
         $content = [];
 
         if ($creditmemo->getAdjustmentPositive() > 0) {
-            if ($this->rpDataHelper->getRpConfigData('ratepay_general', 'creditmemo_discount_type') == CreditmemoDiscountType::SPECIAL_ITEM) {
+            if ($this->rpDataHelper->getRpConfigData('ratepay_general', 'creditmemo_discount_type', $creditmemo->getOrder()->getStore()->getId()) == CreditmemoDiscountType::SPECIAL_ITEM) {
                 $content['Discount'] = $this->rpContentBasketDiscountHelper->setDiscount((float) $creditmemo->getAdjustmentPositive() * -1, 'Adjustment Refund');
             } else {
                 $content['Items'][] = ['Item' => $this->addAdjustment((float) $creditmemo->getAdjustmentPositive() * -1, 'Adjustment Refund', $artNumRefund)];

diff --git a/Model/Method/AbstractMethod.php b/Model/Method/AbstractMethod.php
@@ -252,18 +252,18 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
         $order = $this->getQuoteOrOrder();
 
         $head = $this->_rpLibraryModel->getRequestHead($order);
-        $sandbox = (bool)$this->rpDataHelper->getRpConfigData($this->_code, 'sandbox');
+        $sandbox = (bool)$this->rpDataHelper->getRpConfigData($this->_code, 'sandbox', $order->getStore()->getId());
         $company = $order->getBillingAddress()->getCompany();
 
-        if (!$this->rpDataHelper->getRpConfigData($this->_code, 'b2b') && !empty($company)) {
+        if (!$this->rpDataHelper->getRpConfigData($this->_code, 'b2b', $order->getStore()->getId()) && !empty($company)) {
             throw new PaymentException(__('b2b not allowed'));
         }
 
         $billingAddress = $order->getBillingAddress();
         $shippingAddress = $order->getShippingAddress();
         $diff = array_diff($this->rpDataHelper->getImportantAddressData($shippingAddress), $this->rpDataHelper->getImportantAddressData($billingAddress));
 
-        if (!$this->rpDataHelper->getRpConfigData($this->_code, 'delivery_address') && count($diff)) {
+        if (!$this->rpDataHelper->getRpConfigData($this->_code, 'delivery_address', $order->getStore()->getId()) && count($diff)) {
             throw new PaymentException(__('ala not allowed'));
         }
 
@@ -446,8 +446,8 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
         $minAmount = $this->rpDataHelper->getRpConfigDataForQuote($this->_code, 'min_order_total', $quote);
         $maxAmount = $this->rpDataHelper->getRpConfigDataForQuote($this->_code, 'max_order_total', $quote);
 
-        if (!empty($quote->getBillingAddress()->getCompany()) && $this->getIsB2BModeEnabled($totalAmount)) {
-            $maxAmount = $this->rpDataHelper->getRpConfigData($this->_code, 'limit_max_b2b');
+        if (!empty($quote->getBillingAddress()->getCompany()) && $this->getIsB2BModeEnabled($totalAmount, $quote)) {
+            $maxAmount = $this->rpDataHelper->getRpConfigDataForQuote($this->_code, 'limit_max_b2b', $quote);
         }
 
         if ($totalAmount < $minAmount || $totalAmount > $maxAmount) {
@@ -598,10 +598,10 @@ public function formatMessage($message)
         return strip_tags($message);
     }
 
-    public function getIsB2BModeEnabled($grandTotal = null)
+    public function getIsB2BModeEnabled($grandTotal = null, $quote = null)
     {
-        $blB2BEnabled = (bool)$this->rpDataHelper->getRpConfigData($this->_code, 'b2b');
-        $dB2BMax = $this->rpDataHelper->getRpConfigData($this->_code, 'limit_max_b2b');
+        $blB2BEnabled = (bool)$this->rpDataHelper->getRpConfigDataForQuote($this->_code, 'b2b', $quote);
+        $dB2BMax = $this->rpDataHelper->getRpConfigDataForQuote($this->_code, 'limit_max_b2b', $quote);
         if ($blB2BEnabled === true && ($grandTotal === null || ($grandTotal <= $dB2BMax))) {
             return true;
         }

diff --git a/Plugin/EscapeRenderer.php b/Plugin/EscapeRenderer.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace RatePAY\Payment\Plugin;
+
+use Magento\Framework\View\Element\Message\Renderer\EscapeRenderer as OrigEscapeRenderer;
+use Magento\Framework\Message\MessageInterface;
+
+class EscapeRenderer
+{
+    /**
+     * Renders complex message
+     *
+     * @param OrigEscapeRenderer $subject
+     * @param \Closure $proceed
+     * @param MessageInterface $message
+     * @param array $initializationData
+     * @return string
+     */
+    public function aroundRender(OrigEscapeRenderer $subject, \Closure $proceed, MessageInterface $message, array $initializationData)
+    {
+        $text = $message->getText();
+        if (stripos($text, "Ratepay") !== false && stripos($text, "href") !== false) {
+            return $text;
+        }
+        return $proceed($message, $initializationData);
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
@@ -53,4 +53,7 @@
     <type name="Magento\Payment\Model\Checks\TotalMinMax">
         <plugin name="RatePAY_Payment_Plugin_TotalMixMax" type="RatePAY\Payment\Plugin\TotalMinMax" sortOrder="10" />
     </type>
+    <type name="Magento\Framework\View\Element\Message\Renderer\EscapeRenderer">
+        <plugin name="RatePAY_Payment_Plugin_EscapeRenderer" type="RatePAY\Payment\Plugin\EscapeRenderer" sortOrder="10" />
+    </type>
 </config>