Merge branch 'main' into gterdem/non-layered

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml

@@ -18,14 +18,13 @@
 
 @{
     string lastYearString = $"y{DateTime.Today.Year - 1}";
-    string filter = "";
     int lastYearCounter = 2;
     var selectList = new List<SelectListItem>
     {
-        new(@L["MyOrders:Last30Days"], "last30", selected: true),
-        new(@L["MyOrders:LastMonth"], "m1"),
-        new(@L["MyOrders:Last3Months"], "m3"),
-        new(@L["MyOrders:LastYear"], lastYearString)
+        new(L["MyOrders:Last30Days"], "last30", selected: true),
+        new(L["MyOrders:LastMonth"], "m1"),
+        new(L["MyOrders:Last3Months"], "m3"),
+        new(L["MyOrders:LastYear"], lastYearString)
     };
     for (int i = 0; i < lastYearCounter; i++)
     {

services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/Protos/product.proto

@@ -1,21 +1,11 @@
 syntax = "proto3";
 
-/* >>
-import "google/api/annotations.proto";
-<< */
-
 option csharp_namespace = "EShopOnAbp.CatalogService.Grpc";
 
 package CatalogApi;
 
 service ProductPublic {
-	rpc GetById(ProductRequest) returns (ProductResponse) {
-		/* >>
- option (google.api.http) = {
-     get: "/api/catalog/product/{id}"
-   };
-<< */
-	}
+	rpc GetById(ProductRequest) returns (ProductResponse);
 }
 
 message ProductRequest {

services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs

@@ -1,4 +1,5 @@
-using EShopOnAbp.CatalogService.Products;
+using EShopOnAbp.OrderingService;
+using EShopOnAbp.CatalogService.Products;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Entities.Events.Distributed;
@@ -13,7 +14,13 @@ namespace EShopOnAbp.CatalogService;
 )]
 public class CatalogServiceDomainModule : AbpModule
 {
-    public override void ConfigureServices(ServiceConfigurationContext context)
+    [DependsOn(
+        typeof(CatalogServiceDomainSharedModule),
+        typeof(AbpDddDomainModule),
+        typeof(AbpAutoMapperModule),
+        typeof(OrderingServiceDomainSharedModule)
+    )]
+    public class CatalogServiceDomainModule : AbpModule
     {
         Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CatalogServiceDomainModule>(validate: true); });