Merge pull request #15 from iAlexeyProkhorov/qBo_nopCommerce_4.60.1

Update to version 1.4.3. Changes:
iAlexeyProkhorov · Jan 27, 2023 · 0ddca74 · 0ddca74
2 parents f12f7b7 + 2aabdd7
commit 0ddca74
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 18 deletions.
diff --git a/BaseBaroquePlugin.cs b/BaseBaroquePlugin.cs
@@ -45,11 +45,11 @@ public BaseBaroquePlugin()
         {
             //get plugin descriptor
             var pluginsInfo = Singleton<IPluginsInfo>.Instance;
-            var descriptor = pluginsInfo.PluginDescriptors.FirstOrDefault(x => x.PluginType == this.GetType());
+            var descriptor = pluginsInfo.PluginDescriptors.FirstOrDefault(x => x.pluginDescriptor.PluginType == this.GetType());
             //intialize varialbes
             this._localizationService = EngineContext.Current.Resolve<ILocalizationService>();
             this._languageService = EngineContext.Current.Resolve<ILanguageService>();
-            this._originalAssemblyFile = new FileInfo(descriptor.OriginalAssemblyFile);
+            this._originalAssemblyFile = new FileInfo(descriptor.pluginDescriptor.OriginalAssemblyFile);
         }
 
         #endregion

diff --git a/Data/SchemaMigration.cs b/Data/SchemaMigration.cs
@@ -14,12 +14,13 @@
 
 
 using FluentMigrator;
+using Nop.Data.Extensions;
 using Nop.Data.Migrations;
 using Nop.Plugin.Widgets.qBoSlider.Domain;
 
 namespace Nop.Plugin.Widgets.qBoSlider.Data
 {
-    [NopMigration("2020/05/24 15:33:23:6455432", "Widgets.qBoSlider base schema")]
+    [NopMigration("2020/05/24 15:33:23:6455432", "Widgets.qBoSlider base schema", MigrationProcessType.Installation)]
     public class SchemaMigration : AutoReversingMigration
     {
         protected IMigrationManager _migrationManager;
@@ -31,7 +32,9 @@ public SchemaMigration(IMigrationManager migrationManager)
 
         public override void Up()
         {
-            //_migrationManager.BuildTable<Slide>(Create);
+            Create.TableFor<WidgetZone>();
+            Create.TableFor<Slide>();
+            Create.TableFor<WidgetZoneSlide>();
         }
     }
 }
diff --git a/Infrastructure/NopStartup.cs b/Infrastructure/NopStartup.cs
@@ -60,7 +60,7 @@ public void Configure(IApplicationBuilder application)
 
         public int Order
         {
-            get { return 1; }
+            get { return 1000; }
         }
     }
 }
diff --git a/Nop.Plugin.Widgets.qBoSlider.csproj b/Nop.Plugin.Widgets.qBoSlider.csproj
@@ -8,15 +8,15 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<Copyright>Copyright © Baroque Team</Copyright>
 		<Company></Company>
 		<Authors>Baroque Team</Authors>
 		<PackageLicenseUrl></PackageLicenseUrl>
 		<PackageProjectUrl></PackageProjectUrl>
 		<RepositoryUrl>https://github.com/iAlexeyProkhorov/qBoSlider</RepositoryUrl>
 		<RepositoryType>Git</RepositoryType>
-		<Version>1.4.2</Version>
+		<Version>1.4.3</Version>
 		<OutputPath>..\..\Presentation\Nop.Web\Plugins\Widgets.qBoSlider</OutputPath>
 		<OutDir>$(OutputPath)</OutDir>
 	</PropertyGroup>
@@ -31,10 +31,17 @@
 		<OutputPath>..\..\Presentation\Nop.Web\Plugins\Widgets.qBoSlider</OutputPath>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Remove="Data\**" />
+	  <EmbeddedResource Remove="Data\**" />
+	  <None Remove="Data\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Compile Remove="Infrastructure\EfStartUpTask.cs" />
 		<Compile Remove="Infrastructure\qBoSliderContext.cs" />
 		<Compile Remove="Infrastructure\RouteProvider.cs" />
+		<Compile Remove="Mapping\qBoSliderNamesCompatibility.cs" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -58,9 +65,7 @@
 		</Content>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj">
-			<Private>false</Private>
-		</ProjectReference>
+	  <ProjectReference Include="..\..\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="Content\images\a17.png">

diff --git a/Service/GarbageManager.cs b/Service/GarbageManager.cs
@@ -83,9 +83,9 @@ public virtual async Task DeleteSlideLocalizedValuesAsync(Slide slide, int langu
             var isPictureValid = int.TryParse(pictureIdLocalizaedValue, out int localizePictureId);
 
             //delete localized values
-            _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.PictureId, null, languageId);
-            _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.HyperlinkAddress, null, languageId);
-            _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.Description, null, languageId);
+            await _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.PictureId, null, languageId);
+            await _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.HyperlinkAddress, null, languageId);
+            await _localizedEntityService.SaveLocalizedValueAsync(slide, x => x.Description, null, languageId);
 
             //remove localized picture
             if (!string.IsNullOrEmpty(pictureIdLocalizaedValue) && isPictureValid)
@@ -96,7 +96,7 @@ public virtual async Task DeleteSlideLocalizedValuesAsync(Slide slide, int langu
                 if (localizedPicture == null)
                     return;
 
-                _pictureService.DeletePictureAsync(localizedPicture);
+                await _pictureService.DeletePictureAsync(localizedPicture);
             }
         }
 

diff --git a/plugin.json b/plugin.json
@@ -2,8 +2,8 @@
   "Group": "Widgets",
   "FriendlyName": "qBoSlider",
   "SystemName": "Widgets.qBoSlider",
-  "Version": "1.4.2",
-  "SupportedVersions": [ "4.50" ],
+  "Version": "1.4.3",
+  "SupportedVersions": [ "4.60" ],
   "Author": "Baroque team",
   "DisplayOrder": 1,
   "FileName": "Nop.Plugin.Widgets.qBoSlider.dll",

diff --git a/qBoSliderPlugin.cs b/qBoSliderPlugin.cs
@@ -13,6 +13,7 @@
 //limitations under the License.
 
 using Nop.Core;
+using Nop.Plugin.Widgets.qBoSlider.Components;
 using Nop.Plugin.Widgets.qBoSlider.Domain;
 using Nop.Plugin.Widgets.qBoSlider.Service;
 using Nop.Services.Cms;
@@ -124,9 +125,9 @@ public async Task<IList<string>> GetWidgetZonesAsync()
         /// </summary>
         /// <param name="widgetZone">Name of the widget zone</param>
         /// <returns>View component name</returns>
-        public string GetWidgetViewComponentName(string widgetZone)
+        public Type GetWidgetViewComponent(string widgetZone)
         {
-            return "Baroque.qBoSlider.PublicInfo";
+            return typeof(PublicInfoComponent);
         }
 
         /// <summary>