Merge branch 'develop'

SergioMadness · Nov 7, 2018 · af0b664 · af0b664
2 parents 6c18381 + 569d2c3
commit af0b664
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/drivers/cnp/CnpDriver.php b/src/drivers/cnp/CnpDriver.php
@@ -68,12 +68,11 @@ public function getPaymentLink($orderId,
                                    $receipt = null)
     {
         $params = [
-            'orderId'                           => $orderId,
-            'currencyCode'                      => $currency,
-            'totalAmount'                       => $amount * 100,
-            'description'                       => $description,
-            'merchantAdditionalInformationList' => $extraParams,
-            'returnURL'                         => $successReturnUrl,
+            'orderId'      => $orderId,
+            'currencyCode' => $currency,
+            'totalAmount'  => $amount * 100,
+            'description'  => $description,
+            'returnURL'    => $successReturnUrl,
         ];
         if (isset($extraParams['locale'])) {
             $params['languageCode'] = $extraParams['locale'];
@@ -88,6 +87,17 @@ public function getPaymentLink($orderId,
                     'currencyCode'     => $currency,
                 ];
             }
+            unset($extraParams['products']);
+        }
+
+        if (!empty($extraParams)) {
+            $params['merchantAdditionalInformationList'] = [];
+            foreach ($extraParams as $key => $value) {
+                $params['merchantAdditionalInformationList'][] = [
+                    'Key'   => $key,
+                    'Value' => (string)$value,
+                ];
+            }
         }
 
         return $this->getTransport()->getPaymentUrl($params);