added amount to convert payment and fixed service visibility bug

elevantiq · Mar 23, 2020 · ee362c3 · ee362c3
1 parent e465667
commit ee362c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Extension/ConvertPaymentExtension.php b/src/Extension/ConvertPaymentExtension.php
@@ -4,7 +4,7 @@
 namespace CoreShop\Payum\MollieBundle\Extension;
 
 
-use ArrayObject;
+use Payum\Core\Bridge\Spl\ArrayObject;
 use CoreShop\Component\Core\Model\OrderInterface;
 use CoreShop\Component\Core\Model\PaymentInterface;
 use CoreShop\Payum\MollieBundle\Model\MollieCustomerInterface;
@@ -46,6 +46,10 @@ public function onPostExecute(Context $context)
 
         $data = [];
 
+        $data['amount'] = [
+            'value' => number_format(($payment->getTotalAmount() / 100), 2),
+            'currency' => $payment->getCurrencyCode()
+        ];
         $data['description'] = sprintf("Payment for order #%s", $order->getOrderNumber());
         $data['locale'] = $order->getLocaleCode();
         $data['metadata'] = json_encode([
@@ -61,7 +65,7 @@ public function onPostExecute(Context $context)
         }
 
         $result = ArrayObject::ensureArrayObject($request->getResult());
-        $result = array_merge($data, $result);
+        $result = is_array($result) ? array_merge($data, $result) : $data;
         $request->setResult((array)$result);
     }
 

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -1,4 +1,6 @@
 services:
+    _defaults:
+        public: true
 
     CoreShop\Payum\MollieBundle\Form\Payment\MollieType:
         tags: