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

Avs check add required fields + some fixes #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Avs check add required fields + some fixes #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9880b22
Billing Typo in RealexConnector.ts
thedoktor Jun 21, 2019
cf5cb46
handle html error page
Sep 16, 2019
8818cee
added shipping and billing code to process avs with realex
Sep 17, 2019
223496c
fixed number format unwanted decimals issue with toFixed
Sep 25, 2019
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
46 changes: 39 additions & 7 deletions src/Gateways/RealexConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
request.SHIPPING_CODE = encoder(builder.shippingAddress.postalCode || "");
request.SHIPPING_CO = encoder(builder.shippingAddress.country || "");
}
if (builder.sillingAddress) {
if (builder.billingAddress) {
request.BILLING_CODE = encoder(builder.billingAddress.postalCode || "");
request.BILLING_CO = encoder(builder.billingAddress.country || "");
}
Expand Down Expand Up @@ -431,6 +431,22 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
cData(builder.reasonCode.toString()),
);
}
if (builder.shippingAddress) {
subElement(request, "shipping_code").append(
cData(builder.shippingAddress.shipping_code || builder.shippingAddress.postalCode || "")
);
subElement(request, "shipping_co").append(
cData(builder.shippingAddress.country || "")
);
}
if (builder.billingAddress) {
subElement(request, "billing_code").append(
cData(builder.billingAddress.billing_code || builder.billingAddress.postalCode || "")
);
subElement(request, "billing_co").append(
cData(builder.billingAddress.country || "")
);
}

if (builder.description) {
const comments = subElement(request, "comments");
Expand Down Expand Up @@ -614,7 +630,9 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
const result = new Transaction();
const root = xml(rawResponse);

this.checkResponse(root);
var r=this.checkResponse(rawResponse,root);
result.responseCode = r.code;
result.responseMessage = r.message;

result.responseCode = root.findtext(".//result");
result.responseMessage = root.findtext(".//message");
Expand All @@ -636,17 +654,23 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
) {
const root = xml(rawResponse);

this.checkResponse(root);
this.checkResponse(rawResponse,root);
return builder.entity as T;
}

protected checkResponse(root: Element, acceptedCodes?: string[]) {
protected checkResponse(rawResponse: string,root: Element, acceptedCodes?: string[]) {
if (!acceptedCodes) {
acceptedCodes = ["00"];
}

const responseCode = root.findtext(".//result");
const responseMessage = root.findtext(".//message");
var responseCode = root.findtext(".//result");
var responseMessage = root.findtext(".//message");
if(!responseCode){
var _rc=rawResponse.match('error_code">([0-9]+)</');
if(_rc && _rc.length) responseCode=_rc[1];
var _rm=rawResponse.match('error_message">([0-9a-zA-Z\-\._\ ]+)</');
if(_rm && _rm.length) responseMessage =_rm[1];
}

if (acceptedCodes.indexOf(responseCode) === -1) {
throw new GatewayError(
Expand All @@ -655,6 +679,10 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
responseMessage,
);
}
return {
code:responseCode,
message:responseMessage
}
}

protected generateHash(
Expand Down Expand Up @@ -767,9 +795,13 @@ export class RealexConnector extends XmlGateway implements IRecurringService {
throw new UnsupportedTransactionError();
}
}

protected numberFormat(amount: number | string) {
<<<<<<< Updated upstream
const f = parseFloat(amount.toString());
return (parseFloat(f.toFixed(2)) * 100).toString();
=======
const f = parseFloat(amount.toString()) * 100;
return parseInt(f.toString()).toString();
>>>>>>> Stashed changes
}
}