[LIBSDK-12] fix missing SEPA form on installment-directdebit

ratepay · Apr 10, 2017 · 4293ed1 · 4293ed1
1 parent a3a8958
commit 4293ed1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/Frontend/InstallmentBuilder.php b/src/Frontend/InstallmentBuilder.php
@@ -171,7 +171,7 @@ public function getInstallmentCalculatorByTemplate($amount, $template)
             ['rp_minimumRate' => $configuration->getMinRate()],
             ['rp_maximumRate' => $configuration->getMaxRate($amount)],
             ['rp_amount'      => $amount],
-            $this->getDebitPayType($configuration->getValidPaymentFirstdays()), // Necessary here or just trough if-statementer
+            $this->getDebitPayType($configuration->getValidPaymentFirstdays()),
             $this->lang->getArray()
         );
 
@@ -340,7 +340,7 @@ private function getDebitPayType($validPaymentFirstdays)
 
         if (is_array($validPaymentFirstdays)) {
             foreach ($validPaymentFirstdays as $validPaymentFirstday) {
-                $result = array_merge($result, $this->getDebitPayType($validPaymentFirstday));
+                $result = Util::merge_array_replace($result, $this->getDebitPayType($validPaymentFirstday));
             }
         } else {
             if (key_exists($validPaymentFirstdays, CONSTANTS::DEBIT_PAY_TYPES)) {

diff --git a/src/Service/Util.php b/src/Service/Util.php
@@ -47,7 +47,8 @@ public static function changeCamelCaseToDash($string)
          * @param string $case
          * @return string
          */
-        private static function changeCase($string, $delimiter, $case = '') {
+        private static function changeCase($string, $delimiter, $case = '')
+        {
             $stringFormatted = preg_split('/(?=[A-Z])/', $string, -1, PREG_SPLIT_NO_EMPTY);
             $stringFormatted = implode($delimiter, $stringFormatted);
             if ($case == 'upper') {
@@ -114,6 +115,30 @@ public static function templateLoop($template, $loopDataSet)
             return $tpl;
         }
 
+        /**
+         * Merges all entered array and replaces multiple keys by highest value
+         *
+         * @param array
+         * @return array
+         */
+        public static function merge_array_replace()
+        {
+            $inputArrays = func_get_args();
+            $outputArray = [];
+
+            foreach ($inputArrays as $array) {
+                foreach ($array as $key => $value) {
+                    if (!key_exists($key, $outputArray)) {
+                        $outputArray[$key] = $value;
+                    } elseif ((int) $value > (int) $outputArray[$key]) {
+                        $outputArray[$key] = $value;
+                    }
+                }
+            }
+
+            return $outputArray;
+        }
+
         /**
          * Splits entered string by delimiter commands
          *
@@ -122,7 +147,8 @@ public static function templateLoop($template, $loopDataSet)
          * @param string $cmdEnd
          * @return array
          */
-        private static function splitStringByCommand($template, $cmdBegin, $cmdEnd) {
+        private static function splitStringByCommand($template, $cmdBegin, $cmdEnd)
+        {
             $tplPreText = strstr($template, $cmdBegin, true); // Get part before cmdBegin
             $tplPosTextBegin = strpos($template, $cmdBegin) + strlen($cmdBegin); // Get innerText starting position
             $tplTextContent = strstr(substr($template, $tplPosTextBegin), $cmdEnd, true); // Get innerText
@@ -135,5 +161,4 @@ private static function splitStringByCommand($template, $cmdBegin, $cmdEnd) {
                 'postText' => $tplPostText
             ];
         }
-
     }