Merge pull request #71 from moneimagento/hotfix/moneiProjects

Hotfix/monei projects

Block/Info/Monei.php

@@ -15,6 +15,12 @@
 
 class Monei extends Info
 {
+    private const INFO_PAY_ALLOWED = [
+        'last4',
+        'brand',
+        'phoneNumber',
+    ];
+
     /**
      * Monei template
      *
@@ -82,4 +88,9 @@ public function getPaymentTitle()
 
         return null;
     }
+
+    public function getInfoPayAllowed(): array
+    {
+        return self::INFO_PAY_ALLOWED;
+    }
 }

Controller/Payment/Complete.php

@@ -156,7 +156,7 @@ public function execute()
                 $this->orderRepository->save($order);
 
                 // send Order email
-                if ($order->getCanSendNewEmailFlag()) {
+                if ($order->getCanSendNewEmailFlag() && !$order->getEmailSent()) {
                     try {
                         $this->orderSender->send($order);
                     } catch (\Exception $e) {

Observer/SaveOrderBeforeSalesModelQuoteObserver.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Sales\Model\Order;
+use Monei\MoneiPayment\Model\Payment\Monei;
 
 class SaveOrderBeforeSalesModelQuoteObserver implements ObserverInterface
 {
@@ -37,6 +38,10 @@ public function execute(Observer $observer): SaveOrderBeforeSalesModelQuoteObser
 
         $this->objectCopyService->copyFieldsetToTarget('sales_convert_quote', 'to_order', $quote, $order);
 
+        if (in_array($order->getPayment()->getMethod(), Monei::PAYMENT_METHODS_MONEI)) {
+            $order->setCanSendNewEmailFlag(false);
+        }
+
         return $this;
     }
 }

Observer/SaveQuoteSubmitSuccessObserver.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @author Monei Team
+ * @copyright Copyright © Monei (https://monei.com)
+ */
+
+declare(strict_types=1);
+
+namespace Monei\MoneiPayment\Observer;
+
+use Magento\Framework\DataObject\Copy;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order;
+use Monei\MoneiPayment\Model\Payment\Monei;
+
+class SaveQuoteSubmitSuccessObserver implements ObserverInterface
+{
+    /**
+     * @param Observer $observer
+     * @return SaveQuoteSubmitSuccessObserver
+     */
+    public function execute(Observer $observer): SaveQuoteSubmitSuccessObserver
+    {
+        /* @var Order $order */
+        $order = $observer->getEvent()->getData('order');
+
+        if (in_array($order->getPayment()->getMethod(), Monei::PAYMENT_METHODS_MONEI)) {
+            $order->setCanSendNewEmailFlag(true);
+        }
+
+        return $this;
+    }
+}

etc/events.xml

@@ -10,6 +10,9 @@
     <event name="sales_model_service_quote_submit_before">
         <observer name="Monei\MoneiPayment\Observer\SaveOrderBeforeSalesModelQuoteObserver" instance="Monei\MoneiPayment\Observer\SaveOrderBeforeSalesModelQuoteObserver" />
     </event>
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="Monei\MoneiPayment\Observer\SaveQuoteSubmitSuccessObserver" instance="Monei\MoneiPayment\Observer\SaveQuoteSubmitSuccessObserver" />
+    </event>
 <!--  <event name="sales_order_creditmemo_refund">-->
 <!--    <observer name="set_monei_order_status_and_state_after_refund" instance="Monei\MoneiPayment\Observer\SetOrderStatusAfterRefund"/>-->
 <!--  </event>-->

i18n/en_US.csv

@@ -21,3 +21,7 @@
 "%1 should be numeric value","%1 should be numeric value"
 "Refund reason","Refund reason"
 "Pay with Monei","Pay with MONEI"
+"method:","Method:"
+"last4:","Last 4 digits:"
+"brand:","Brand:"
+"phoneNumber:","Phone number:"

i18n/es_ES.csv

@@ -38,3 +38,7 @@
 "Multibanco payment method is not available in your Monei account. Please enable it in your Monei account to use it.","El método de pago de Multibanco no está disponible en su cuenta de Monei. Por favor, habilítelo en su cuenta de Monei para poder usarlo."
 "MBWay payment method is not available in your Monei account. Please enable it in your Monei account to use it.","El método de pago de MBWay no está disponible en su cuenta de Monei. Por favor, habilítelo en su cuenta de Monei para poder usarlo."
 "(Test Mode)","(Modo de Prueba)"
+"method:","Método:"
+"last4:","Últimos 4 digitos:"
+"brand:","Tipo:"
+"phoneNumber:","Teléfono:"

view/frontend/templates/info/monei.phtml

@@ -9,13 +9,28 @@
  */
 $paymentTitle = $block->getPaymentTitle();
 $paymentInfo = $block->getPaymentInfo();
+$infoCard = '';
 ?>
 <?= $block->escapeHtml($paymentTitle) ?>
 <?php if (is_array($paymentInfo)) : ?>
-    <?php foreach ($paymentInfo as $payKey => $payValue) { ?>
+    <?php foreach ($paymentInfo as $payKey => $payValue): ?>
+        <?php if (in_array($payKey, $block->getInfoPayAllowed(), true)) : ?>
+            <?php if($payKey === 'last4') : ?>
+                <?php $infoCard = $infoCard . '···· '. $payValue; ?>
+                <?php continue; ?>
+            <?php endif; ?>
+            <?php if($payKey === 'brand') : ?>
+                <?php $infoCard = ucfirst($payValue) . ' '. $infoCard; ?>
+                <?php continue; ?>
+            <?php endif; ?>
+            <div class="admin__page-section-item-content">
+                <span class="payment_details"><?= $block->escapeHtml($payValue) ?></span>
+            </div>
+        <?php endif; ?>
+    <?php endforeach; ?>
+    <?php if($infoCard) : ?>
         <div class="admin__page-section-item-content">
-            <strong><?= $block->escapeHtml(__($payKey . ':')) ?></strong>
-            <span class="payment_details"><?= $block->escapeHtml($payValue) ?></span>
+            <span class="payment_details"><?= $block->escapeHtml($infoCard) ?></span>
         </div>
-    <?php } ?>
+    <?php endif; ?>
 <?php endif; ?>