Merge branch 'release/1.1.2'

flaviocopes · Dec 22, 2016 · 890aef3 · 890aef3
2 parents 8f95f23 + 27630e7
commit 890aef3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.1.2
+## 22-12-2016
+
+1. [](#new)
+    * Allow PayPal to list the items in its transaction details
+
 # v1.1.1
 ## 11-12-2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Shopping Cart PayPal Express Addon
-version: 1.1.1
+version: 1.1.2
 description: "Add PayPal Express checkout to the Grav Shopping Cart Plugin. Requires a PayPal Premier / Business account."
 icon: shopping-cart
 author:

diff --git a/gateways/paypal_express/gateway.php b/gateways/paypal_express/gateway.php
@@ -59,9 +59,14 @@ public function onShoppingCartPreparePayment(Event $event)
 
         $this->grav['session']->order = $order->toArray();
 
-        $items = [];
+        $items = new \Omnipay\PayPal\PayPalItemBag();
+
         foreach ($order->products as $product) {
-            $items[] = ['name' => $product['product']['title'], 'quantity' => $product['quantity'], 'price' => $product['product']['price']];
+            $items->add(array(
+                'name' => $product['product']['title'],
+                'quantity' => $product['quantity'],
+                'price' => $product['product']['price'],
+            ));
         }
 
         $params = [
@@ -123,12 +128,23 @@ public function onShoppingCartPay(Event $event)
         $pluginConfig = $this->grav['config']->get('plugins.shoppingcart');
         $currency = $pluginConfig['general']['currency'];
 
+        $items = new \Omnipay\PayPal\PayPalItemBag();
+
+        foreach ($order->products as $product) {
+            $items->add(array(
+                'name' => $product['product']['title'],
+                'quantity' => $product['quantity'],
+                'price' => $product['product']['price'],
+            ));
+        }
+
         $response = $gateway->completePurchase([
             'payer_id' => $event['payer_id'],
             'transactionReference' => $event['transactionReference'],
             'amount' => $order->amount,
+            'shippingAmount' => $order->shipping['cost'],
             'currency' => $currency,
-        ])->send();
+        ])->setItems($items)->send();
 
         if ($response->isSuccessful()) {
             // mark order as complete