OrchardCMS · DemeSzabolcs · Apr 17, 2024 · Jan 20, 2024 · Jan 20, 2024 · Jan 20, 2024
diff --git a/OrchardCore.Commerce.sln b/OrchardCore.Commerce.sln
@@ -113,6 +113,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Commerce.Abstra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Commerce.Payment.Exactly", "src\Modules\OrchardCore.Commerce.Payment.Exactly\OrchardCore.Commerce.Payment.Exactly.csproj", "{73925C09-BF96-4727-91D8-57A88AD1601F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "guides", "guides", "{EF8008F1-64F5-4053-A639-6285084AFA52}"
+	ProjectSection(SolutionItems) = preProject
+		docs\guides\create-webshop.md = docs\guides\create-webshop.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -208,6 +213,7 @@ Global
 		{A4D69733-CDC0-46AE-B46A-163CCC6F77F9} = {E6C02BDF-EEB0-4ABD-ADEC-9932F60923AE}
 		{28DB6CBB-1527-42A1-8EFE-3D95BF185884} = {90913510-3D7F-4BCC-B55E-56343128F049}
 		{73925C09-BF96-4727-91D8-57A88AD1601F} = {E6C02BDF-EEB0-4ABD-ADEC-9932F60923AE}
+		{EF8008F1-64F5-4053-A639-6285084AFA52} = {BEBA1764-178A-4722-A193-4DEF26DCE8D1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {456CBC78-579D-483F-A4C3-AF5C12AB3324}

diff --git a/Readme.md b/Readme.md
@@ -56,10 +56,13 @@ If you have [Lombiq Analyzers](https://github.com/Lombiq/.NET-Analyzers) include
 
 ## Documentation
 
+Check out the complete documentation portal here: <https://commerce.orchardcore.net/>
+
 - [Inventory](docs/features/inventory.md)
 - [Products and Prices](docs/features/products-and-prices.md)
 - [Promotions](docs/features/promotions.md)
 - [Payment providers](docs/features/payment-providers.md)
+  - [Exactly® Payment](docs/features/exactly-payment.md)
   - [Stripe Payment](docs/features/stripe-payment.md)
 - [Taxation](docs/features/taxation.md)
 - [User Features](docs/features/user-features.md)

diff --git a/docs/assets/images/create-webshop/step-6/exactly-form.png b/docs/assets/images/create-webshop/step-6/exactly-form.png
diff --git a/docs/assets/images/create-webshop/step-6/exactly-settings.png b/docs/assets/images/create-webshop/step-6/exactly-settings.png
diff --git a/docs/assets/images/create-webshop/step-6/stripe-form.png b/docs/assets/images/create-webshop/step-6/stripe-form.png
diff --git a/docs/assets/images/create-webshop/step-6/stripe-settings.png b/docs/assets/images/create-webshop/step-6/stripe-settings.png
diff --git a/docs/features/exactly-payment.md b/docs/features/exactly-payment.md
@@ -1,8 +1,9 @@
-# Exactly Payment
+# Exactly® Payment
 
-Orchard Core Commerce supports multiple [payment providers](payment-providers.md). [Exactly](https://exactly.com/) is one of the officially included ones. Unlike [our Stripe implementation](stripe-payment.md), it uses redirects to send you to a payment interface on their domain.
+Orchard Core Commerce supports multiple [payment providers](payment-providers.md). [Exactly®](https://exactly.com/) is one of the officially included ones. Unlike [our Stripe implementation](stripe-payment.md), it uses redirects to send you to a payment interface on their domain.
 
 To start using, follow these steps:
+
 1. Sign up to Exactly. Please be sure to use [this link](https://application.exactly.com/?utm_source=partner&utm_medium=kirill&utm_campaign=LOMBIQ) to create your account. That way [Lombiq](https://lombiq.com) (the steward of the Orchard Core Commerce project) will get a commission on the payment fees, which helps cover some of the development costs of OCC. This is at no cost to you; the fees you pay are the same either way.
 2. Once they respond, ask your contact person for the following:
    - Whitelist for your web domain.
@@ -36,6 +37,7 @@ There are available test cards for the sandbox environment that can be found in
 ### Technical overview
 
 As mentioned above, this module uses redirects to communicate with the payment processor. This means the OrchardCore.Commerce site never sees the buyer's payment information, which avoids potential liability and improves buyer confidence. Here is a broad overview of what happens when you click on the _Pay with exactly_ button:
+
 - JS script sends a POST request that only contains the contents of the checkout page (i.e. addresses).
 - C# backend creates a new Order content item from the checkout data and the stored shopping cart.
 - C# backend sends a POST request to the Exactly API including the order total and the return URL.

diff --git a/docs/features/payment-providers.md b/docs/features/payment-providers.md
@@ -6,6 +6,7 @@ Orchard Core Commerce supports multiple payment providers and allows developers
 
 Each provider is a stand-alone feature you can turn on or off.
 
+- [Exactly](exactly-payment.md): A production-ready provider for [exactly.com](https://exactly.com/).
 - [Stripe](stripe-payment.md): A production-ready provider for [stripe.com](https://stripe.com/).
 - Dummy: A development-only provider that lets you click through the checkout without going off-site. Mainly used for UI testing.
 

diff --git a/docs/features/taxation.md b/docs/features/taxation.md
@@ -11,7 +11,7 @@ Enable the _Orchard Core Commerce - Tax_ feature. This grants you the _Tax_ cont
 
 ## Basic tax support
 
-Filling out the _Gross Price_ and _Tax Rate_ (percentage) fields, automatically updates the product's regular price field to the calculated net price during publish. For products configured like this the shopping cart shows the _Gross Price_ instead of the _Price_ field. This is suitable for stores that only ship locally.
+Filling out the _Gross Price_ and _Tax Rate_ (percentage) fields, automatically updates the product's regular price field to the calculated net price during publish. For products configured like this the shopping cart shows the _Gross Price_ instead of the _Price_ field (so it only works with _Price_ part and not the _PriceVariant_ part). This is suitable for stores that only ship locally.
 
 ## Locally maintained tax rates
 

diff --git a/docs/guides/create-webshop.md b/docs/guides/create-webshop.md
@@ -21,11 +21,11 @@ Get the latest version of the [Orchard Core Commerce NuGet](https://www.nuget.or
 
 ### Step 2 — Enable necessary features
 
-Certain Orchard Core Commerce features, as well as some prerequisite stock Orchard Core features, need to be enabled for the necessary functionality. This can be done under _Configuration > Features_. These features include the following:
+Certain Orchard Core Commerce features, as well as some prerequisite stock Orchard Core features, need to be enabled for the necessary functionality. This can be done under _Configuration > Features_, but if you used the _Orchard Core Commerce - Development_ setup recipe then they are already enabled. These features include the following:
 
 - **Orchard Core Commerce - Core**: Registers core components of Commerce features.
 - **Orchard Core Commerce - Payment** Provides the basics for online payment.
-- **Orchard Core Commerce - Payment - Stripe**: Provides online payment implementation using Stripe.
+- **Orchard Core Commerce - Payment - Exactly**: Provides online payment implementation using Exactly.
 - **Orchard Core Commerce - Session Cart Storage**: Provides shopping cart functionality.
 - **Widgets**: Allows rendering widgets in zones.
 - **Layers**: Allows rendering widgets across pages based on conditions.
@@ -106,17 +106,19 @@ _Any content type with the Widget stereotype can be added this way, but let's ju
 
 _Name the Widget and select the Layer where it should be rendered._
 
-### Step 6 — Enable a payment provider (Stripe)
+### Step 6 — Enable a payment provider (Exactly®)
 
-Having Products and being able to browse them is great and all, but customers will also need a way to checkout and pay for their cart's content. This is where payment providers come into the picture. For simplicity's sake, we'll use Stripe as the payment provider here. Ensure the **Orchard Core Commerce - Payment - Stripe** feature is enabled, then go to _Configuration > Commerce > Stripe API_. The Publishable Key and Secret Key fields need to be filled in for the Stripe Payment form to work on the checkout page, see the links on the settings page for more.
+> ℹ If Exactly is not available in your region [try Stripe instead](../features/exactly-payment.md), the other payment provider OCC has built-in integration for.
 
-![Stripe settings.](../assets/images/create-webshop/step-6/stripe-settings.png)
+Having Products and being able to browse them is great and all, but customers will also need a way to checkout and pay for their cart's content. This is where payment providers come into the picture. We will use Exactly®, the default built-in payment provider. Ensure the **Orchard Core Commerce - Payment - Exactly** feature is enabled, then go to _Configuration > Commerce > Exactly API_. The Project ID and API Key fields need to be filled in sp payments are directed towards your account.
 
-_If you don't already have the necessary API keys, follow the links on the page._
+![Exactly settings.](../assets/images/create-webshop/step-6/exactly-settings.png)
 
-With that done, the Stripe Payment form now appears on the checkout page and the purchase can be completed.
+_See the links on the settings page and the [feature documentation](../features/exactly-payment.md) for info if you haven't got your keys yet._
 
-![Stripe Payment.](../assets/images/create-webshop/step-6/stripe-form.png)
+Once you're saved the settings, feel free to click on the _Verify currently saved API configuration_ to test your API access. With that done, the _Pay with exactly_ button now appears on the checkout page which redirects the customer to the payment processor's site and then if everything went well sends them back to the success page.
+
+![Exactly Payment.](../assets/images/create-webshop/step-6/exactly-form.png)
 
 _This will allow customers to pay to their card's content._
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -80,8 +80,10 @@ nav:
     - Inventory: features/inventory.md
     - Products and Prices: features/products-and-prices.md
     - Promotions: features/promotions.md
-    - Exactly Payment: features/exactly-payment.md
-    - Stripe Payment: features/stripe-payment.md
+    - Payment Providers:
+      - Overview: features/payment-providers.md
+      - Exactly® Payment: features/exactly-payment.md
+      - Stripe Payment: features/stripe-payment.md
     - Taxation: features/taxation.md
     - User Features: features/user-features.md
     - Workflows: features/workflows.md

diff --git a/src/Modules/OrchardCore.Commerce.Payment.Exactly/Views/CheckoutExactly.cshtml b/src/Modules/OrchardCore.Commerce.Payment.Exactly/Views/CheckoutExactly.cshtml
@@ -9,7 +9,7 @@
         T["An error has occurred while trying to connect to the payment service. Please try again later."];
 }
 
-<shape type="PayButton" PayButtonClass="exactly" prop-Text="@T["Pay with exactly"]" />
+<shape type="PayButton" PayButtonClass="exactly" prop-Text="@T["Pay with exactly\u00ae"]" />
 
 <script asp-name="OrchardCore.Commerce.Payment.Exactly.Script" at="Foot">
     Array.from(document.querySelectorAll(".pay-button-exactly")).forEach((button) => {

diff --git a/src/Modules/OrchardCore.Commerce/Recipes/OrchardCore.Commerce.Development.Setup.recipe.json b/src/Modules/OrchardCore.Commerce/Recipes/OrchardCore.Commerce.Development.Setup.recipe.json
@@ -66,7 +66,6 @@
 
         "OrchardCore.Commerce.Payment.DummyProvider",
         "OrchardCore.Commerce.Payment.Exactly",
-        "OrchardCore.Commerce.Payment.Stripe",
         "OrchardCore.Commerce.Promotion",
         "OrchardCore.Commerce.Inventory",