[Feat] Refactor config form

* Unify config var * Separate form validation * Add class to create the webhooks * Remove unnecessary validations * Remove duplicate code
conekta · Apr 26, 2023 · 62b4d3b · 62b4d3b
1 parent 078e1f8
commit 62b4d3b
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 294 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -226,7 +226,8 @@
         'single_line'                         => true,
         'space_before_parenthesis'            => true,
         'inline_constructor_arguments'        => true
-    ]
+    ],
+    'ordered_imports'                             => ['sort_algorithm' => 'alpha']
 
     //'not_operator_with_successor_space'           => false,
     //'no_superfluous_elseif'                       => true,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 [Full Changelog](https://github.com/conekta/conekta_prestashop/compare/2.3.5...2.3.6)
 - Add MSI feature by @ElvisHeredia [#115](https://github.com/conekta/conekta_prestashop/pull/115)
 - Fix Coding standards to get approval from Prestashop Validator by @ElvisHeredia [#116](https://github.com/conekta/conekta_prestashop/pull/116)
-
+- Unify config var by @ElvisHeredia [#117](https://github.com/conekta/conekta_prestashop/pull/117)
+- Separate form validation by @ElvisHeredia [#117](https://github.com/conekta/conekta_prestashop/pull/117)
+- Add class to create the webhooks by @ElvisHeredia [#117](https://github.com/conekta/conekta_prestashop/pull/117)
+- Remove unnecessary validations by @ElvisHeredia [#117](https://github.com/conekta/conekta_prestashop/pull/117)
+- Remove duplicate code by @ElvisHeredia [#117](https://github.com/conekta/conekta_prestashop/pull/117)
 
 ## [v2.3.5] - 2022-11-04
 [Full Changelog](https://github.com/conekta/conekta_prestashop/compare/2.3.4...2.3.5)

diff --git a/conekta.php b/conekta.php
diff --git a/controllers/front/notifications.php b/controllers/front/notifications.php
@@ -1,7 +1,29 @@
 <?php
-
+/**
+ * NOTICE OF LICENSE
+ * Title   : Conekta Card Payment Gateway for Prestashop
+ * Author  : Conekta.io
+ * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ * Conekta File Doc Comment
+ *
+ * @author    Conekta <[email protected]>
+ * @copyright 2012-2023 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ *
+ * @category  Conekta
+ *
+ * @version   GIT: @2.3.6@
+ *
+ * @see       https://conekta.com/
+ */
+require_once dirname(__FILE__) . '/../../model/Database.php';
 class ConektaNotificationsModuleFrontController extends ModuleFrontController
 {
+    public const ORDER_CANCELED = 6;
+
+    public const ORDER_REFUNDED = 7;
+
     public $auth = false;
 
     public $ajax;
@@ -99,7 +121,7 @@ private function orderCanceled($orderID)
     {
         Db::getInstance()->Execute(
             'UPDATE ' . _DB_PREFIX_
-            . 'orders SET current_state = ' . ORDER_CANCELED . ' WHERE id_order = '
+            . 'orders SET current_state = ' . self::ORDER_CANCELED . ' WHERE id_order = '
             . pSQL($orderID)
         );
     }
@@ -113,7 +135,7 @@ private function orderRefunded($orderID)
     {
         Db::getInstance()->Execute(
             'UPDATE ' . _DB_PREFIX_
-            . 'orders SET current_state = ' . ORDER_REFUNDED . ' WHERE id_order = '
+            . 'orders SET current_state = ' . self::ORDER_REFUNDED . ' WHERE id_order = '
             . pSQL($orderID)
         );
     }

diff --git a/notification.php b/notification.php
diff --git a/src/UseCases/CreateWebhook.php b/src/UseCases/CreateWebhook.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * NOTICE OF LICENSE
+ * Title   : Conekta Card Payment Gateway for Prestashop
+ * Author  : Conekta.io
+ * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ * Conekta File Doc Comment
+ *
+ * @author    Conekta <[email protected]>
+ * @copyright 2012-2023 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ *
+ * @category  Conekta
+ *
+ * @version   GIT: @2.3.6@
+ *
+ * @see       https://conekta.com/
+ */
 
 namespace Conekta\Payments\UseCases;
 
@@ -21,8 +39,13 @@ class CreateWebhook
 
     public const MaxFailedAttempts = 5;
 
-    public function __invoke(string $privateKey, string $isoCode, string $pluginVersion, $conektaMode): bool
-    {
+    public function __invoke(
+        bool $conektaMode,
+        string $privateKey,
+        string $isoCode,
+        string $pluginVersion,
+        string $oldWebhook
+    ): bool {
         Conekta::setApiKey($privateKey);
         Conekta::setPlugin('Prestashop');
         Conekta::setApiVersion('2.0.0');
@@ -32,10 +55,9 @@ public function __invoke(string $privateKey, string $isoCode, string $pluginVers
         $events = ['events' => ['order.paid', 'order.expired']];
 
         $newWebhook = Tools::safeOutput(Tools::getValue(self::webhookSetting));
-        $oldWebhook = Tools::safeOutput(Configuration::get(self::webhookSetting));
         Configuration::deleteByName(self::webhookErrorSetting);
 
-        if ($newWebhook === $oldWebhook) {
+        if ($oldWebhook === $newWebhook) {
             return true;
         }
 

diff --git a/src/UseCases/ValidateAdminForm.php b/src/UseCases/ValidateAdminForm.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * NOTICE OF LICENSE
+ * Title   : Conekta Card Payment Gateway for Prestashop
+ * Author  : Conekta.io
+ * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ * Conekta File Doc Comment
+ *
+ * @author    Conekta <[email protected]>
+ * @copyright 2012-2023 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ *
+ * @category  Conekta
+ *
+ * @version   GIT: @2.3.6@
+ *
+ * @see       https://conekta.com/
+ */
 
 namespace Conekta\Payments\UseCases;
 

diff --git a/views/js/tokenize.js b/views/js/tokenize.js
@@ -69,7 +69,7 @@ $(document).ready (function($) {
 			$form.append($('<input type="hidden" name="chargeId" id="chargeId" />').val((event.subscription) ? null : event.charge.id));
 			$form.append($('<input type="hidden" name="charge_currency" id="charge_currency" />').val((event.subscription) ? null : event.charge.currency));
 			$form.append($('<input type="hidden" name="charge_status" id="charge_status" />').val((event.subscription) ? event.subscription.status : event.charge.status));
-			$form.append($('<input type="hidden" name="payment_type" id="payment_type" />').val(event.charge.payment_method.type));
+			$form.append($('<input type="hidden" name="payment_type" id="payment_type" />').val(event.charge.paymentMethod.type));
 			$form.append($('<input type="hidden" name="createAt" id="createAt" />').val((event.subscription) ? event.subscription.created_at : null));
 			$form.append($('<input type="hidden" name="reference" id="reference" />').val((event.reference)? event.reference : null));
 			$form.append($('<input type="hidden" name="plan_id" id="plan_id" />').val((event.subscription)? event.subscription.plan_id : null));