release: module update from ifthenpay/dev_prestashop_8 (ifthenpay/dev…

…_prestashop_8@a73edc1)
ifthenpay · May 10, 2023 · 3d7a906 · 3d7a906
1 parent 3022669
commit 3d7a906
Show file tree

Hide file tree

Showing 41 changed files with 1,132 additions and 555 deletions.
diff --git a/ifthenpay/classes/Admin/IfthenpayAdminRefund.php b/ifthenpay/classes/Admin/IfthenpayAdminRefund.php
@@ -38,7 +38,7 @@ class IfthenpayAdminRefund extends IfthenpayStrategy
     public function execute()
     {
         $this->setDefaultData();
-        $this->setDefaultEmailData();
-        return AdminRefundFactory::build($this->order->payment, $this->paymentDefaultData, $this->ifthenpayModule, null, $this->emailDefaultData)->refundPayment();
+        $this->setAdminEmailData();
+        return AdminRefundFactory::build($this->order->payment, $this->paymentDefaultData, $this->ifthenpayModule, null, $this->emailAdminData)->refundPayment();
     }
 }
diff --git a/ifthenpay/classes/Admin/Payments/CCardAdminRefund.php b/ifthenpay/classes/Admin/Payments/CCardAdminRefund.php
@@ -25,6 +25,7 @@
 
 
 namespace PrestaShop\Module\Ifthenpay\Admin\Payments;
+use PrestaShop\Module\Ifthenpay\Utility\Utility;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -40,7 +41,7 @@ public function refundPayment()
         $this->setPaymentModel('ccard');
         $this->getFromDatabaseById();
         $this->setEmailVariables(); 
-        $this->sendEmail('refund', 'Confirmação de Reembolso');
+        $this->sendEmailToAdmin('refund_token', Utility::getMailTranslationString('ccard', 'refund'));
         return $this->securityCode;
     }
 }
diff --git a/ifthenpay/classes/Admin/Payments/MbwayAdminRefund.php b/ifthenpay/classes/Admin/Payments/MbwayAdminRefund.php
@@ -25,6 +25,7 @@
 
 
 namespace PrestaShop\Module\Ifthenpay\Admin\Payments;
+use PrestaShop\Module\Ifthenpay\Utility\Utility;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -40,7 +41,7 @@ public function refundPayment()
         $this->setPaymentModel('mbway');
         $this->getFromDatabaseById();
         $this->setEmailVariables(); 
-        $this->sendEmail('refund', 'Confirmação de Reembolso');
+        $this->sendEmailToAdmin('refund', Utility::getMailTranslationString('mbway', 'refund'));
         return $this->securityCode;
     }
 }
diff --git a/ifthenpay/classes/Base/PaymentBase.php b/ifthenpay/classes/Base/PaymentBase.php
@@ -40,6 +40,7 @@ abstract class PaymentBase
     protected $paymentDefaultData;
     protected $smartyDefaultData;
     protected $emailDefaultData;
+    protected $emailAdminData;
     protected $paymentGatewayResultData;
     protected $ifthenpayGateway;
     protected $paymentModel;
@@ -74,7 +75,7 @@ public function getFromDatabaseById()
     }
 
     protected function sendEmail($emailTemplate, $emailSubject)
