Skip to content

Commit e64092b

Browse files
authored
Merge pull request #61 from umbraco/feature/emerchantpay-package-readme
Package readme & fix Approve bool parse
2 parents a78782d + 74ebaf1 commit e64092b

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public override WorkflowExecutionStatus Execute(Record record, RecordEventArgs e
187187
TransactionId = transactionId.ToString(),
188188
Usage = _paymentProviderSettings.Usage,
189189
NotificationUrl = $"{_paymentProviderSettings.UmbracoBaseUrl}umbraco/api/paymentprovider/notifypayment" +
190-
$"?formId={formId}&recordUniqueId={recordUniqueId}&statusFieldId={statusKey}&approve={bool.Parse(Approve)}",
190+
$"?formId={formId}&recordUniqueId={recordUniqueId}&statusFieldId={statusKey}&approve={(bool.TryParse(Approve, out bool approve) ? approve : false)}",
191191
ReturnSuccessUrl = _urlHelper.GetPageUrl(int.Parse(SuccessUrl)),
192192
ReturnFailureUrl = _urlHelper.GetPageUrl(int.Parse(FailureUrl)),
193193
ReturnCancelUrl = _urlHelper.GetPageUrl(int.Parse(CancelUrl)),

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Umbraco.Forms.Integrations.Commerce.EMerchantPay.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
<PackageIconUrl></PackageIconUrl>
1212
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
14-
<Version>1.0.1</Version>
14+
<Version>1.0.2</Version>
1515
<Authors>Umbraco HQ</Authors>
1616
<Company>Umbraco</Company>
1717
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
1818
<PackageIcon>emerchantpay.png</PackageIcon>
19+
<PackageReadmeFile>readme.md</PackageReadmeFile>
1920
</PropertyGroup>
2021

2122
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
@@ -44,6 +45,10 @@
4445
<PackagePath>\</PackagePath>
4546
</Content>
4647
</ItemGroup>
48+
49+
<ItemGroup>
50+
<None Include="readme.md" Pack="true" PackagePath="\"/>
51+
</ItemGroup>
4752

4853
<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
4954
<ItemGroup>

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<info>
44
<package>
55
<name>Umbraco.Forms.Integrations.Commerce.emerchantpay</name>
6-
<version>1.0.1</version>
6+
<version>1.0.2</version>
77
<iconUrl></iconUrl>
88
<licence url="https://opensource.org/licenses/MIT">MIT</licence>
99
<url>https://github.com/umbraco/Umbraco.Forms.Integrations</url>

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/readme.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ Required minimum versions of Umbraco CMS:
1010

1111
## How To Use
1212

13+
To get started with _emerchantpay_ a merchant would need to be onboarded in order to get a merchant ID and obtain the keys
14+
required by the integration.
15+
16+
To begin the onboarding process an obtain the merchant account, you would need to fill out [this](https://www.emerchantpay.com/contact-us?utm_source__c=umbraco_referral&utm_medium__c=technical_blog&utm_campaign__c=Umbraco) form.
17+
Afterwards, a member of the _emerchantpay_ team will reach out to you.
18+
19+
### Customer journey map
20+
A merchant getting started with emerchantpay and Umbraco will need to make sure that they have an emerchantpay merchant account enabled and then cover these steps:
21+
22+
* Package Installation
23+
* Site Settings
24+
* Workflow Setup
25+
1326
### Authentication
1427

1528
All requests to emerchantpay API are authenticated by providing the merchant's username and password.
@@ -60,4 +73,4 @@ for payment sucessfully processed, failed or cancelled.
6073
When a form is submitted on the website, the workflow will execute and based on it's settings, two data payloads will be sent to emerchantpay for creating or retrieving the details of a consumer, and for creating a payment.
6174
The response for the second request will provide the URL for the hosted payment page, and the user will the redirected there.
6275

63-
On completing the payment the emerchantpay API will return the user to the page provided in matching event handler of the worklow.
76+
On completing the payment the emerchantpay API will return the user to the page provided in matching event handler of the worklow.

0 commit comments

Comments
 (0)