Main shs

.github/workflows/deploy.yml

@@ -0,0 +1,48 @@
+name: Build and Deploy Smartstore to Plesk
+
+on:
+  push:
+    branches:
+      - main_shs
+  workflow_dispatch: # Ermöglicht den manuellen Start per Knopfdruck
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+
+    steps:
+    # 1. Quellcode aus GitHub auschecken
+    - name: Checkout Source Code
+      uses: actions/checkout@v4
+
+    # 2. .NET SDK bereitstellen
+    - name: Setup .NET Core SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
+
+    # 3. Projektabhängigkeiten wiederherstellen
+    - name: Restore dependencies
+      run: dotnet restore Smartstore.sln
+
+    # 4. Smartstore kompilieren (Publish erzeugen)
+    - name: Publish Smartstore.Web
+      run: |
+       dotnet publish src/Smartstore.Web/Smartstore.Web.csproj -c Release -r win-x86 --self-contained false -o ./publish_output /p:CopyLocalLockFileAssemblies=true /p:RazorCompileOnBuild=false /p:PublishModules=true
+
+    # 4b. App Offline schalten (Verhindert Datei-Sperren in Plesk und erzwingt Neustart)
+    - name: Create app_offline.htm
+      run: |
+        echo "<h1>Shop wird aktualisiert...</h1>" > ./publish_output/app_offline.htm
+
+    # 5. Die fertig kompilierten Dateien per FTP zu Plesk hochladen
+    # Korrektur: local-dir nutzt jetzt exakt den korrekten Ordner
+    - name: FTP Deploy to Plesk
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+      with:
+        server: ${{ secrets.FTP_SERVER }}
+        username: 'thuneck'
+        password: ${{ secrets.FTP_PASSWORD }}
+        local-dir: ./publish_output/
+        server-dir: /httpdocs/
+        # dangerous-clean-slate: true # <--- ZWINGT DIE ACTION ALLES NEU ZU SCHREIBEN!

.github/workflows/publish-release.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [debian-latest, windows-latest]
+        os: [windows-latest]
     permissions:
       contents: read
       packages: write
@@ -53,17 +53,17 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Publish and Push for Linux
-      if: matrix.os == 'debian-latest'
+      if: matrix.os == 'ubuntu-latest'
       run: | 
         dotnet publish src/Smartstore.Web/Smartstore.Web.csproj -c Release -o ./.build/release --no-restore --no-build --no-self-contained
-        docker build --build-arg SOURCE=./.build/release -f NoBuild.Dockerfile -t ghcr.io/smartstore/smartstore-linux:latest -t ghcr.io/smartstore/smartstore-linux:${{ steps.format-branch-label.outputs.branch-label }} .
-        docker push ghcr.io/smartstore/smartstore-linux:latest
-        docker push ghcr.io/smartstore/smartstore-linux:${{ steps.format-branch-label.outputs.branch-label }}
+        docker build --build-arg SOURCE=./.build/release -f NoBuild.Dockerfile -t ghcr.io/thuneck-debug/smartstore-linux:latest -t ghcr.io/thuneck-debug/smartstore-linux:${{ steps.format-branch-label.outputs.branch-label }} .
+        docker push ghcr.io/thuneck-debug/smartstore-linux:latest
+        docker push ghcr.io/thuneck-debug/smartstore-linux:${{ steps.format-branch-label.outputs.branch-label }}
 
     - name: Publish and Push for Windows
       if: matrix.os == 'windows-latest'
       run: | 
         dotnet publish src/Smartstore.Web/Smartstore.Web.csproj -c Release -o ./.build/release --no-restore --no-build --no-self-contained
