PayPal PLUS: Generic attribute caching problem. Fixes "Item amount must add up to specified amount subtotal (or total if amount details not specified)".

Author: mgesing

src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs

@@ -1,6 +1,9 @@
-using System.Web.Mvc;
+using System;
+using System.Web.Mvc;
 using System.Web.Routing;
+using SmartStore.Core.Domain.Customers;
 using SmartStore.Services;
+using SmartStore.Services.Common;
 using SmartStore.Services.Payments;
 
 namespace SmartStore.PayPal.Filters
@@ -9,13 +12,16 @@ public class PayPalPlusCheckoutFilter : IActionFilter
 	{
 		private readonly ICommonServices _services;
 		private readonly IPaymentService _paymentService;
+		private readonly Lazy<IGenericAttributeService> _genericAttributeService;
 
 		public PayPalPlusCheckoutFilter(
 			ICommonServices services,
-			IPaymentService paymentService)
+			IPaymentService paymentService,
+			Lazy<IGenericAttributeService> genericAttributeService)
 		{
 			_services = services;
 			_paymentService = paymentService;
+			_genericAttributeService = genericAttributeService;
 		}
 
 		public void OnActionExecuting(ActionExecutingContext filterContext)
@@ -28,6 +34,8 @@ public void OnActionExecuting(ActionExecutingContext filterContext)
 			if (!_paymentService.IsPaymentMethodActive(PayPalPlusProvider.SystemName, store.Id))
 				return;
 
+			_genericAttributeService.Value.SaveAttribute(_services.WorkContext.CurrentCustomer, SystemCustomerAttributeNames.SelectedPaymentMethod, PayPalPlusProvider.SystemName, store.Id);
+
 			var routeValues = new RouteValueDictionary(new { action = "PaymentWall", controller = "PayPalPlus" });
 
 			filterContext.Result = new RedirectToRouteResult("SmartStore.PayPalPlus", routeValues);

src/Plugins/SmartStore.PayPal/Services/PayPalService.cs

@@ -41,7 +41,6 @@ public class PayPalService : IPayPalService
 		private readonly IOrderService _orderService;
 		private readonly IOrderProcessingService _orderProcessingService;
 		private readonly IOrderTotalCalculationService _orderTotalCalculationService;
-		private readonly IGenericAttributeService _genericAttributeService;
 		private readonly IPaymentService _paymentService;
 		private readonly IPriceCalculationService _priceCalculationService;
 		private readonly ITaxService _taxService;
@@ -55,7 +54,6 @@ public PayPalService(
 			IOrderService orderService,
 			IOrderProcessingService orderProcessingService,
 			IOrderTotalCalculationService orderTotalCalculationService,
-			IGenericAttributeService genericAttributeService,
 			IPaymentService paymentService,
 			IPriceCalculationService priceCalculationService,
 			ITaxService taxService,
@@ -68,7 +66,6 @@ public PayPalService(
 			_orderService = orderService;
 			_orderProcessingService = orderProcessingService;
 			_orderTotalCalculationService = orderTotalCalculationService;
-			_genericAttributeService = genericAttributeService;
 			_paymentService = paymentService;
 			_priceCalculationService = priceCalculationService;
 			_taxService = taxService;
@@ -632,7 +629,7 @@ public PayPalResponse CallApi(string method, string path, string accessToken, Pa
 						if (result.ErrorMessage.IsEmpty())
 							result.ErrorMessage = webResponse.StatusDescription;
 
-						LogError(null, result.ErrorMessage, result.Json == null ? null : result.Json.ToString(), false);
+						LogError(null, result.ErrorMessage, string.Concat(data.NaIfEmpty(), "\r\n\r\n", result.Json == null ? "" : result.Json.ToString()), false);
 					}
 				}
 			}
@@ -703,8 +700,6 @@ public PayPalResponse CreatePayment(
 
 			//var dateOfBirth = customer.GetAttribute<DateTime?>(SystemCustomerAttributeNames.DateOfBirth);
 
-			_genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.SelectedPaymentMethod, PayPalPlusProvider.SystemName, store.Id);
-
 			var data = new Dictionary<string, object>();
 			var redirectUrls = new Dictionary<string, object>();
 			var payer = new Dictionary<string, object>();

src/Plugins/SmartStore.PayPal/changelog.md

@@ -3,6 +3,7 @@
 ##Paypal 2.6.0.3
 ###Bugfixes
 * PayPal PLUS: Integration review through PayPal
+* PayPal PLUS: Generic attribute caching problem. Fixes "Item amount must add up to specified amount subtotal (or total if amount details not specified)".
 
 ##PayPal 2.6.0.1
 ###Improvements