Address PR review

PrestaShop · Oct 10, 2019 · 34e1f0c · 34e1f0c
1 parent 98aa0a0
commit 34e1f0c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/admin-dev/themes/new-theme/js/pages/order/view.js b/admin-dev/themes/new-theme/js/pages/order/view.js
@@ -34,11 +34,7 @@ $(() => {
     $(OrderViewPageMap.orderPaymentDetailsBtn).on('click', (event) => {
       const $paymentDetailRow = $(event.currentTarget).closest('tr').next(':first');
 
-      if ($paymentDetailRow.hasClass('d-none')) {
-        $paymentDetailRow.removeClass('d-none');
-      } else {
-        $paymentDetailRow.addClass('d-none');
-      }
+      $paymentDetailRow.toggleClass('d-none');
     });
   }
 });
diff --git a/src/Adapter/Form/ChoiceProvider/InstalledPaymentModulesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/InstalledPaymentModulesChoiceProvider.php
@@ -33,20 +33,24 @@
 
 final class InstalledPaymentModulesChoiceProvider implements FormChoiceProviderInterface
 {
+    private static $paymentModules;
+
     /**
      * {@inheritdoc}
      */
     public function getChoices(): array
     {
-        $paymentModules = [];
+        if (!self::$paymentModules) {
+            self::$paymentModules = [];
 
-        foreach (PaymentModule::getInstalledPaymentModules() as $payment) {
-            $module = Module::getInstanceByName($payment['name']);
-            if (Validate::isLoadedObject($module) && $module->active) {
-                $paymentModules[$module->name] = $module->displayName;
+            foreach (PaymentModule::getInstalledPaymentModules() as $payment) {
+                $module = Module::getInstanceByName($payment['name']);
+                if (Validate::isLoadedObject($module) && $module->active) {
+                    self::$paymentModules[$module->name] = $module->displayName;
+                }
             }
         }
 
-        return $paymentModules;
+        return self::$paymentModules;
     }
 }
diff --git a/src/Core/Domain/Order/Payment/Command/AddPaymentCommand.php b/src/Core/Domain/Order/Payment/Command/AddPaymentCommand.php
@@ -79,7 +79,7 @@ class AddPaymentCommand
      * @param float $paymentAmount
      * @param float $paymentCurrencyId
      * @param int|null $orderInvoiceId
-     * @param string|null $transactionId
+     * @param string|null $transactionId Transaction ID, usually payment ID from payment gateway.
      */
     public function __construct(
         $orderId,

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/orders/orders.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/orders/orders.yml
@@ -91,7 +91,7 @@ admin_orders_duplicate_cart:
     expose: true
 
 admin_orders_change_currency:
-  path: /{orderId}/change-currency
+  path: /{orderId}/currency/change
   methods: [POST]
   defaults:
     _controller: PrestaShopBundle:Admin/Sell/Order/Order:changeCurrency

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/payments.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/payments.html.twig
@@ -78,7 +78,7 @@
               {% endif %}
             </p>
             <p class="mb-0">
-              <strong>{{ 'Card Type'|trans({}, 'Admin.Orderscustomers.Feature') }}</strong>&nbsp;
+              <strong>{{ 'Card type'|trans({}, 'Admin.Orderscustomers.Feature') }}</strong>&nbsp;
               {% if payment.cardBrand %}
                 {{ payment.cardBrand }}
               {% else %}