-        docker build --build-arg SOURCE=./.build/release -f Nano.Dockerfile -t ghcr.io/smartstore/smartstore-windows:latest -t ghcr.io/smartstore/smartstore-windows:${{ steps.format-branch-label.outputs.branch-label }} .
-        docker push ghcr.io/smartstore/smartstore-windows:latest
-        docker push ghcr.io/smartstore/smartstore-windows:${{ steps.format-branch-label.outputs.branch-label }}
+        docker build --build-arg SOURCE=./.build/release -f Nano.Dockerfile -t ghcr.io/thuneck-debug/smartstore-windows:latest -t ghcr.io/thuneck-debug/smartstore-windows:${{ steps.format-branch-label.outputs.branch-label }} .
+        docker push ghcr.io/thuneck-debug/smartstore-windows:latest
+        docker push ghcr.io/thuneck-debug/smartstore-windows:${{ steps.format-branch-label.outputs.branch-label }}

.github/workflows/publish.yml

@@ -0,0 +1,34 @@
+name: Build and Publish Smartstore 6.3
+
+on:
+  push:
+    branches:
+      - main_shs # Hier den exakten Namen Ihres Branches eintragen
+
+jobs:
+  build-and-publish:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x' # Erzwingt .NET 9 für Version 6.3
+
+    - name: Restore Dependencies
+      run: dotnet restore Smartstore.sln
+
+    - name: Build and Publish
+      run: |
+        dotnet publish Smartstore.sln -c Release -r win-x86 --self-contained false -o ./publish-folder
+
+# Erklaerung: -r win-x86 stellt auf 32-Bit fuer Fritz IT ein. --self-contained false nutzt das Server-.NET-9.
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: smartstore-plesk-package
+        path: ./publish-folder

src/Smartstore.Core/Catalog/Pricing/Services/Calculators/TierPriceCalculator.cs

