Merge pull request #4 from finicprint/master

add support for submerchant service fee

Author: barryvdh

src/Message/AbstractRequest.php

@@ -4,6 +4,7 @@
 
 use Braintree_Gateway;
 use Guzzle\Http\ClientInterface;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Symfony\Component\HttpFoundation\Request as HttpRequest;
 use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
 
@@ -209,6 +210,29 @@ public function setHoldInEscrow($value)
         return $this->setParameter('holdInEscrow', (bool) $value);
     }
 
+    public function getServiceFeeAmount()
+    {
+        $amount = $this->getParameter('serviceFeeAmount');
+        if ($amount !== null) {
+            if (!is_float($amount) &&
+                $this->getCurrencyDecimalPlaces() > 0 &&
+                false === strpos((string)$amount, '.')
+            ) {
+                throw new InvalidRequestException(
+                    'Please specify amount as a string or float, ' .
+                    'with decimal places (e.g. \'10.00\' to represent $10.00).'
+                );
+            }
+
+            return $this->formatCurrency($amount);
+        }
+    }
+
+    public function setServiceFeeAmount($value)
+    {
+        return $this->setParameter('serviceFeeAmount', $value);
+    }
+
     public function getStoreInVault()
     {
         return $this->getParameter('storeInVault');

src/Message/AuthorizeRequest.php

@@ -28,6 +28,7 @@ public function getData()
             'orderId' => $this->getTransactionId(),
             'purchaseOrderNumber' => $this->getPurchaseOrderNumber(),
             'recurring' => $this->getRecurring(),
+            'serviceFeeAmount' => $this->getServiceFeeAmount(),
             'shippingAddressId' => $this->getShippingAddressId(),
             'taxAmount' => $this->getTaxAmount(),
             'taxExempt' => $this->getTaxExempt(),

tests/Message/AuthorizeRequestTest.php

@@ -93,11 +93,81 @@ public function testPaymentMethodNonce()
         $this->assertArrayNotHasKey('paymentMethodToken', $data);
     }
 
+    public function testSubMerchantSale()
+    {
+        $this->request->initialize(
+            array(
+                'amount' => '100.00',
+                'holdInEscrow' => true,
+                'merchantAccountId' => 'blue_ladders_store',
+                'paymentMethodToken' => 'fake-token-123',
+                'serviceFeeAmount' => '10.00',
+            )
+        );
+
+        $data = $this->request->getData();
+        $this->assertTrue($data['options']['holdInEscrow']);
+        $this->assertSame('blue_ladders_store', $data['merchantAccountId']);
+        $this->assertSame('10.00', $data['serviceFeeAmount']);
+    }
+
     public function testSandboxEnvironment()
     {
         $this->request->setTestMode(true);
 
         $this->request->configure();
         $this->assertSame('sandbox', \Braintree_Configuration::environment());
     }
+
+    public function testServiceFeeAmount()
+    {
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount('2.00'));
+        $this->assertSame('2.00', $this->request->getServiceFeeAmount());
+    }
+
+    public function testServiceFeeAmountWithFloat()
+    {
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount(2.0));
+        $this->assertSame('2.00', $this->request->getServiceFeeAmount());
+    }
+
+    public function testServiceFeeAmountWithEmpty()
+    {
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount(null));
+        $this->assertSame(null, $this->request->getServiceFeeAmount());
+    }
+
+    public function testGetServiceFeeAmountNoDecimals()
+    {
+        $this->assertSame($this->request, $this->request->setCurrency('JPY'));
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount('1366'));
+        $this->assertSame('1366', $this->request->getServiceFeeAmount());
+    }
+
+    public function testGetServiceFeeAmountNoDecimalsRounding()
+    {
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount('136.5'));
+        $this->assertSame($this->request, $this->request->setCurrency('JPY'));
+        $this->assertSame('137', $this->request->getServiceFeeAmount());
+    }
+
+    /**
+     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function testServiceFeeAmountWithIntThrowsException()
+    {
+        // ambiguous value, avoid errors upgrading from v0.9
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount(10));
+        $this->request->getServiceFeeAmount();
+    }
+
+    /**
+     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function testServiceFeeAmountWithIntStringThrowsException()
+    {
+        // ambiguous value, avoid errors upgrading from v0.9
+        $this->assertSame($this->request, $this->request->setServiceFeeAmount('10'));
+        $this->request->getServiceFeeAmount();
+    }
 }