-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OCC-63: Separate Stripe payment into a feature so it can be disabled …
…if other payment provider is desired. (#373) * Adding Product List base architecture * Improving boolean attribute display in cart * Handling attributes on checkout in ProductAttributeProvider * Handling attributes during Order creation * Fixing Order view * Renaming SelectedAttributes property to SelectedTextAttributes * Adding boolean attribute editing capabilities to Order editor * Fixing bug with boolean attributes display * Constructing actual boolean attributes as well * Fistfighting analyzer * Adjusting Order editor styling * Adding handling of numeric attributes * Improving numeric inputs in Order editor * Fixing warning * Potentially fixing test * Extending UI test * Adding minor improvements * Improving JSON parsing * Adding minor fixes * Creating navigation extension method * Fixing string in view * Replacing SelectedTextAttributes with SelectedAttributes * Create OrchardCore.Commerce.Payment module. * Add separate module to OrchardCore.Commerce.Payment.Stripe. * Move most Stripe files into its own module. * Move PaymentIntent too. * Fix some easier errors. * Using SelectedAttributes everywhere * Moving business logic to service * Warnin't * Fixing test * Use _productService.GetProductsAsync in CreateOrderLineItemsAsync. * Create RequestOptionsService. * Create OrchardCore.Commerce.Abstraction to store some models and interfaces the modules should be able to access. This will be relevant to #175 (OCC-81) as well. * Some project organization. * Move two view-models and add SKU holder interfaces. * Move more stuff over to abstractions. * More code reorganization. * Move serialization to abstraction. * Resolve non-Payment related errors except ProductAttributeValueConverter. * Modular deserializers. * Move CreateOrderLineItemsAsync to ShoppingCartHelpers. * Working on adding providers * Fixing Order editor; removing unnecessary code * Moving method to service * Make GetPaymentAmount private. * Extending providers with new meth * Move WebhookController. * Create StripeController. * Move order updating from StripePaymentService to regular PaymentService. * Abstract CheckoutViewModel. * Replace InitializePaymentIntentAsync with CreateClientSecretAsync. * Move assets to the stripe project. * Fix NodeJS Extensions references in csproj. * Move payment-form.scss into Add separate module to OrchardCore.Commerce.Payment. * Move FieldsOnlyDisplayManager to ContentFields module. * Move PaymentController and PaymentService to the module. * Move AddressField into ContentFields module. * Extract the UserAddress stuff into an event handler. * Adding ordering options * Move commerce-regions.js to ContentFields. * Externalize OrderContentTypeDefinitionDisplayDriver._excludedShapes. * Remove stripe-specific properties from ICheckoutViewModel. * Adding title filter * Abstract stripe data in CheckoutViewModel. * Replace StripeCheckout shape usages with a list of provider shapes. * Go back to directly importing PaymentForm after all. * Wire OrchardCore.Commerce.Payment into OrchardCore.Commerce. * Update excludes. * Add "deserializers" to the allow list. * unusing * Fix non-Stripe problems with PaymentController. * Add ProductAttributeProvider name constants. * Minor code cleanup. * Post merge fix-up. * PaymentViewModel * Create shape data in the provider, move Stripe stuff to StripePaymentProvider. * Make `~/checkout/validate` provider-based. * Namespace fix. * Don't assume default shopping cart ID. * More shopping cart fixes. * Set charges in the outer service. * Turn Payment into a record. * Resolving applied filters from query string * Adding UI tests * Renaming interface and fixing analyzer violations * Fixing analyzer violation * Ignoring pager HTML validation error * Removing unnecessary ContainedPart from products * Some more fixes. * Add missing dependency. * Add IPaymentProvider.FinalModificationOfOrderAsync(). * Move OrderCreatedEvent workflow event into abstraction. * Update inventories using the OrderedAsync event. * Save user addresses in the FinalizeAsync event. * All promotion services should be in the PromotionStartup. * Add PromotionOrderEvents. * Add UserSettingsCheckoutEvents. * Make Promotion a dependency of Payment.Stripe. * Add missing Node Extensions files. * Remove broken project reference. * Ensure payment view model's data is never null. * Fix CreatedFreeAsync. * Add missing Node Extensions files. * Fix warnings. * Feature setup. * Don't break with free orders. * shoppingCartId nullable * Minor refactorings * Accepting only one order by value * Fixing failing UI test * Update src/Modules/OrchardCore.Commerce/Services/ProductListService.cs * Move Checkout-Stripe to CheckoutStripe. * Fix wrong data property names. * Fail early in PaymentConfirmationMiddleware if the payment intent or order are missing. * Throw notification if there is a total in the free order. * Use UpdateOrderToOrderedAsync in OrderController. * Move IPaymentService to OrchardCore.Commerce.Payment. * Return the same way in stripe too. * No need for IOrchardHelper. * Turn StripePaymentService.CheckTotals into an extension method. * Extract reusable parts of CreateOrUpdateOrderFromShoppingCartAsync logic. * Handle FrontendException. * Merge unnecessary single-use private method. * Simplify StripePaymentService constructor. * Add PaymentIntentPersistence.Remove() method. * Add dummy provider. * Extract payment button into a separate shape. * Fix PayButton. * Add "Stripe" to the middleware action's name for consistency. * Fix spinner on the wrong button. * Update payment intent persistence during submit. * Add CreateShoppingCartViewModelAsync extension method. * grammar * Add WhereName extension method to payment provider collection. * Now working dummy provider. * Update recipes. * Code cleanup. * Don't break if the Stripe API key is not configured. * Update Stripe docs. * Add general payment provider documentation. * Add unit test. * Fix spacing. * Update excludes.txt. * Fix CartEventsShouldUpdateTableAndAddLineItem. * fallbacks * fix paymentRequestUrl * cshtml unusing * Move ContentTypes to Abstractions. * Pluralize OrchardCore.Commerce.Abstraction. * Fix namespace. * Fix missing constant from unit test. * Fix and DRY ShoppingCartControllerTests. * Update namespaces. * Early payment intent error handling. * Skip charges if there is no PaymentMethod. * Fix Stripe checkout for real now. * Add error message to PaymentConfirmationMiddleware failure. * Add const for repeated string. * DRY AddNewItemToCart and AddExistingItemToCart tests. * Add warning when no providers are applicable. * Validate that the Stripe order is not empty. * This didn't work as expected. * Fix bug where orderPart.LineItems.SetItems() cleared itself. * Fix nuget references. * Remove broken usings. --------- Co-authored-by: Márk Bartha <barthamark@gmail.com> Co-authored-by: Gábor Pór <gabor.por@lombiq.com> Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
- Loading branch information
4 people
committed
Nov 9, 2023
1 parent
5a30434
commit 582887b
Showing
283 changed files
with
7,644 additions
and
1,666 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Payment Providers | ||
|
|
||
| Orchard Core Commerce supports multiple payment providers and allows developers to extend it further with their own. | ||
|
|
||
| ## Official payment providers | ||
|
|
||
| Each provider is a stand-alone feature you can turn on or off. | ||
|
|
||
| - [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. | ||
|
|
||
| ## Creating your own | ||
|
|
||
| To create a custom payment provider your code must contain the following: | ||
| - An implementation of `IPaymentProvider` registered as a service. | ||
| - A shape type `Checkout{provider.Name}`, such as _CheckoutStripe.cshtml_ and _CheckoutDummy.cshtml_. | ||
|
|
||
| The `IPaymentProvider` contains implementable methods used by the `CheckoutController`. To learn more about the individual methods in the interface, check out the individual methods' XML documentation. | ||
|
|
||
| The shape has the payment button that will be displayed on the `~/checkout` screen. It's up to you to include the front-end logic that calls out to your payment processor and to provide a callback URL. For the latter you can use the `~/checkout/callback/{providerName}/{orderId?}` action. It handles some basic state checking and redirection, but otherwise lets you resolve the pending order using `IPaymentProvider.UpdateAndRedirectToFinishedOrderAsync()`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/ICheckoutEvents.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using OrchardCore.Commerce.Abstractions.Models; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace OrchardCore.Commerce.Abstractions.Abstractions; | ||
|
|
||
| /// <summary> | ||
| /// Extension points for events related to checkout. | ||
| /// </summary> | ||
| public interface ICheckoutEvents | ||
| { | ||
| /// <summary> | ||
| /// Invoked at the start of a new <see cref="OrderPart"/> creation which is used to create the <see | ||
| /// cref="ICheckoutViewModel"/>. | ||
| /// </summary> | ||
| Task OrderCreatingAsync(OrderPart orderPart, string shoppingCartId) => Task.CompletedTask; | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/ICheckoutViewModel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| using Microsoft.AspNetCore.Mvc.Rendering; | ||
| using OrchardCore.Commerce.MoneyDataType; | ||
| using OrchardCore.DisplayManagement; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| namespace OrchardCore.Commerce.Abstractions.Abstractions; | ||
|
|
||
| [SuppressMessage( | ||
| "StyleCop.CSharp.DocumentationRules", | ||
| "SA1600:Elements should be documented", | ||
| Justification = "Nothing to say besides what's already on the property names.")] | ||
| public interface ICheckoutViewModel : IPaymentViewModel, IShape | ||
| { | ||
| string ShoppingCartId { get; } | ||
| Amount GrossTotal { get; } | ||
| IEnumerable<SelectListItem> Regions { get; set; } | ||
| IDictionary<string, IDictionary<string, string>> Provinces { get; } | ||
| string UserEmail { get; } | ||
| IEnumerable<IShape> CheckoutShapes { get; } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...rdCore.Commerce/Abstractions/ILineItem.cs → ...ce.Abstractions/Abstractions/ILineItem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IOrderEvents.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using OrchardCore.Commerce.Abstractions.Models; | ||
| using OrchardCore.Commerce.Abstractions.ViewModels; | ||
| using OrchardCore.ContentManagement; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace OrchardCore.Commerce.Abstractions.Abstractions; | ||
|
|
||
| /// <summary> | ||
| /// Extension points for events related to orders. | ||
| /// </summary> | ||
| public interface IOrderEvents | ||
| { | ||
| /// <summary> | ||
| /// Invoked when a new free (non-payment) order is created. | ||
| /// </summary> | ||
| Task CreatedFreeAsync(OrderPart orderPart, ShoppingCart cart, ShoppingCartViewModel viewModel) => Task.CompletedTask; | ||
|
|
||
| /// <summary> | ||
| /// Invoked when the <paramref name="order"/> is set to the <c>Ordered</c> state. | ||
| /// </summary> | ||
| Task OrderedAsync(ContentItem order, string shoppingCartId) => Task.CompletedTask; | ||
|
|
||
| /// <summary> | ||
| /// Invoked during cleanup after the order has been finalized. | ||
| /// </summary> | ||
| Task FinalizeAsync(ContentItem order, string shoppingCartId, string paymentProviderName) => Task.CompletedTask; | ||
| } |
2 changes: 1 addition & 1 deletion
2
...ardCore.Commerce/Abstractions/IPayment.cs → ...rce.Abstractions/Abstractions/IPayment.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IPaymentViewModel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using OrchardCore.Commerce.Abstractions.Models; | ||
| using OrchardCore.Commerce.MoneyDataType; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| namespace OrchardCore.Commerce.Abstractions.Abstractions; | ||
|
|
||
| [SuppressMessage( | ||
| "StyleCop.CSharp.DocumentationRules", | ||
| "SA1600:Elements should be documented", | ||
| Justification = "Nothing to say besides what's already on the property names.")] | ||
| public interface IPaymentViewModel | ||
| { | ||
| Amount SingleCurrencyTotal { get; } | ||
| Amount NetTotal { get; } | ||
| IDictionary<string, object> PaymentProviderData { get; } | ||
| OrderPart OrderPart { get; } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...IPredefinedValuesProductAttributeValue.cs → ...IPredefinedValuesProductAttributeValue.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IProductAttributeDeserializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using Newtonsoft.Json.Linq; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text.Json.Nodes; | ||
|
|
||
| namespace OrchardCore.Commerce.Abstractions.Abstractions; | ||
|
|
||
| /// <summary> | ||
| /// Deserializes the attribute of the type <see cref="AttributeTypeName"/>. | ||
| /// </summary> | ||
| public interface IProductAttributeDeserializer | ||
| { | ||
| // Not necessary to document as they are not externally accessible. | ||
| #pragma warning disable SA1600 // Elements should be documented. | ||
| internal static readonly Dictionary<string, IProductAttributeDeserializer> Deserializers = | ||
| new(StringComparer.OrdinalIgnoreCase); | ||
|
|
||
| private static readonly object _lock = new(); | ||
| #pragma warning restore SA1600 | ||
|
|
||
| /// <summary> | ||
| /// Gets the attribute name used to identify this deserializer. | ||
| /// </summary> | ||
| string AttributeTypeName { get; } | ||
|
|
||
| /// <summary> | ||
| /// Deserializes using <c>Newtonsoft.Json</c>. | ||
| /// </summary> | ||
| IProductAttributeValue Deserialize(string attributeName, JObject attribute); | ||
|
|
||
| /// <summary> | ||
| /// Deserializes using <c>System.Text.Json</c>. | ||
| /// </summary> | ||
| IProductAttributeValue Deserialize(string attributeName, JsonObject attribute); | ||
|
|
||
| /// <summary> | ||
| /// Registers serializers used to deserialize product attributes. | ||
| /// </summary> | ||
| public static void AddSerializers(params IProductAttributeDeserializer[] deserializers) | ||
| { | ||
| lock (_lock) | ||
| { | ||
| foreach (var deserializer in deserializers) | ||
| { | ||
| Deserializers[deserializer.AttributeTypeName] = deserializer; | ||
| } | ||
| } | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletions
4
...ce/Abstractions/IProductAttributeValue.cs → ...ns/Abstractions/IProductAttributeValue.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.