@@ -47,7 +47,8 @@ public async Task CalculateAsync(CalculatorContext context, CalculatorDelegate n
                 // but exclude additional charge from comparing.
                 context.FinalPrice -= context.AdditionalCharge;
 
-                if (context.MinTierPrice.Value < context.FinalPrice)
+                // INFO: A tier price may equal the regular price.
+                if (context.MinTierPrice.Value <= context.FinalPrice)
                 {
                     context.FinalPrice = context.MinTierPrice.Value;
                     context.AppliedTierPrice = tierPriceEntity;

src/Smartstore.Core/Catalog/Rules/ProductRuleProvider.cs

@@ -127,6 +127,7 @@ public async Task<bool> MatchesAsync(
                     .BuildFacetMap(false)
                     .CheckSpelling(0);
 
+                searchQuery.CustomData["RuleCheckProductId"] = productId;
                 searchQuery = group.ApplyFilters(searchQuery);
 
                 var productQuery = _catalogSearchService.PrepareQuery(searchQuery);
@@ -211,7 +212,7 @@ CatalogSearchQuery categoryFilter(SearchFilterContext ctx, int[] categoryIds)
             {
                 if (!categoryIds.IsNullOrEmpty())
                 {
-                    var featuredOnly = _catalogSettings.IncludeFeaturedProductsInNormalLists ? (bool?)null : false;
+                    bool? featuredOnly = (_catalogSettings.IncludeFeaturedProductsInNormalLists || ctx.Query.CustomData.ContainsKey("RuleCheckProductId")) ? null : false;
 
                     if (_catalogSettings.ShowProductsFromSubcategories)
                     {

src/Smartstore.Core/Checkout/Orders/Services/OrderCalculationService.cs

@@ -1109,7 +1109,13 @@ protected virtual async Task<CartShipping> GetAdjustedShippingTotalAsync(Shoppin
                 var response = await _shippingService.GetShippingOptionsAsync(cart, customer.ShippingAddress, null, cart.StoreId);
                 if (response.Success && response.ShippingOptions.Count > 0)
                 {
-                    shipping.Option = response.ShippingOptions[0];
+                    var preferredMethodId = customer.GenericAttributes?.PreferredShippingOption?.ShippingMethodId ?? 0;
+                    if (preferredMethodId != 0)
+                    {
+                        shipping.Option = response.ShippingOptions.FirstOrDefault(x => x.ShippingMethodId == preferredMethodId);
+                    }
+
+                    shipping.Option ??= response.ShippingOptions[0];
                 }
             }
 

src/Smartstore.Core/Content/Media/MediaService.cs

@@ -87,7 +87,6 @@ public async Task<int> CountFilesAsync(MediaSearchQuery query)
 
         public async Task<FileCountResult> CountFilesGroupedAsync(MediaFilesFilter filter)
         {
-            // TODO: (core) Throws
             Guard.NotNull(filter);
 
             // Base db query

src/Smartstore.Core/Platform/AI/Metadata/AIMetadata.cs

@@ -37,6 +37,12 @@ public class AIMetadata
         /// </summary>
         public AIModelCollection Models { get; set; } = default!;
 
+        /// <summary>
+        /// A flag indicating whether this instance is a post-processed clone.
+        /// </summary>
+        [JsonIgnore]
+        public bool PostProcessed { get; set; }
+
         #endregion
 
         #region Supports...

src/Smartstore.Core/Platform/AI/Metadata/IAIMetadataLoader.cs

@@ -1,4 +1,6 @@
-namespace Smartstore.Core.AI.Metadata
+#nullable enable
+
+namespace Smartstore.Core.AI.Metadata
 {
     /// <summary>
     /// Loads and caches AI metadata.
@@ -11,5 +13,17 @@ public interface IAIMetadataLoader
         /// <param name="moduleSystemName">The AI modules's system name to load metadata.json from.</param>"
         /// <exception cref="InvalidOperationException"></exception>
         AIMetadata LoadMetadata(string moduleSystemName);
+
+        /// <summary>
+        /// Performs post-processing operations asynchronously using the specified AI metadata.
+        /// </summary>
+        /// <param name="localMetadata">The metadata object containing information required for post-processing. Cannot be null.</param>
+        /// <returns>Return null if no post-processing was performed. Return an <see cref="AIMetadata"/> instance to update the metadata cache deferredly.</returns>
+        Task<AIMetadata?> PostProcessAsync(AIMetadata localMetadata);
+
+        /// <summary>
+        /// Replaces the cached metadata for the given <paramref name="moduleSystemName"/> with the given <paramref name="metadata"/> instance.
+        /// </summary>
+        void ReplaceMetadata(string moduleSystemName, AIMetadata metadata);
     }
 }

src/Smartstore.Core/Platform/AI/Metadata/JsonAIMetadataLoader.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using Smartstore.Caching;
 using Smartstore.ComponentModel;
 
 namespace Smartstore.Core.AI.Metadata
@@ -27,11 +28,19 @@ public JsonAIMetadataLoader(IMemoryCache cache, IApplicationContext appContext)
             };
         }
 
+        protected static string BuildCacheKey(string moduleSystemName)
+            => "aimetadata:" + moduleSystemName;
+
+        protected IMemoryCache Cache
+        {
+            get => _cache;
+        }
+
         public AIMetadata LoadMetadata(string moduleSystemName)
         {
             Guard.NotEmpty(moduleSystemName);
 
-            var cacheKey = "aimetadata:" + moduleSystemName;
+            var cacheKey = BuildCacheKey(moduleSystemName);
 
             var result = _cache.GetOrCreate(cacheKey, entry =>
             {
@@ -42,10 +51,27 @@ public AIMetadata LoadMetadata(string moduleSystemName)
                     entry.AddExpirationToken(changeToken);
                 }
 
-                return metadata;
+                return new CacheEntry { Key = cacheKey, Value = metadata, ValueType = typeof(AIMetadata) };
             });
 
-            return result!;
+            return (AIMetadata)result!.Value;
+        }
+
+        public virtual Task<AIMetadata?> PostProcessAsync(AIMetadata localMetadata)
+        {
+            localMetadata.PostProcessed = true;
+            return Task.FromResult<AIMetadata?>(null);
+        }
+
+        public void ReplaceMetadata(string moduleSystemName, AIMetadata metadata)
+        {
+            Guard.NotEmpty(moduleSystemName);
+            Guard.NotNull(metadata);
+
+            if (_cache.TryGetValue(BuildCacheKey(moduleSystemName), out CacheEntry? entry))
+            {
+                entry!.Value = metadata;
+            }
         }
 
         protected virtual (AIMetadata, IChangeToken?) LoadMetadataCore(string moduleSystemName)
@@ -77,7 +103,7 @@ protected virtual (AIMetadata, IChangeToken?) LoadMetadataCore(string moduleSyst
 
         public void Invalidate(string moduleSystemName)
         {
-            _cache.Remove("aimetadata:" + moduleSystemName);
+            _cache.Remove(BuildCacheKey(moduleSystemName));
         }
     }
 }

src/Smartstore.Core/Platform/AI/Services/AIProviderBase.cs

@@ -3,6 +3,7 @@
 using Smartstore.Core.Content.Media;
 using Smartstore.Core.Localization;
 using Smartstore.IO;
+using Smartstore.Threading;
 using Smartstore.Utilities;
 
 namespace Smartstore.Core.AI
@@ -28,11 +29,85 @@ public abstract class AIProviderBase : IAIProvider
         /// </summary>
         protected const string ContinueReason = "length";
 
+        private readonly IAIMetadataLoader _metadataLoader;
+        private readonly string _moduleSystemName;
+        private AIMetadata _metadata;
+
+        public AIProviderBase(IAIMetadataLoader metadataLoader, string moduleSystemName)
+        {
+            _metadataLoader = metadataLoader;
+            _moduleSystemName = moduleSystemName;
+        }
+
         public Localizer T { get; set; } = NullLocalizer.Instance;
 
         public abstract bool IsActive();
 
-        public virtual AIMetadata Metadata { get; protected set; }
+        public AIMetadata Metadata 
+        {
+            get
+            {
+                if (_metadata == null)
+                {
+                    _metadata = _metadataLoader.LoadMetadata(_moduleSystemName);
+
+                    // Ensure that metadata is post-processed only once.
+                    if (!_metadata.PostProcessed)
+                    {
+                        // Post-process metadata asynchronously (fire-and-forget).
+                        var lockHandle = AsyncLock.Keyed("aimetadatalock:" + _metadata.ProviderId);
+                        // Reload from cache
+                        var metadata = _metadataLoader.LoadMetadata(_moduleSystemName);
+                        if (!metadata.PostProcessed)
+                        {
+                            PostProcessMetadataInBackground(metadata, lockHandle);
+                        }
+                        else
+                        {
+                            lockHandle.Release();
+                        }
+                    }
+                }
+
+                return _metadata;
+            }
+            protected set => _metadata = value;
+        }
+
+        private void PostProcessMetadataInBackground(AIMetadata metadata, ILockHandle lockHandle)
+        {
+            var task = _metadataLoader.PostProcessAsync(metadata);
+
+            if (task.IsCompleted)
+            {
+                // If already completed, update metadata immediately.
+                if (task.Status == TaskStatus.RanToCompletion && task.Result != null)
+                {
+                    _metadata = task.Result;
+                }
+
+                _metadata.PostProcessed = true;
+                lockHandle.Release();
+            }
+            else
+            {
+                // Update cached metadata when post-processing is done.
+                task.ContinueWith(t =>
+                {
+                    if (t.Result != null)
+                    {
+                        t.Result.PostProcessed = true;
+                        _metadataLoader.ReplaceMetadata(_moduleSystemName, t.Result);
+                    }
+                    else
+                    {
+                        _metadata.PostProcessed = true;
+                    }
+
+                    lockHandle.Release();
+                });
+            }
+        }
 
         public virtual AIModelCollection GetModels(AIChatTopic topic)
         {