-    {
+    {        
         \Mail::Send(
             (int)$this->paymentDefaultData->order->id_lang,
             $emailTemplate,
@@ -92,6 +93,26 @@ protected function sendEmail($emailTemplate, $emailSubject)
         );
     }
 
+    protected function sendEmailToAdmin($emailTemplate, $emailSubject)
+    {
+        $context = \Context::getContext();
+        \Mail::Send(
+            (int)$context->employee->id_lang,
+            $emailTemplate,
+            $emailSubject,
+            $this->emailDefaultData,
+            $context->employee->email,
+            $context->employee->firstname . ' ' . $context->employee->lastname,
+            null,
+            null,
+            null,
+            null,
+            _PS_MODULE_DIR_ . 'ifthenpay/mails/',
+            false,
+            (int)$this->paymentDefaultData->order->id_shop
+        );
+    }
+
     public function getSmartyVariables()
     {
         return $this->smartyDefaultData;

diff --git a/ifthenpay/classes/Config/IfthenpayConfiguration.php b/ifthenpay/classes/Config/IfthenpayConfiguration.php
@@ -85,7 +85,6 @@ private function uninstallByPaymentMethod()
                         \Configuration::deleteByName('IFTHENPAY_MULTIBANCO_URL_CALLBACK');
                         \Configuration::deleteByName('IFTHENPAY_MULTIBANCO_CHAVE_ANTI_PHISHING');
                         \Configuration::deleteByName('IFTHENPAY_MULTIBANCO_CANCEL_ORDER_AFTER_TIMEOUT');
-
                         break;
                     case 'mbway':
                         \Configuration::deleteByName('IFTHENPAY_MBWAY_KEY');
@@ -94,7 +93,7 @@ private function uninstallByPaymentMethod()
                         \Configuration::deleteByName('IFTHENPAY_MBWAY_CANCEL_ORDER_AFTER_TIMEOUT');
                         \Configuration::deleteByName('IFTHENPAY_MBWAY_SHOW_COUNTDOWN');
                         \Configuration::deleteByName('IFTHENPAY_MBWAY_CANCEL_ORDER_AFTER_TIMEOUT');
-
+                        \Configuration::deleteByName('IFTHENPAY_MBWAY_REFUND');
                         break;
                     case 'payshop':
                         \Configuration::deleteByName('IFTHENPAY_PAYSHOP_KEY');
@@ -106,6 +105,7 @@ private function uninstallByPaymentMethod()
                     case 'ccard':
                         \Configuration::deleteByName('IFTHENPAY_CCARD_KEY');
                         \Configuration::deleteByName('IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT');
+                        \Configuration::deleteByName('IFTHENPAY_CCARD_REFUND');
                         break;
                     default:
                 }

diff --git a/ifthenpay/classes/Factory/Admin/AdminRefundFactory.php b/ifthenpay/classes/Factory/Admin/AdminRefundFactory.php
@@ -40,13 +40,13 @@ public static function build(
         $paymentDefaultData,
         $ifthenpayModule,
         $smartyDefaultData = null,
-        $emailDefaultData = null
+        $emailAdminData = null
     ) {
         switch ($type) {
             case 'mbway':
-                return new MbwayAdminRefund($ifthenpayModule, $paymentDefaultData, $smartyDefaultData, $emailDefaultData);
+                return new MbwayAdminRefund($ifthenpayModule, $paymentDefaultData, $smartyDefaultData, $emailAdminData);
             case 'ccard':
-                return new CCardAdminRefund($ifthenpayModule, $paymentDefaultData, $smartyDefaultData, $emailDefaultData);
+                return new CCardAdminRefund($ifthenpayModule, $paymentDefaultData, $smartyDefaultData, $emailAdminData);
             default:
                 throw new \Exception('Unknown Admin Refund class');
         }

diff --git a/ifthenpay/classes/Factory/Prestashop/PrestashopModelFactory.php b/ifthenpay/classes/Factory/Prestashop/PrestashopModelFactory.php
@@ -60,4 +60,9 @@ public static function buildCustomer($id = null)
     {
         return new \Customer($id);
     }
+
+    public static function buildEmployee($id = null)
+    {
+        return new \Employee($id);
+    }
 }
diff --git a/ifthenpay/classes/Forms/CCardConfigForm.php b/ifthenpay/classes/Forms/CCardConfigForm.php
@@ -36,10 +36,8 @@
 class CCardConfigForm extends ConfigForm
 {
     protected $paymentMethod = 'ccard';
-
     protected $options = []; // array of entity options for GUI select
 
-
     /**
      * "gets" the form into object... it sets the form that will display in the payment method configuration
      *
@@ -49,8 +47,9 @@ public function getForm()
     {
         // assign template variables
         $this->setSmartyVariables();
-
         $this->setFormParent();
+
+        // sets the $this->options
         $this->setEntityOptions();
 
         $this->form['form']['input'][] = [
@@ -71,18 +70,39 @@ public function getForm()
             'type' => 'switch',
             'label' => $this->ifthenpayModule->l('Cancel CCard Order', pathinfo(__FILE__)['filename']),
             'name' => 'IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT',
-            'desc' => $this->ifthenpayModule->l('Cancel order if not payed within 30 minutes after confirmation. This is triggered when admin visits the order list page.'),
+            'desc' => $this->ifthenpayModule->l('Cancel order if not payed within 30 minutes after confirmation. This is triggered when admin visits the order list page.', pathinfo(__FILE__)['filename']),
+            'is_bool' => true,
+            'values' => [
+                [
+                    'id' => 'active_on',
+                    'value' => true,
+                    'label' => $this->ifthenpayModule->l('ON', pathinfo(__FILE__)['filename'])
+                ],
+                [
+                    'id' => 'active_off',
+                    'value' => false,
+                    'label' => $this->ifthenpayModule->l('OFF', pathinfo(__FILE__)['filename'])
+                ]
+            ]
+        ];
+
+        // activate partial refund method
+        $this->form['form']['input'][] = [
+            'type' => 'switch',
+            'label' => $this->ifthenpayModule->l('Partial Refund', pathinfo(__FILE__)['filename']),
+            'name' => 'IFTHENPAY_CCARD_REFUND',
+            'desc' => $this->ifthenpayModule->l('Allows the admin to make partial refunds directly to the Ifthenpay Payment Gateway.', pathinfo(__FILE__)['filename']),
             'is_bool' => true,
             'values' => [
                 [
                     'id' => 'active_on',
                     'value' => true,
-                    'label' => $this->ifthenpayModule->l('Activate', pathinfo(__FILE__)['filename'])
+                    'label' => $this->ifthenpayModule->l('ON', pathinfo(__FILE__)['filename'])
                 ],
                 [
                     'id' => 'active_off',
                     'value' => false,
-                    'label' => $this->ifthenpayModule->l('Disabled', pathinfo(__FILE__)['filename'])
+                    'label' => $this->ifthenpayModule->l('OFF', pathinfo(__FILE__)['filename'])
                 ]
             ]
         ];
@@ -101,6 +121,7 @@ protected function getConfigFormValues()
         return array_merge(parent::getCommonConfigFormValues(), [
             'IFTHENPAY_CCARD_KEY' => \Configuration::get('IFTHENPAY_CCARD_KEY'),
             'IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT' => \Configuration::get('IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT'),
+            'IFTHENPAY_CCARD_REFUND' => \Configuration::get('IFTHENPAY_CCARD_REFUND')
         ]);
     }
 
@@ -133,7 +154,7 @@ public function processForm()
             // save specific values
             \Configuration::updateValue('IFTHENPAY_CCARD_KEY', $this->gatewayDataBuilder->getData()->subEntidade);
             \Configuration::updateValue('IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT', \Tools::getValue('IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT'));
-
+            \Configuration::updateValue('IFTHENPAY_CCARD_REFUND', \Tools::getValue('IFTHENPAY_CCARD_REFUND'));
             $this->updatePayMethodCommonValues();
 
             // response msg after submiting form
@@ -142,7 +163,7 @@ public function processForm()
             return true;
 
         } else {
-            
+
             return false;
         }
     }
@@ -176,5 +197,6 @@ public function deleteConfigValues()
         $this->deleteCommonConfigValues();
         \Configuration::deleteByName('IFTHENPAY_CCARD_KEY');
         \Configuration::deleteByName('IFTHENPAY_CCARD_CANCEL_ORDER_AFTER_TIMEOUT');
+        \Configuration::deleteByName('IFTHENPAY_CCARD_REFUND');
     }
 }
diff --git a/ifthenpay/classes/Forms/ConfigForm.php b/ifthenpay/classes/Forms/ConfigForm.php
@@ -174,12 +174,12 @@ protected function addActivateCallbackToForm()
                 [
                     'id' => 'active_on',
                     'value' => true,
-                    'label' => $this->ifthenpayModule->l('Activate', pathinfo(__FILE__)['filename'])
+                    'label' => $this->ifthenpayModule->l('ON', pathinfo(__FILE__)['filename'])
                 ],
                 [
                     'id' => 'active_off',
                     'value' => false,
-                    'label' => $this->ifthenpayModule->l('Disabled', pathinfo(__FILE__)['filename'])
+                    'label' => $this->ifthenpayModule->l('OFF', pathinfo(__FILE__)['filename'])
                 ]
             ]
         ];