Adding changes for 12.31.0 upgrade

Vantiv · Jul 6, 2023 · 75c84fe · 75c84fe
1 parent eabb66d
commit 75c84fe
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 = CnpOnline CHANGELOG
 
+==Version 12.31.0 (Jul 08, 2023)
+* Feature:  [cnpAPI v12.31] New element foreignRetailerIndicator of type enum added in capture, captureGivenAuth, forceCapture, sale request.
+* Change:  [cnpAPI v12.31] phpseclib is upgraded to phpseclib3 to support modern ciphers during sftp sessions.
+
 ==Version 12.30.0 (Mar 14, 2023)
 Note: It contains changes from cnpAPI v12.30 . In case you need any feature supported by cnpAPI v12.30, please use SDK version 12.30.0.
 

diff --git a/cnp/sdk/CnpOnlineRequest.php b/cnp/sdk/CnpOnlineRequest.php
@@ -225,7 +225,8 @@ public function saleRequest($hash_in)
             'productEnrolled' => XmlFields::returnArrayValue($hash_in, 'productEnrolled'),
             'decisionPurpose' => XmlFields::returnArrayValue($hash_in, 'decisionPurpose'),
             'fraudSwitchIndicator' => XmlFields::returnArrayValue($hash_in, 'fraudSwitchIndicator'),
-            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData'))
+            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData')),
+            'foreignRetailerIndicator' => XmlFields::returnArrayValue($hash_in, 'foreignRetailerIndicator')
         );
 
         $choice_hash = array($hash_out['card'], $hash_out['paypal'], $hash_out['token'], $hash_out['paypage'], $hash_out['applepay'], $hash_out['mpos']);
@@ -430,7 +431,8 @@ public function forceCaptureRequest($hash_in)
             'processingType' => XmlFields::returnArrayValue($hash_in, 'processingType'),
             'merchantCategoryCode' => XmlFields::returnArrayValue($hash_in, 'merchantCategoryCode'),
             'businessIndicator' => XmlFields::returnArrayValue($hash_in, 'businessIndicator'),
-            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData'))
+            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData')),
+            'foreignRetailerIndicator' => XmlFields::returnArrayValue($hash_in, 'foreignRetailerIndicator')
         );
 
         $choice_hash = array(XmlFields::returnArrayValue($hash_out, 'card'), XmlFields::returnArrayValue($hash_out, 'paypal'), XmlFields::returnArrayValue($hash_out, 'token'), XmlFields::returnArrayValue($hash_out, 'paypage'), XmlFields::returnArrayValue($hash_out, 'mpos'));
@@ -459,7 +461,8 @@ public function captureRequest($hash_in)
             'payPalNotes' => XmlFields::returnArrayValue($hash_in, 'payPalNotes'),
             'lodgingInfo' => XmlFields::lodgingInfo(XmlFields::returnArrayValue($hash_in, 'lodgingInfo')),
             'pin' => XmlFields::returnArrayValue($hash_in, 'pin'),
-            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData'))
+            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData')),
+            'foreignRetailerIndicator' => XmlFields::returnArrayValue($hash_in, 'foreignRetailerIndicator')
         );
         $captureResponse = $this->processRequest($hash_out, $hash_in, 'capture');
 
@@ -505,7 +508,8 @@ public function captureGivenAuthRequest($hash_in)
             'merchantCategoryCode' => XmlFields::returnArrayValue($hash_in, 'merchantCategoryCode'),
             'businessIndicator' => XmlFields::returnArrayValue($hash_in, 'businessIndicator'),
             'crypto' => XmlFields::returnArrayValue($hash_in, 'crypto'),
-            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData'))
+            'passengerTransportData' => XmlFields::passengerTransportData(XmlFields::returnArrayValue($hash_in, 'passengerTransportData')),
+            'foreignRetailerIndicator' => XmlFields::returnArrayValue($hash_in, 'foreignRetailerIndicator')
         );
 
         $choice_hash = array($hash_out['card'], $hash_out['token'], $hash_out['paypage'], $hash_out['mpos']);

