Merge branch task/PP-8741 into master

task/PP-8741: Prestashop Payment Icons Improvement
payrexx · Apr 6, 2023 · 01fc6c3 · 01fc6c3
2 parents 7ac234d + 294da94
commit 01fc6c3
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 3 deletions.
diff --git a/payrexx/payrexx.php b/payrexx/payrexx.php
@@ -24,7 +24,7 @@ public function __construct()
         $this->name = 'payrexx';
         $this->tab = 'payments_gateways';
         $this->module_key = '0c4dbfccbd85dd948fd9a13d5a4add90';
-        $this->version = '1.4.1';
+        $this->version = '1.4.4';
         $this->author = 'Payrexx';
         $this->is_eu_compatible = 1;
         $this->ps_versions_compliancy = ['min' => '1.7'];
@@ -46,7 +46,8 @@ public function install()
         // Install default
         if (!parent::install() ||
             !$this->installDb() ||
-            !$this->registerHook('paymentOptions')
+            !$this->registerHook('paymentOptions') ||
+            !$this->registerHook('actionFrontControllerSetMedia')
         ) {
             return false;
         }
@@ -265,6 +266,21 @@ private function postProcess()
         $this->context->controller->confirmations[] = 'Settings are successfully updated.';
     }
 
+    /**
+     * Add asset for Shop Front Office
+     *
+     * @see https://devdocs.prestashop.com/1.7/themes/getting-started/asset-management/#without-a-front-controller-module
+     *
+     * @param array $params
+     */
+    public function hookActionFrontControllerSetMedia(array $params)
+    {
+        $this->context->controller->registerStylesheet(
+            'payrexx-payment-method-icon',
+            '/modules/' . $this->name . '/views/css/custom.css'
+        );
+    }
+
     /**
      * Return payment options
      *
@@ -289,6 +305,7 @@ public function hookPaymentOptions($params)
 
             $paymentOption = new PaymentOption();
             $paymentOption->setAction($action);
+            $paymentOption->setModuleName($this->name);
             $paymentOption->setCallToActionText($this->l($title));
             $paymentOption->setInputs(
                 [
@@ -301,6 +318,7 @@ public function hookPaymentOptions($params)
             );
             $paymentOption->setLogo($imageSrc);
             if ($paymentMethod['pm'] == 'payrexx') {
+                $paymentOption->setLogo('');
                 $paymentOption->setAdditionalInformation(
                     $this->l('Payrexx payment method description')
                 );

diff --git a/payrexx/upgrade/Upgrade-1.4.4.php b/payrexx/upgrade/Upgrade-1.4.4.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Payrexx Payment Gateway - upgrade the module
+ *
+ * @author    Payrexx <[email protected]>
+ * @copyright 2023 Payrexx
+ * @license   MIT License
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_1_4_4($module)
+{
+    return $module->registerHook('actionFrontControllerSetMedia');
+}
diff --git a/payrexx/views/css/custom.css b/payrexx/views/css/custom.css
@@ -0,0 +1,3 @@
+.payment-option img {
+    max-height: 40px;
+}
diff --git a/payrexx/views/css/index.php b/payrexx/views/css/index.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Payrexx Payment Gateway.
+ *
+ * @author    Payrexx <[email protected]>
+ * @copyright 2023 Payrexx
+ * @license   MIT License
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;