Skip to content

Commit

Permalink
Merge pull request #21 from d685shvarts/12.17
Browse files Browse the repository at this point in the history
12.17
  • Loading branch information
VantivSDK committed Oct 27, 2020
2 parents bb12163 + b3b2dcf commit c4877d3
Show file tree
Hide file tree
Showing 18 changed files with 7,662 additions and 7,036 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
= Vantiv eCommerce Python SDK

==Version 12.17.0 (October 27, 2020)
* Feature: Added optional element, businessIndicator, in authorization, sale, credit, forceCapture, and
captureGivenAuthTransactions

==Version 12.16.0 (October 12, 2020)
* Feature: Added a new transaction type: transactionReversal

Expand Down
134 changes: 133 additions & 1 deletion SchemaCombined_v12.16.xsd → SchemaCombined_v12.17.xsd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@









Expand Down Expand Up @@ -581,6 +584,7 @@
<xs:element name="pinlessDebitRequest" type="xp:pinlessDebitRequestType" minOccurs="0"/>
<xs:element name="skipRealtimeAU" type="xs:boolean" minOccurs="0" />
<xs:element name="merchantCategoryCode" type="xs:string" minOccurs="0" />
<xs:element name="businessIndicator" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
Expand Down Expand Up @@ -687,6 +691,7 @@
<xs:element name="debtRepayment" type="xs:boolean" minOccurs="0" />
<xs:element name="processingType" type="xs:string" minOccurs="0" />
<xs:element name="merchantCategoryCode" type="xs:string" minOccurs="0" />
<xs:element name="businessIndicator" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down Expand Up @@ -724,6 +729,7 @@
<xs:element name="originalNetworkTransactionId" type="xs:string" minOccurs="0" />
<xs:element name="originalTransactionAmount" type="xs:integer" minOccurs="0" />
<xs:element name="merchantCategoryCode" type="xs:string" minOccurs="0" />
<xs:element name="businessIndicator" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down Expand Up @@ -788,6 +794,7 @@
<xs:element name="pinlessDebitRequest" type="xp:pinlessDebitRequestType" minOccurs="0"/>
<xs:element name="skipRealtimeAU" type="xs:boolean" minOccurs="0" />
<xs:element name="merchantCategoryCode" type="xs:string" minOccurs="0" />
<xs:element name="businessIndicator" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down Expand Up @@ -839,6 +846,7 @@
</xs:choice>
<xs:element name="payPalNotes" type="xs:string" minOccurs="0" />
<xs:element name="actionReason" type="xs:string" minOccurs="0" />
<xs:element name="businessIndicator" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down Expand Up @@ -1196,6 +1204,10 @@







<xs:complexType name="recycleAdviceType">
<xs:choice>
<xs:element name="nextRecycleTime" type="xs:dateTime" />
Expand Down Expand Up @@ -3220,6 +3232,64 @@
</xs:complexType>
</xs:element>

<xs:element name="submerchantDebit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:element name="fundingSubmerchantId" type="xs:string" />
<xs:element name="submerchantName" type="xs:string"/>
<xs:element name="fundsTransferId" type="xs:string" />
<xs:element name="amount" type="xs:integer" />
<xs:element name="accountInfo" type="xp:echeckTypeCtx" />
<xs:element name="customIdentifier" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>

<xs:element name="customerCredit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:element name="fundingCustomerId" type="xs:string" />
<xs:element name="customerName" type="xs:string"/>
<xs:element name="fundsTransferId" type="xs:string" />
<xs:element name="amount" type="xs:integer" />
<xs:element name="accountInfo" type="xp:echeckTypeCtx" />
<xs:element name="customIdentifier" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>

<xs:element name="customerDebit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:element name="fundingCustomerId" type="xs:string" />
<xs:element name="customerName" type="xs:string"/>
<xs:element name="fundsTransferId" type="xs:string" />
<xs:element name="amount" type="xs:integer" />
<xs:element name="accountInfo" type="xp:echeckTypeCtx" />
<xs:element name="customIdentifier" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>





Expand Down Expand Up @@ -3522,6 +3592,68 @@
</xs:complexType>
</xs:element>

<!--<xs:element name="vendorCredit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:choice>
<xs:element name="fundingCustomerId" type="xs:string" />
<xs:element name="fundingSubmerchantId" type="xs:string" />
</xs:choice>
<xs:element name="vendorName" type="xs:string" minOccurs="0"/>
<xs:element name="fundsTransferId" type="xs:string" minOccurs="0"/>
<xs:element name="amount" type="xs:integer" minOccurs="0"/>
<xs:element name="accountInfo" type="xp:echeckType" minOccurs="0"/>
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="vendorDebit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:choice>
<xs:element name="fundingCustomerId" type="xs:string" />
<xs:element name="fundingSubmerchantId" type="xs:string" />
</xs:choice>
<xs:element name="vendorName" type="xs:string" minOccurs="0"/>
<xs:element name="fundsTransferId" type="xs:string" minOccurs="0"/>
<xs:element name="amount" type="xs:integer" minOccurs="0"/>
<xs:element name="accountInfo" type="xp:echeckType" minOccurs="0"/>
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="submerchantCredit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:choice>
<xs:sequence>
<xs:element name="fundingSubmerchantId" type="xs:string" />
<xs:element name="submerchantName" type="xs:string"/>
<xs:element name="fundsTransferId" type="xs:string" />
<xs:element name="amount" type="xs:integer" />
<xs:element name="accountInfo" type="xp:echeckType" />
<xs:element name="customIdentifier" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="submerchantDebit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
Expand Down Expand Up @@ -3577,7 +3709,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:element>-->