diff --git a/cnp/sdk/Test/functional/AuthFunctionalTest.php b/cnp/sdk/Test/functional/AuthFunctionalTest.php
@@ -1227,7 +1227,7 @@ public function test_simple_auth_with_amount()
         $this->assertEquals('sandbox', $location);
     }
 
-    public function test_simple_auth_with_authIndicatorenum_estimated()
+    public function test_simple_auth_with_authIndicatorEnum_estimated()
     {
         $hash_in = array(
             'id' => 'id',
@@ -1259,7 +1259,7 @@ public function test_simple_auth_with_authIndicatorenum_estimated()
         $this->assertEquals('sandbox', $location);
     }
 
-    public function test_simple_auth_with_authIndicator_increamental()
+    public function test_simple_auth_with_authIndicator_incremental()
     {
         $hash_in = array(
             'id' => 'id',
@@ -1290,39 +1290,4 @@ public function test_simple_auth_with_authIndicator_increamental()
         $location = XmlParser::getNode($authorizationResponse, 'location');
         $this->assertEquals('sandbox', $location);
     }
-
-    public function test_simple_auth_with_foreignRetailerIndicatorEnum()
-    {
-        $hash_in = array(
-            'id' => 'id',
-            'orderId' => 'OnlineCust01',
-            'amount' => '1001',
-            'orderSource' => 'telephone',
-            'billToAddress' => array(
-                'name' => 'Jonathan Ross',
-                'addressLine1' => '10th Floor',
-                'addressLine2' => 'Tower 2',
-                'addressLine3' => '900 Chelmsford Street',
-                'city' => 'Lowell',
-                'state' => 'MA',
-                'zip' => '01851',
-                'country' => 'USA',
-                'email' => 'jross@litle.com<',
-                'phone' => '800-548-5326'),
-            'card' => array(
-                'type' => 'VI',
-                'number' => '4003002345678903',
-                'expDate' => '1199'),
-            'authIndicator' => 'Estimated',
-            'foreignRetailerIndicator' => 'F'
-
-        );
-        $initialize = new CnpOnlineRequest();
-        $authorizationResponse = $initialize->authorizationRequest($hash_in);
-        $message = XmlParser::getAttribute($authorizationResponse, 'cnpOnlineResponse', 'message');
-        $this->assertEquals("Valid Format", $message);
-        $location = XmlParser::getNode($authorizationResponse, 'location');
-        $this->assertEquals('sandbox', $location);
-    }
-
 }
diff --git a/cnp/sdk/Test/functional/BatchRequestFunctionalTest.php b/cnp/sdk/Test/functional/BatchRequestFunctionalTest.php
@@ -1811,7 +1811,7 @@ public function test_mechaBatchSFTP()
             'orderId'=> '2111',
             'orderSource'=>'ecommerce',
             'id'=>'654',
-            'amount'=>'123');
+            'amount'=>'1123');
         $batch->addAuth($hash_in);
 
         $hash_in = array(
@@ -1822,7 +1822,7 @@ public function test_mechaBatchSFTP()
             'id'=>'654',
             'orderId'=> '2111',
             'orderSource'=>'ecommerce',
-            'amount'=>'123');
+            'amount'=>'1123');
         $batch->addSale($hash_in);
         $request->addBatchRequest($batch);
 
