small refactoring, renamed function name, added missing comments, fix…

…ed html labels added comment to function fixed labels
omise · Jan 10, 2019 · 4e114c9 · 4e114c9
1 parent 941259a
commit 4e114c9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/Model/Api/Capabilities.php b/Model/Api/Capabilities.php
@@ -12,7 +12,12 @@ public function __construct() {
         $this->capabilities = OmiseCapabilities::retrieve();
     }
 
-    public function read() {
+    /**
+     * Get Installment capabilities array from Omise-PHP
+     * 
+     * @return array
+     */
+    public function getFromInstallments() {
         return $this->capabilities->getBackends(
             $this->capabilities->backendTypeIs('installment')
         );    

diff --git a/Model/Capabilities.php b/Model/Capabilities.php
@@ -28,7 +28,10 @@ public function __construct(
         $this->omise->defineApiKeys();
     }
 
-    public function get() {
-        return $this->capabilitiesAPI->read();
+    /**
+     * @return array
+     */
+    public function getFromInstallments() {
+        return $this->capabilitiesAPI->getFromInstallments();
     }
 }
diff --git a/Model/Ui/CapabilitiesConfigProvider.php b/Model/Ui/CapabilitiesConfigProvider.php
@@ -37,7 +37,7 @@ public function getConfig()
         foreach ($listOfActivePaymentMethods as $method) {
             if ($method->getCode() === OmiseInstallmentConfig::CODE) {
                 return [ 
-                    'capabilities' => $this->capabilities->get()
+                    'capabilities' => $this->capabilities->getFromInstallments()
                 ];
             }
         }

diff --git a/view/frontend/web/template/payment/offsite-installment-form.html b/view/frontend/web/template/payment/offsite-installment-form.html
@@ -63,7 +63,7 @@
                                 <span class="title" data-bind="i18n: 'Krungthai Card'"></span>
                             </div>
                         </label>
-                        <select style="margin-top:10px" data-bind="options: getInstallmentTerms('ktc'),
+                        <select id="omise_offsite_installment_ktc" style="margin-top:10px" data-bind="options: getInstallmentTerms('ktc'),
                                         optionsText: item,
                                         valueAllowUnset: true,
                                         value: installmentTerms,
@@ -82,15 +82,15 @@
                                 installmentTerms(null); 
                                 return true; 
                             };" />
-                        <label for="omise_offsite_installment_fc">
+                        <label for="omise_offsite_installment_first_choice">
                             <div class="omise-logo-wrapper fc">
                                 <img class="fc" />
                             </div>
                             <div class="omise-banking-text-wrapper">
                                 <span class="title" data-bind="i18n: 'First Choice'"></span>
                             </div>
                         </label>
-                        <select style="margin-top:10px" data-bind="options: getInstallmentTerms('first_choice'),
+                        <select id="omise_offsite_installment_first_choice" style="margin-top:10px" data-bind="options: getInstallmentTerms('first_choice'),
                                         optionsText: item;
                                         valueAllowUnset: true,
                                         value: installmentTerms,
@@ -117,7 +117,7 @@
                                 <span class="title" data-bind="i18n: 'Kasikorn Bank'"></span>
                             </div>
                         </label>
-                        <select style="margin-top:10px" data-bind="options: getInstallmentTerms('kbank'),
+                        <select id="omise_offsite_installment_kbank" style="margin-top:10px" data-bind="options: getInstallmentTerms('kbank'),
                                         optionsText: item,
                                         valueAllowUnset: true,
                                         value: installmentTerms,
@@ -137,15 +137,15 @@
                                 installmentTerms(null); 
                                 return true; 
                             };" />
-                        <label for="omise_offsite_intstallment_bbl">
+                        <label for="omise_offsite_installment_bbl">
                             <div class="omise-logo-wrapper bbl">
                                 <img class="bbl" />
                             </div>
                             <div class="omise-banking-text-wrapper">
                                 <span class="title" data-bind="i18n: 'Bangkok Bank'"></span>
                             </div>
                         </label>
-                        <select style="margin-top:10px" data-bind="options: getInstallmentTerms('bbl'),
+                        <select id="omise_offsite_installment_bbl" style="margin-top:10px" data-bind="options: getInstallmentTerms('bbl'),
                                         optionsText: item,
                                         valueAllowUnset:true,
                                         value: installmentTerms,
@@ -163,15 +163,15 @@
                                 installmentTerms(null); 
                                 return true; 
                             };" />
-                        <label for="omise_offsite_intstallment_bay">
+                        <label for="omise_offsite_installment_bay">
                             <div class="omise-logo-wrapper bay">
                                 <img class="bay" />
                             </div>
                             <div class="omise-banking-text-wrapper">
                                 <span class="title" data-bind="i18n: 'Krungsri'"></span>
                             </div>
                         </label>
-                        <select style="margin-top:10px" data-bind="options: getInstallmentTerms('bay'),
+                        <select id="omise_offsite_installment_bay" style="margin-top:10px" data-bind="options: getInstallmentTerms('bay'),
                                         optionsText: item,
                                         valueAllowUnset:true,
                                         value: installmentTerms,