</xs:schema>
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Vantiv eCommerce Python SDK 12.16.0!
Vantiv eCommerce Python SDK 12.17.0!
====================================
.. toctree::
:maxdepth: 2
Expand Down
11 changes: 8 additions & 3 deletions docs/source/transactions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ authorization
:var amount: String or Number
:var applepay: instance of :py:class:`vantivsdk.fields.applepayType`
:var billToAddress: instance of :py:class:`vantivsdk.fields.billToAddress`
:var businessIndicator: String or Number
:var card: instance of :py:class:`vantivsdk.fields.cardType`
:var cardholderAuthentication: instance of :py:class:`vantivsdk.fields.fraudCheckType`
:var cnpTxnId: String or Number
Expand Down Expand Up @@ -142,6 +143,7 @@ captureGivenAuth
:var amount: String or Number
:var authInformation: instance of :py:class:`vantivsdk.fields.authInformation`
:var billToAddress: instance of :py:class:`vantivsdk.fields.billToAddress`
:var businessIndicator: String or Number
:var card: instance of :py:class:`vantivsdk.fields.cardType`
:var customBilling: instance of :py:class:`vantivsdk.fields.customBilling`
:var customerId: String or Number
Expand Down Expand Up @@ -188,6 +190,7 @@ credit
:var actionReason: String or Number
:var amount: String or Number
:var billToAddress: instance of :py:class:`vantivsdk.fields.billToAddress`
:var businessIndicator: String or Number
:var card: instance of :py:class:`vantivsdk.fields.cardType`
:var cnpTxnId: String or Number
:var customBilling: instance of :py:class:`vantivsdk.fields.customBilling`
Expand Down Expand Up @@ -216,7 +219,7 @@ customerCredit
--------------
.. py:class:: vantivsdk.fields.customerCredit
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckType`
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckTypeCtx`
:var amount: String or Number
:var customIdentifier: String or Number
:var customerId: String or Number
Expand All @@ -230,7 +233,7 @@ customerDebit
-------------
.. py:class:: vantivsdk.fields.customerDebit
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckType`
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckTypeCtx`
:var amount: String or Number
:var customIdentifier: String or Number
:var customerId: String or Number
Expand Down Expand Up @@ -407,6 +410,7 @@ forceCapture
:var amount: String or Number
:var billToAddress: instance of :py:class:`vantivsdk.fields.billToAddress`
:var businessIndicator: String or Number
:var card: instance of :py:class:`vantivsdk.fields.cardType`
:var customBilling: instance of :py:class:`vantivsdk.fields.customBilling`
:var customerId: String or Number
Expand Down Expand Up @@ -669,6 +673,7 @@ sale
:var amount: String or Number
:var applepay: instance of :py:class:`vantivsdk.fields.applepayType`
:var billToAddress: instance of :py:class:`vantivsdk.fields.billToAddress`
:var businessIndicator: String or Number
:var card: instance of :py:class:`vantivsdk.fields.cardType`
:var cardholderAuthentication: instance of :py:class:`vantivsdk.fields.fraudCheckType`
:var cnpInternalRecurringRequest: instance of :py:class:`vantivsdk.fields.cnpInternalRecurringRequestType`
Expand Down Expand Up @@ -742,7 +747,7 @@ submerchantDebit
----------------
.. py:class:: vantivsdk.fields.submerchantDebit
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckType`
:var accountInfo: instance of :py:class:`vantivsdk.fields.echeckTypeCtx`
:var amount: String or Number
:var customIdentifier: String or Number
:var customerId: String or Number
Expand Down
2 changes: 1 addition & 1 deletion schema/cnpBatch_v12.16.xsd → schema/cnpBatch_v12.17.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<xs:schema targetNamespace="http://www.vantivcnp.com/schema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xp="http://www.vantivcnp.com/schema" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:include schemaLocation="cnpTransaction_v12.16.xsd" />
<xs:include schemaLocation="cnpTransaction_v12.17.xsd" />

<xs:element name="cnpRequest">
<xs:complexType>
Expand Down
8 changes: 8 additions & 0 deletions schema/cnpCommon_v12.16.xsd → schema/cnpCommon_v12.17.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="businessIndicatorEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="consumerBillPayment" />
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="transactionAmountType">
<xs:restriction base="xs:integer">
<xs:totalDigits value="12" />
Expand Down Expand Up @@ -247,6 +253,8 @@
</xs:restriction>
</xs:simpleType>



<xs:simpleType name="countryTypeEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="USA" />
Expand Down
6 changes: 3 additions & 3 deletions schema/cnpOnline_v12.16.xsd → schema/cnpOnline_v12.17.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<xs:schema targetNamespace="http://www.vantivcnp.com/schema" xmlns:xp="http://www.vantivcnp.com/schema"
xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:include schemaLocation="cnpTransaction_v12.16.xsd" />
<xs:include schemaLocation="cnpTransaction_v12.17.xsd" />

<xs:complexType name="baseRequest">
<xs:sequence>
Expand Down Expand Up @@ -304,7 +304,7 @@
</xs:complexType>
</xs:element>

<xs:element name="vendorCredit" substitutionGroup="xp:transaction">
<!--<xs:element name="vendorCredit" substitutionGroup="xp:transaction">
<xs:complexType>
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
Expand Down Expand Up @@ -421,6 +421,6 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:element>-->

</xs:schema>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<xs:schema targetNamespace="http://www.vantivcnp.com/schema" xmlns:xp="http://www.vantivcnp.com/schema"
xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:include schemaLocation="cnpCommon_v12.16.xsd" />
<xs:include schemaLocation="cnpCommon_v12.17.xsd" />

<xs:element name="recurringTransaction" type="xp:recurringTransactionType" abstract="true" />
<xs:element name="recurringTransactionResponse" type="xp:recurringTransactionResponseType" abstract="true" />
Expand Down

0 comments on commit c4877d3

Please sign in to comment.