@@ -2010,7 +2010,7 @@ public function test_auth_with_additionalCOFData_batch()
         $hash_in = array(
             'id'=>'0001',
             'orderId' => '82364_cnpApiAuth',
-            'amount' => '2870',
+            'amount' => '1870',
             'orderSource' => 'telephone',
             'billToAddress' => array(
                 'name' => 'David Berman A',

diff --git a/cnp/sdk/Test/functional/CnpRequestFunctionalTest.php b/cnp/sdk/Test/functional/CnpRequestFunctionalTest.php
@@ -80,7 +80,7 @@ public function test_addBatch()
         $this->assertFalse(file_exists($fn2));
 
 
-        $expected = '<batchRequestmerchantId="0180-xml10"merchantSdk="PHP;12.30.0"authAmount="0"numAuths="0"saleAmount="123"numSales="1"creditAmount="0"numCredits="0"giftCardCreditAmount="0"numGiftCardCredits="0"numTokenRegistrations="0"numTranslateToLowValueTokenRequests="0"depositTransactionReversalAmount="0"numDepositTransactionReversals="0"refundTransactionReversalAmount="0"numRefundTransactionReversals="0"captureGivenAuthAmount="0"numCaptureGivenAuths="0"forceCaptureAmount="0"numForceCaptures="0"authReversalAmount="0"numAuthReversals="0"giftCardAuthReversalOriginalAmount="0"numGiftCardAuthReversals="0"captureAmount="0"numCaptures="0"giftCardCaptureAmount="0"numGiftCardCaptures="0"echeckVerificationAmount="0"numEcheckVerification="0"echeckCreditAmount="0"numEcheckCredit="0"numEcheckRedeposit="0"echeckSalesAmount="0"numEcheckSales="0"numUpdateCardValidationNumOnTokens="0"numUpdateSubscriptions="0"numCancelSubscriptions="0"numCreatePlans="0"numUpdatePlans="0"numActivates="0"activateAmount="0"numDeactivates="0"numLoads="0"loadAmount="0"numUnloads="0"unloadAmount="0"numBalanceInquirys="0"numAccountUpdates="0"numEcheckPreNoteSale="0"numEcheckPreNoteCredit="0"submerchantCreditAmount="0"numSubmerchantCredit="0"payFacCreditAmount="0"numPayFacCredit="0"payoutOrgCreditAmount="0"numPayoutOrgCredit="0"reserveCreditAmount="0"numReserveCredit="0"vendorCreditAmount="0"numVendorCredit="0"customerCreditAmount="0"numCustomerCredit="0"physicalCheckCreditAmount="0"numPhysicalCheckCredit="0"submerchantDebitAmount="0"numSubmerchantDebit="0"payFacDebitAmount="0"numPayFacDebit="0"payoutOrgDebitAmount="0"numPayoutOrgDebit="0"reserveDebitAmount="0"numReserveDebit="0"vendorDebitAmount="0"numVendorDebit="0"customerDebitAmount="0"numCustomerDebit="0"physicalCheckDebitAmount="0"numPhysicalCheckDebit="0"numFundingInstructionVoid="0"numFastAccessFunding="0"fastAccessFundingAmount="0">
+        $expected = '<batchRequestmerchantId="0180-xml10"merchantSdk="PHP;12.31.0"authAmount="0"numAuths="0"saleAmount="123"numSales="1"creditAmount="0"numCredits="0"giftCardCreditAmount="0"numGiftCardCredits="0"numTokenRegistrations="0"numTranslateToLowValueTokenRequests="0"depositTransactionReversalAmount="0"numDepositTransactionReversals="0"refundTransactionReversalAmount="0"numRefundTransactionReversals="0"captureGivenAuthAmount="0"numCaptureGivenAuths="0"forceCaptureAmount="0"numForceCaptures="0"authReversalAmount="0"numAuthReversals="0"giftCardAuthReversalOriginalAmount="0"numGiftCardAuthReversals="0"captureAmount="0"numCaptures="0"giftCardCaptureAmount="0"numGiftCardCaptures="0"echeckVerificationAmount="0"numEcheckVerification="0"echeckCreditAmount="0"numEcheckCredit="0"numEcheckRedeposit="0"echeckSalesAmount="0"numEcheckSales="0"numUpdateCardValidationNumOnTokens="0"numUpdateSubscriptions="0"numCancelSubscriptions="0"numCreatePlans="0"numUpdatePlans="0"numActivates="0"activateAmount="0"numDeactivates="0"numLoads="0"loadAmount="0"numUnloads="0"unloadAmount="0"numBalanceInquirys="0"numAccountUpdates="0"numEcheckPreNoteSale="0"numEcheckPreNoteCredit="0"submerchantCreditAmount="0"numSubmerchantCredit="0"payFacCreditAmount="0"numPayFacCredit="0"payoutOrgCreditAmount="0"numPayoutOrgCredit="0"reserveCreditAmount="0"numReserveCredit="0"vendorCreditAmount="0"numVendorCredit="0"customerCreditAmount="0"numCustomerCredit="0"physicalCheckCreditAmount="0"numPhysicalCheckCredit="0"submerchantDebitAmount="0"numSubmerchantDebit="0"payFacDebitAmount="0"numPayFacDebit="0"payoutOrgDebitAmount="0"numPayoutOrgDebit="0"reserveDebitAmount="0"numReserveDebit="0"vendorDebitAmount="0"numVendorDebit="0"customerDebitAmount="0"numCustomerDebit="0"physicalCheckDebitAmount="0"numPhysicalCheckDebit="0"numFundingInstructionVoid="0"numFastAccessFunding="0"fastAccessFundingAmount="0">
         <sale reportGroup="Planets" id="1211"><orderId>2111</orderId><amount>123</amount><orderSource>ecommerce</orderSource>
         <card><type>VI</type><number>4100000000000000</number><expDate>1213</expDate><cardValidationNum>1213</cardValidationNum></card></sale>
         </batchRequest>';
@@ -117,7 +117,7 @@ public function test_addRFRRequest()
             'cnpSessionId' => '8675309'
         ));
 
