Merge branch 'develop' of https://github.com/grandnode/grandnode into…

… develop
Tall-Paul · Jul 8, 2019 · 16ddde2 · 16ddde2
2 parents 05fa609 + 41b8fde
commit 16ddde2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/Grand.Services/Orders/ShoppingCartService.cs b/Grand.Services/Orders/ShoppingCartService.cs
@@ -1447,6 +1447,10 @@ await AddToCart(toCustomer, sci.ProductId, sci.ShoppingCartType, sci.StoreId,
             //copy url referer
             var lastUrlReferrer = await fromCustomer.GetAttribute<string>(_genericAttributeService, SystemCustomerAttributeNames.LastUrlReferrer);
             await _genericAttributeService.SaveAttribute(toCustomer, SystemCustomerAttributeNames.LastUrlReferrer, lastUrlReferrer);
+
+            //move selected checkout attributes
+            var checkoutAttributesXml = await fromCustomer.GetAttribute<string>(_genericAttributeService, SystemCustomerAttributeNames.CheckoutAttributes, _storeContext.CurrentStore.Id);
+            await _genericAttributeService.SaveAttribute(toCustomer, SystemCustomerAttributeNames.CheckoutAttributes, checkoutAttributesXml, _storeContext.CurrentStore.Id);
         }
 
         #endregion

diff --git a/Grand.Web/Areas/Admin/Controllers/ProductController.cs b/Grand.Web/Areas/Admin/Controllers/ProductController.cs
@@ -318,6 +318,12 @@ public async Task<IActionResult> CopyProduct(ProductModel model, [FromServices]
                 if (_workContext.CurrentVendor != null && originalProduct.VendorId != _workContext.CurrentVendor.Id)
                     return RedirectToAction("List");
 
+                if (_workContext.CurrentCustomer.IsStaff())
+                {
+                    originalProduct.LimitedToStores = true;
+                    originalProduct.Stores.Add(_workContext.CurrentCustomer.StaffStoreId);
+                }
+
                 var newProduct = await copyProductService.CopyProduct(originalProduct,
                     copyModel.Name, copyModel.Published, copyModel.CopyImages);
                 SuccessNotification("The product has been copied successfully");

diff --git a/Grand.Web/Controllers/ShoppingCartController.cs b/Grand.Web/Controllers/ShoppingCartController.cs
@@ -44,6 +44,7 @@ public partial class ShoppingCartController : BasePublicController
         private readonly IShoppingCartViewModelService _shoppingCartViewModelService;
         private readonly IGenericAttributeService _genericAttributeService;
         private readonly ShoppingCartSettings _shoppingCartSettings;
+        private readonly OrderSettings _orderSettings;
 
         #endregion
 
@@ -62,7 +63,8 @@ public ShoppingCartController(
             IDownloadService downloadService,
             IShoppingCartViewModelService shoppingCartViewModelService,
             IGenericAttributeService genericAttributeService,
-            ShoppingCartSettings shoppingCartSettings)
+            ShoppingCartSettings shoppingCartSettings,
+            OrderSettings orderSettings)
         {
             this._workContext = workContext;
             this._storeContext = storeContext;
@@ -77,6 +79,7 @@ public ShoppingCartController(
             this._shoppingCartViewModelService = shoppingCartViewModelService;
             this._genericAttributeService = genericAttributeService;
             this._shoppingCartSettings = shoppingCartSettings;
+            this._orderSettings = orderSettings;
         }
 
         #endregion
@@ -322,7 +325,7 @@ public virtual async Task<IActionResult> DeleteCartItem(string id, bool shopping
         public virtual IActionResult ContinueShopping()
         {
             var returnUrl = _workContext.CurrentCustomer.GetAttributeFromEntity<string>(SystemCustomerAttributeNames.LastContinueShoppingPage, _storeContext.CurrentStore.Id);
-            if (!String.IsNullOrEmpty(returnUrl))
+            if (!string.IsNullOrEmpty(returnUrl))
             {
                 return Redirect(returnUrl);
             }
@@ -332,13 +335,13 @@ public virtual IActionResult ContinueShopping()
             }
         }
 
-        [HttpPost]
-        public virtual async Task<IActionResult> StartCheckout(IFormCollection form, [FromServices] OrderSettings orderSettings)
+        public virtual async Task<IActionResult> StartCheckout(IFormCollection form = null)
         {
             var cart = _shoppingCartService.GetShoppingCart(_storeContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
 
             //parse and save checkout attributes
-            await _shoppingCartViewModelService.ParseAndSaveCheckoutAttributes(cart, form);
+            if (form != null && form.Count > 0)
+                await _shoppingCartViewModelService.ParseAndSaveCheckoutAttributes(cart, form);
 
             //validate attributes
             var checkoutAttributes = await _workContext.CurrentCustomer.GetAttribute<string>(_genericAttributeService, SystemCustomerAttributeNames.CheckoutAttributes, _storeContext.CurrentStore.Id);
@@ -351,7 +354,7 @@ public virtual async Task<IActionResult> StartCheckout(IFormCollection form, [Fr
             //everything is OK
             if (_workContext.CurrentCustomer.IsGuest())
             {
-                if (!orderSettings.AnonymousCheckoutAllowed)
+                if (!_orderSettings.AnonymousCheckoutAllowed)
                     return Challenge();
 
                 return RedirectToRoute("LoginCheckoutAsGuest", new { returnUrl = Url.RouteUrl("ShoppingCart") });

diff --git a/Grand.Web/Services/ShoppingCartViewModelService.cs b/Grand.Web/Services/ShoppingCartViewModelService.cs
@@ -722,7 +722,7 @@ public virtual async Task PrepareWishlist(WishlistModel model,
                     var subtotal = await _priceCalculationService.GetSubTotal(sci, true);
                     decimal shoppingCartItemDiscountBase = subtotal.discountAmount;
                     List<AppliedDiscount> scDiscounts = subtotal.appliedDiscounts;
-                    var productprices = await _taxService.GetProductPrice(product, subtotal.discountAmount);
+                    var productprices = await _taxService.GetProductPrice(product, subtotal.subTotal);
                     decimal taxRate = productprices.taxRate;
                     decimal shoppingCartItemSubTotalWithDiscountBase = productprices.productprice;