Skip to content

Commit fe5f59a

Browse files
committed
Merge branch 'master' of github.com:thephpleague/omnipay-sagepay
2 parents cf4d540 + af116fd commit fe5f59a

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

README.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ $creditCard = new CreditCard([
311311
* The country must be a two-character ISO 3166 code.
312312
* The state will be a two-character ISO code, and is mandatory if the country is "US".
313313
* The state will be ignored if the country is not "US".
314-
* Adddress2 is optional, but all other fields are mandatory.
314+
* Address2 is optional, but all other fields are mandatory.
315315
* The postcode is optional for Republic of Ireland "IE",
316316
though *some* banks insist it is present and valid.
317317
* This gateway lives on an extended ASCII ISO 8859-1 back end.
@@ -599,15 +599,19 @@ The `$nextUrl` is where you want Sage Pay to send the user to next.
599599
It will often be the same URL whether the transaction was approved or not,
600600
since the result will be safely saved in the database.
601601

602-
The `confirm()`, `error()` and `reject()` methods will all exit the
602+
The `confirm()`, `error()` and `reject()` methods will all echo the expected
603+
return payload and expect your application to return a HTTP Status `200`
604+
without adding any further content.
605+
606+
These functions used to exit the
603607
application immediately to prevent additional output being added to
604-
the response. You can disable this by setting the `exitOnResponse`
608+
the response. You can restore this functionality by setting the `exitOnResponse`
605609
option:
606610

607611
```php
608-
$gateway->setExitOnResponse(false);
612+
$gateway->setExitOnResponse(true);
609613
// or
610-
$notifyRequest->setExitOnResponse(false);
614+
$notifyRequest->setExitOnResponse(true);
611615
```
612616

613617
If you just want the body payload, this method will return it without
@@ -688,7 +692,7 @@ method to reserve the amount.
688692
### Form completeAuthorize
689693

690694
To get the result details, the transaction is "completed" on the
691-
user's return. This wil be at your `returnUrl` endpoint:
695+
user's return. This will be at your `returnUrl` endpoint:
692696

693697
```php
694698
// The result will be read and decrypted from the return URL (or failure URL)
@@ -744,13 +748,13 @@ admin panel.
744748
* `abort()` - abort an authorization before it is captured
745749
* `repeatAuthorize()` - new authorization based on past transaction
746750
* `repeatPurchase()` - new purchase based on past transaction
747-
* `deleteCard()` - remove a cardReference or token from the accout
751+
* `deleteCard()` - remove a cardReference or token from the account
748752

749753
### Repeat Authorize/Purchase
750754

751755
An authorization or purchase can be created from a past authorization or purchase.
752-
You will need the `transactionReference` of the original transation.
753-
The `transactionReference` will be a JSON string containing the four peices of
756+
You will need the `transactionReference` of the original transaction.
757+
The `transactionReference` will be a JSON string containing the four pieces of
754758
information the gateway needs to reuse the transaction.
755759

756760
```php
@@ -1007,7 +1011,7 @@ If you are having general issues with Omnipay, we suggest posting on
10071011
[Stack Overflow](http://stackoverflow.com/). Be sure to add the
10081012
[omnipay tag](http://stackoverflow.com/questions/tagged/omnipay) so it can be easily found.
10091013

1010-
If you want to keep up to date with release anouncements, discuss ideas for the project,
1014+
If you want to keep up to date with release announcements, discuss ideas for the project,
10111015
or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which
10121016
you can subscribe to.
10131017

src/Message/Form/AuthorizeRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function getCryptData()
100100
}
101101

102102
if ($this->getVendorEmail() !== null) {
103-
$data['VendorEmail'] = $this->getVendorEmail();
103+
$data['VendorEMail'] = $this->getVendorEmail();
104104
}
105105

106106
if ($this->getEmailMessage() !== null) {
@@ -124,7 +124,7 @@ public function getCryptData()
124124
$sendEmail = static::SEND_EMAIL_BOTH;
125125
}
126126

127-
$data['SendEmail'] = $this->getSendEmail();
127+
$data['SendEMail'] = $this->getSendEmail();
128128
}
129129

130130
$data['SuccessURL'] = $this->getReturnUrl();

0 commit comments

Comments
 (0)