-        $expected = '<cnpRequest numBatchRequests="0" version="12.30" xmlns="http://www.vantivcnp.com/schema">
+        $expected = '<cnpRequest numBatchRequests="0" version="12.31" xmlns="http://www.vantivcnp.com/schema">
                     <authentication><user>XXXXXX</user><password>XXXXXX</password></authentication>
                     <RFRRequest><cnpSessionId>8675309</cnpSessionId></RFRRequest>
                     </cnpRequest>';
@@ -169,10 +169,10 @@ public function test_closeRequest()
         $this->assertFalse(file_exists($fn1));
         $this->assertTrue(file_exists($request->request_file));
 
-        $expected = '<cnpRequest numBatchRequests="1" version="12.30" xmlns="http://www.vantivcnp.com/schema">
+        $expected = '<cnpRequest numBatchRequests="1" version="12.31" xmlns="http://www.vantivcnp.com/schema">
         <authentication><user>XXXXX</user><password>XXXXX</password></authentication>
 
-        <batchRequestmerchantId="0180-xml10"merchantSdk="PHP;12.30.0"authAmount="0"numAuths="0"saleAmount="123"numSales="1"creditAmount="0"numCredits="0"giftCardCreditAmount="0"numGiftCardCredits="0"numTokenRegistrations="0"numTranslateToLowValueTokenRequests="0"depositTransactionReversalAmount="0"numDepositTransactionReversals="0"refundTransactionReversalAmount="0"numRefundTransactionReversals="0"captureGivenAuthAmount="0"numCaptureGivenAuths="0"forceCaptureAmount="0"numForceCaptures="0"authReversalAmount="0"numAuthReversals="0"giftCardAuthReversalOriginalAmount="0"numGiftCardAuthReversals="0"captureAmount="0"numCaptures="0"giftCardCaptureAmount="0"numGiftCardCaptures="0"echeckVerificationAmount="0"numEcheckVerification="0"echeckCreditAmount="0"numEcheckCredit="0"numEcheckRedeposit="0"echeckSalesAmount="0"numEcheckSales="0"numUpdateCardValidationNumOnTokens="0"numUpdateSubscriptions="0"numCancelSubscriptions="0"numCreatePlans="0"numUpdatePlans="0"numActivates="0"activateAmount="0"numDeactivates="0"numLoads="0"loadAmount="0"numUnloads="0"unloadAmount="0"numBalanceInquirys="0"numAccountUpdates="0"numEcheckPreNoteSale="0"numEcheckPreNoteCredit="0"submerchantCreditAmount="0"numSubmerchantCredit="0"payFacCreditAmount="0"numPayFacCredit="0"payoutOrgCreditAmount="0"numPayoutOrgCredit="0"reserveCreditAmount="0"numReserveCredit="0"vendorCreditAmount="0"numVendorCredit="0"customerCreditAmount="0"numCustomerCredit="0"physicalCheckCreditAmount="0"numPhysicalCheckCredit="0"submerchantDebitAmount="0"numSubmerchantDebit="0"payFacDebitAmount="0"numPayFacDebit="0"payoutOrgDebitAmount="0"numPayoutOrgDebit="0"reserveDebitAmount="0"numReserveDebit="0"vendorDebitAmount="0"numVendorDebit="0"customerDebitAmount="0"numCustomerDebit="0"physicalCheckDebitAmount="0"numPhysicalCheckDebit="0"numFundingInstructionVoid="0"numFastAccessFunding="0"fastAccessFundingAmount="0">
+        <batchRequestmerchantId="0180-xml10"merchantSdk="PHP;12.31.0"authAmount="0"numAuths="0"saleAmount="123"numSales="1"creditAmount="0"numCredits="0"giftCardCreditAmount="0"numGiftCardCredits="0"numTokenRegistrations="0"numTranslateToLowValueTokenRequests="0"depositTransactionReversalAmount="0"numDepositTransactionReversals="0"refundTransactionReversalAmount="0"numRefundTransactionReversals="0"captureGivenAuthAmount="0"numCaptureGivenAuths="0"forceCaptureAmount="0"numForceCaptures="0"authReversalAmount="0"numAuthReversals="0"giftCardAuthReversalOriginalAmount="0"numGiftCardAuthReversals="0"captureAmount="0"numCaptures="0"giftCardCaptureAmount="0"numGiftCardCaptures="0"echeckVerificationAmount="0"numEcheckVerification="0"echeckCreditAmount="0"numEcheckCredit="0"numEcheckRedeposit="0"echeckSalesAmount="0"numEcheckSales="0"numUpdateCardValidationNumOnTokens="0"numUpdateSubscriptions="0"numCancelSubscriptions="0"numCreatePlans="0"numUpdatePlans="0"numActivates="0"activateAmount="0"numDeactivates="0"numLoads="0"loadAmount="0"numUnloads="0"unloadAmount="0"numBalanceInquirys="0"numAccountUpdates="0"numEcheckPreNoteSale="0"numEcheckPreNoteCredit="0"submerchantCreditAmount="0"numSubmerchantCredit="0"payFacCreditAmount="0"numPayFacCredit="0"payoutOrgCreditAmount="0"numPayoutOrgCredit="0"reserveCreditAmount="0"numReserveCredit="0"vendorCreditAmount="0"numVendorCredit="0"customerCreditAmount="0"numCustomerCredit="0"physicalCheckCreditAmount="0"numPhysicalCheckCredit="0"submerchantDebitAmount="0"numSubmerchantDebit="0"payFacDebitAmount="0"numPayFacDebit="0"payoutOrgDebitAmount="0"numPayoutOrgDebit="0"reserveDebitAmount="0"numReserveDebit="0"vendorDebitAmount="0"numVendorDebit="0"customerDebitAmount="0"numCustomerDebit="0"physicalCheckDebitAmount="0"numPhysicalCheckDebit="0"numFundingInstructionVoid="0"numFastAccessFunding="0"fastAccessFundingAmount="0">
         <sale reportGroup="Planets" id="1211"><orderId>2111</orderId><amount>123</amount><orderSource>ecommerce</orderSource>
         <card><type>VI</type><number>4100000000000000</number><expDate>1213</expDate><cardValidationNum>1213</cardValidationNum></card></sale>
         </batchRequest>

