Merge pull request thephpleague#140 from aderuwe/patch-9

Remove hardcoded values in ExpressAuthorizeRequest (Fixes thephpleague#121)

Author: amacneil

src/Omnipay/PayPal/Message/AbstractRequest.php

@@ -91,6 +91,26 @@ public function setHeaderImageUrl($value)
         return $this->setParameter('headerImageUrl', $value);
     }
 
+    public function getNoShipping()
+    {
+        return $this->getParameter('noShipping');
+    }
+
+    public function setNoShipping($value)
+    {
+        return $this->setParameter('noShipping', $value);
+    }
+
+    public function getAllowNote()
+    {
+        return $this->getParameter('allowNote');
+    }
+
+    public function setAllowNote($value)
+    {
+        return $this->setParameter('allowNote', $value);
+    }
+
     protected function getBaseData($method)
     {
         $data = array();

src/Omnipay/PayPal/Message/ExpressAuthorizeRequest.php

@@ -32,15 +32,21 @@ public function getData()
         // pp express specific fields
         $data['SOLUTIONTYPE'] = $this->getSolutionType();
         $data['LANDINGPAGE'] = $this->getLandingPage();
-        $data['NOSHIPPING'] = 1;
-        $data['ALLOWNOTE'] = 0;
         $data['RETURNURL'] = $this->getReturnUrl();
         $data['CANCELURL'] = $this->getCancelUrl();
 
         if ($headerImageUrl = $this->getHeaderImageUrl()) {
             $data['HDRIMG'] = $headerImageUrl;
         }
 
+        if (null !== ($noShipping = $this->getNoShipping())) {
+            $data['NOSHIPPING'] = $noShipping;
+        }
+
+        if (null !== ($allowNote = $this->getAllowNote())) {
+            $data['ALLOWNOTE'] = $allowNote;
+        }
+
         if ($card = $this->getCard()) {
             $data['PAYMENTREQUEST_0_SHIPTONAME'] = $card->getName();
             $data['PAYMENTREQUEST_0_SHIPTOSTREET'] = $card->getAddress1();

tests/Omnipay/PayPal/Message/ExpressAuthorizeRequestTest.php

@@ -16,6 +16,11 @@
 
 class ExpressAuthorizeRequestTest extends TestCase
 {
+    /**
+     * @var ExpressAuthorizeRequest
+     */
+    private $request;
+
     public function setUp()
     {
         parent::setUp();
@@ -42,6 +47,8 @@ public function testGetDataWithoutCard()
             'notifyUrl' => 'https://www.example.com/notify',
             'subject' => 'demo@example.com',
             'headerImageUrl' => 'https://www.example.com/header.jpg',
+            'noShipping' => 0,
+            'allowNote' => 0,
         ));
 
         $data = $this->request->getData();
@@ -55,9 +62,11 @@ public function testGetDataWithoutCard()
         $this->assertSame('https://www.example.com/notify', $data['PAYMENTREQUEST_0_NOTIFYURL']);
         $this->assertSame('demo@example.com', $data['SUBJECT']);
         $this->assertSame('https://www.example.com/header.jpg', $data['HDRIMG']);
+        $this->assertSame(0, $data['NOSHIPPING']);
+        $this->assertSame(0, $data['ALLOWNOTE']);
     }
 
-    public function testGetDataWitCard()
+    public function testGetDataWithCard()
     {
         $this->request->initialize(array(
             'amount' => '10.00',
@@ -69,6 +78,8 @@ public function testGetDataWitCard()
             'notifyUrl' => 'https://www.example.com/notify',
             'subject' => 'demo@example.com',
             'headerImageUrl' => 'https://www.example.com/header.jpg',
+            'noShipping' => 2,
+            'allowNote' => 1,
         ));
 
         $card = new CreditCard(array(
@@ -93,8 +104,8 @@ public function testGetDataWitCard()
             'PAYMENTREQUEST_0_PAYMENTACTION' => 'Authorization',
             'SOLUTIONTYPE' => null,
             'LANDINGPAGE' => null,
-            'NOSHIPPING' => 1,
-            'ALLOWNOTE' => 0,
+            'NOSHIPPING' => 2,
+            'ALLOWNOTE' => 1,
             'PAYMENTREQUEST_0_AMT' => '10.00',
             'PAYMENTREQUEST_0_CURRENCYCODE' => 'AUD',
             'PAYMENTREQUEST_0_INVNUM' => '111',