Merge branch 'main' into gterdem/payment

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml

@@ -1,4 +1,5 @@
 @using EShopOnAbp.Localization
+@using EShopOnAbp.PublicWeb.Components.Purchase
 @using Microsoft.Extensions.Localization
 @model EShopOnAbp.BasketService.BasketDto
 @inject IStringLocalizer<EShopOnAbpResource> L
@@ -17,7 +18,7 @@
     else
     {
         <div class="row">
-            <div class="col-lg-10">
+            <div class="col-lg-9">
                 <div class="basket-list">
                     @foreach (var item in Model.Items)
                     {
@@ -45,20 +46,12 @@
                     </div>
                 </div>
             </div>
-            <div class="col-lg-2">
+            <div class="col-lg-3">
-                <div class="row">
+                @await Component.InvokeAsync(typeof(PurchaseWidgetViewComponent), 
-                    <h4>Total Selected (@Model.Items.Count)</h4>
+                    new { Basket = Model, ButtonDescription = "CompletePurchase"})
-                </div>
+                
-                <div class="row">
+                
-                    <h3>$@Model.TotalPrice.ToString("0.00")</h3>
+                
-                </div>
-                <div class="row">
-                    <form method="post">
-                        @Html.AntiForgeryToken()
-                        <abp-button type="submit" size="Large" class="basket-purchase-button" text="@L["Purchase"]" button-type="Primary"/>
-                    </form>
-
-                </div>
             </div>
         </div>
     }

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/Default.cshtml

@@ -0,0 +1,21 @@
+@using EShopOnAbp.Localization
+@using EShopOnAbp.PublicWeb.Components.Purchase
+@using Microsoft.Extensions.Localization
+@model PurchaseWidgetViewComponent.PurchaseViewModel
+@inject IStringLocalizer<EShopOnAbpResource> L
+
+<div>
+    <div class="row">
+        <h4>Total Selected (@Model.Basket.Items.Count)</h4>
+    </div>
+    <div class="row">
+        <h3>$@Model.Basket.TotalPrice.ToString("0.00")</h3>
+    </div>
+    <div class="row">
+        <form method="post">
+            @Html.AntiForgeryToken()
+            <abp-button type="submit" size="Large" class="basket-purchase-button" text="@L[Model.ButtonDescription]" button-type="Primary"/>
+        </form>
+
+    </div>
+</div>

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetScriptContributor.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.SignalR;
+using Volo.Abp.Modularity;
+
+namespace EShopOnAbp.PublicWeb.Components.Purchase;
+
+[DependsOn(typeof(SignalRBrowserScriptContributor))]
+public class PurchaseWidgetScriptContributor : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.AddIfNotContains("/components/purchase/purchase-widget.js");
+    }
+}

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetStyleContributor.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace EShopOnAbp.PublicWeb.Components.Purchase;
+
+public class PurchaseWidgetStyleContributor : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.AddIfNotContains("/components/purchase/purchase-widget.css");
+    }
+}

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetViewComponent.cs

@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using EShopOnAbp.BasketService;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+
+namespace EShopOnAbp.PublicWeb.Components.Purchase;
+
+[Widget(
+    AutoInitialize = true,
+    RefreshUrl = "/Widgets/Basket",
+    StyleTypes = new[] {typeof(PurchaseWidgetStyleContributor)},
+    ScriptTypes = new[] {typeof(PurchaseWidgetScriptContributor)}
+)]
+public class PurchaseWidgetViewComponent : AbpViewComponent
+{
+    public PurchaseViewModel ViewModel { get; set; }
+
+    public Task<IViewComponentResult> InvokeAsync(string buttonDescription, BasketDto basket)
+    {
+        ViewModel = new PurchaseViewModel
+        {
+            ButtonDescription = buttonDescription, 
+            Basket = basket
+        };
+
+        return Task.FromResult<IViewComponentResult>(
+            View("~/Components/Purchase/Default.cshtml", ViewModel)
+        );
+    }
+
+    public class PurchaseViewModel
+    {
+        public string ButtonDescription { get; set; }
+        public BasketDto Basket { get; set; }
+    }
+}

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml.cs

@@ -6,6 +6,5 @@ public class PaymentModel : AbpPageModel
 {
     public void OnGet()
     {
-        
     }
 }

apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/purchase/purchase-widget.js

@@ -0,0 +1,3 @@
+(function () {
+
+})();

shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json

@@ -3,12 +3,12 @@
   "texts": {
     "Menu:Home": "Home",
     "Login": "Login",
-    "Catalog": "Catalog",
     "YourBasket": "Your Basket",
-    "Purchase": "Purchase",
     "Total": "Total",
     "OurProducts": "Our Products",
     "StockCount": "Stock Count",
-    "RemoveFromBasket": "Remove from basket"
+    "RemoveFromBasket": "Remove from basket",
+    "CompletePurchase": "Complete purchase",
+    "CompleteOrder": "Complete order"
   }
 }

shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json

@@ -3,12 +3,12 @@
   "texts": {
     "Menu:Home": "Ana Sayfa",
     "Login": "Giriş",
-    "Catalog": "Katalog",
     "YourBasket": "Sepetiniz",
-    "Purchase": "Alışverişi tamamla",
     "Total": "Toplam",
     "OurProducts": "Ürünlerimiz",
     "StockCount": "Stokta",
-    "RemoveFromBasket": "Sepetten kaldır"
+    "RemoveFromBasket": "Sepetten kaldır",
+    "CompletePurchase": "Alışverişi tamamla",
+    "CompleteOrder": "Siparişi onayla"
   }
 }