diff --git a/cnp/sdk/Test/unit/AuthUnitTest.php b/cnp/sdk/Test/unit/AuthUnitTest.php
@@ -552,40 +552,4 @@ public function test_auth_amount()
         $cnpTest->newXML = $mock;
         $cnpTest->authorizationRequest($hash_in);
     }
-    public function test_auth_foreignRetailerIndicatorEnum()
-    {
-        $hash_in = array(
-            'id' => 'id',
-            'orderId' => 'OnlineCust01',
-            'amount' => '1001',
-            'orderSource' => 'telephone',
-            'billToAddress' => array(
-                'name' => 'Jonathan Ross',
-                'addressLine1' => '10th Floor',
-                'addressLine2' => 'Tower 2',
-                'addressLine3' => '900 Chelmsford Street',
-                'city' => 'Lowell',
-                'state' => 'MA',
-                'zip' => '01851',
-                'country' => 'USA',
-                'email' => 'jross@litle.com<',
-                'phone' => '800-548-5326'),
-            'card' => array(
-                'type' => 'VI',
-                'number' => '4003002345678903',
-                'expDate' => '1199'),
-            'authIndicator' => 'Estimated',
-            'foreignRetailerIndicator' => 'F'
-
-        );
-        $mock = $this->getMock('cnp\sdk\CnpXmlMapper');
-        $mock->expects($this->once())
-            ->method('request')
-            ->with($this->matchesRegularExpression('/.*<authIndicator>Estimated.*/'));
-
-        $cnpTest = new CnpOnlineRequest();
-        $cnpTest->newXML = $mock;
-        $cnpTest->authorizationRequest($hash_in);
-    }
-
 }
