Merge pull request #650 from gerfigna/bugfix/resolve-purchasable-name

Resolve Purchasable name on PaymentBridge
elcodi · Nov 30, 2015 · 3f9217d · 3f9217d
2 parents d1348a4 + 44ea58c
commit 3f9217d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/Elcodi/Bridge/PaymentSuiteBridgeBundle/Resources/config/services.yml b/src/Elcodi/Bridge/PaymentSuiteBridgeBundle/Resources/config/services.yml
@@ -9,3 +9,4 @@ services:
             order_repository: @elcodi.repository.order
             cart_wrapper: @elcodi.wrapper.cart
             currency_converter: @elcodi.converter.currency
+            purchasable_name_resolver: @elcodi.resolver.purchasable_name
diff --git a/src/Elcodi/Bridge/PaymentSuiteBridgeBundle/Services/PaymentBridge.php b/src/Elcodi/Bridge/PaymentSuiteBridgeBundle/Services/PaymentBridge.php
@@ -26,6 +26,7 @@
 use Elcodi\Component\Cart\Wrapper\CartWrapper;
 use Elcodi\Component\Currency\Entity\Money;
 use Elcodi\Component\Currency\Services\CurrencyConverter;
+use Elcodi\Component\Product\Services\PurchasableNameResolver;
 
 /**
  * Class PaymentBridge
@@ -61,18 +62,28 @@ class PaymentBridge implements PaymentBridgeInterface
     private $currencyConverter;
 
     /**
-     * @param OrderRepository   $orderRepository   Order repository
-     * @param CartWrapper       $cartWrapper
-     * @param CurrencyConverter $currencyConverter
+     * @var PurchasableNameResolver
+     *
+     * Purchasable name resolver
+     */
+    private $purchasableNameResolver;
+
+    /**
+     * @param OrderRepository         $orderRepository         Order repository
+     * @param CartWrapper             $cartWrapper
+     * @param CurrencyConverter       $currencyConverter
+     * @param PurchasableNameResolver $purchasableNameResolver
      */
     public function __construct(
         OrderRepository $orderRepository,
         CartWrapper $cartWrapper,
-        CurrencyConverter $currencyConverter
+        CurrencyConverter $currencyConverter,
+        PurchasableNameResolver $purchasableNameResolver
     ) {
         $this->orderRepository = $orderRepository;
         $this->cartWrapper = $cartWrapper;
         $this->currencyConverter = $currencyConverter;
+        $this->purchasableNameResolver = $purchasableNameResolver;
     }
 
     /**
@@ -236,9 +247,11 @@ public function getExtraData()
             foreach ($this->order->getOrderLines() as $orderLine) {
                 $orderLineArray = [];
 
-                $orderLineName = $orderLine
-                    ->getPurchasable()
-                    ->getName();
+                $purchasable = $orderLine->getPurchasable();
+                $orderLineName = $this
+                    ->purchasableNameResolver
+                    ->getPurchasableName($purchasable);
+
                 $orderLineArray['item_name'] = $orderLineName;
 
                 $lineAmount = $orderLine