Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor Upgrade to Generation Script + 12.18 #22

Open
wants to merge 6 commits into
base: 12.x
Choose a base branch
from
Open

Minor Upgrade to Generation Script + 12.18 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23cdf3f
updated preGen to ignore duplicated elements
kmgreg Nov 18, 2020
c9ddf7a
simplify regex
Nov 18, 2020
39110a1
first pass of switching to xsData
kmgreg Nov 27, 2020
3f8426d
Revert "first pass of switching to xsData"
kmgreg Nov 27, 2020
a04419f
12.18 upgrade
kmgreg Dec 17, 2020
f62d1df
Merge branch '12.x' of https://github.com/kmgreg/vantiv-sdk-for-pytho…
kmgreg Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
= Vantiv eCommerce Python SDK

==Version 12.18.0 (December 17, 2020)
* Feature: orderId field in transaction types now supports lengths up to 64 characters

==Version 12.17.0 (October 27, 2020)
* Feature: Added optional element, businessIndicator, in authorization, sale, credit, forceCapture, and
captureGivenAuthTransactions
Expand Down
113 changes: 1 addition & 112 deletions SchemaCombined_v12.17.xsd → SchemaCombined_v12.18.xsd
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@






<xs:complexType name="contact">
Expand Down Expand Up @@ -3592,124 +3593,12 @@
</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>
<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="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: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="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:echeckType" />
<xs:element name="customIdentifier" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:choice>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>-->


</xs:schema>
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Vantiv eCommerce Python SDK 12.17.0!
Vantiv eCommerce Python SDK 12.18.0!
====================================
.. toctree::
:maxdepth: 2
Expand Down
10 changes: 5 additions & 5 deletions schema/cnpBatch_v12.17.xsd → schema/cnpBatch_v12.18.xsd
View file
Open in desktop
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.17.xsd" />
<xs:include schemaLocation="cnpTransaction_v12.18.xsd" />

<xs:element name="cnpRequest">
<xs:complexType>
Expand Down Expand Up @@ -129,7 +129,7 @@
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:all>
<xs:element name="orderId" type="xp:string25Type" />
<xs:element name="orderId" type="xp:string256Type" />
<xs:element ref="xp:cardOrToken" />
</xs:all>
</xs:extension>
Expand Down Expand Up @@ -177,7 +177,7 @@
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:all>
<xs:element name="cnpTxnId" type="xp:cnpIdType" />
<xs:element name="orderId" type="xp:string25Type" />
<xs:element name="orderId" type="xp:string256Type" />
<xs:element name="response" type="xp:responseType" />
<xs:element name="responseTime" type="xs:dateTime" />
<xs:element name="message" type="xp:messageType" />
Expand Down Expand Up @@ -226,7 +226,7 @@
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:sequence>
<xs:element name="orderId" type="xp:string25Type" />
<xs:element name="orderId" type="xp:string256Type" />
<xs:element name="orderSource" type="xp:orderSourceType" />
<xs:element ref="xp:billToAddress" />
<xs:element name="echeck" type="xp:echeckType"/>
Expand All @@ -242,7 +242,7 @@
<xs:complexContent>
<xs:extension base="xp:transactionTypeWithReportGroup">
<xs:sequence>
<xs:element name="orderId" type="xp:string25Type" />
<xs:element name="orderId" type="xp:string256Type" />
<xs:element name="orderSource" type="xp:orderSourceType" />
<xs:element ref="xp:billToAddress" />
<xs:element name="echeck" type="xp:echeckType"/>
Expand Down
6 changes: 6 additions & 0 deletions schema/cnpCommon_v12.17.xsd → schema/cnpCommon_v12.18.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="string64Type">
<xs:restriction base="xs:string">
<xs:maxLength value="64" />
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="string80Type">
<xs:restriction base="xs:string">
<xs:maxLength value="80" />
Expand Down
6 changes: 3 additions & 3 deletions schema/cnpOnline_v12.17.xsd → schema/cnpOnline_v12.18.xsd
View file
Open in desktop
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.17.xsd" />
<xs:include schemaLocation="cnpTransaction_v12.18.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>
2 changes: 1 addition & 1 deletion schema/cnpRecurring_v12.17.xsd → schema/cnpRecurring_v12.18.xsd
View file
Open in desktop
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.17.xsd" />
<xs:include schemaLocation="cnpCommon_v12.18.xsd" />

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