diff --git a/cnp/sdk/Test/unit/CaptureGivenAuthUnitTest.php b/cnp/sdk/Test/unit/CaptureGivenAuthUnitTest.php
@@ -550,14 +550,12 @@ public function test_capture_given_auth_with_foreignRetailerIndicator()
                     'originCity' =>'BOS')
             ),                
             'foreignRetailerIndicator' => 'F'
-
         );
 
         $mock = $this->getMock('cnp\sdk\CnpXmlMapper');
         $mock	->expects($this->once())
             ->method('request')
-            ->with($this->matchesRegularExpression('/.*<passengerName>Mrs. Huxley234567890123456789.*<ticketNumber>ATL456789012345.*<exchangeAmount>500046.*<serviceClass>First.*<originCity>BOS.*/'));
-
+            ->with($this->matchesRegularExpression('/.*<foreignRetailerIndicator>F.*/'));
         $cnpTest = new CnpOnlineRequest();
         $cnpTest->newXML = $mock;
         $cnpTest->captureGivenAuthRequest($hash_in);

diff --git a/cnp/sdk/Test/unit/CaptureUnitTest.php b/cnp/sdk/Test/unit/CaptureUnitTest.php
@@ -217,11 +217,10 @@ public function test_capture_with_foreignRetailerIndicator()
         $mock = $this->getMock('cnp\sdk\CnpXmlMapper');
         $mock	->expects($this->once())
             ->method('request')
-            ->with($this->matchesRegularExpression('/.*<passengerName>Mrs. Huxley234567890123456789.*<ticketNumber>ATL456789012345.*<exchangeAmount>500046.*<serviceClass>First.*<originCity>BOS.*/'));
+            ->with($this->matchesRegularExpression('/.*<foreignRetailerIndicator>F.*/'));
 
         $cnpTest = new CnpOnlineRequest();
         $cnpTest->newXML = $mock;
         $cnpTest->captureRequest($hash_in);
     }
-
 }
diff --git a/cnp/sdk/Test/unit/ForceCaptureUnitTest.php b/cnp/sdk/Test/unit/ForceCaptureUnitTest.php
@@ -452,7 +452,7 @@ public function test_forceCapture_with_foreignRetailerIndicator()
         $mock = $this->getMock('cnp\sdk\CnpXmlMapper');
         $mock	->expects($this->once())
             ->method('request')
-            ->with($this->matchesRegularExpression('/.*<passengerName>Mrs. Huxley234567890123456789.*<ticketNumber>ATL456789012345.*<exchangeAmount>500046.*<serviceClass>First.*<originCity>BOS.*/'));
+            ->with($this->matchesRegularExpression('/.*<foreignRetailerIndicator>F.*/'));
 
         $cnpTest = new CnpOnlineRequest();
         $cnpTest->newXML = $mock;