diff --git a/EditReceipt.ascx.vb b/EditReceipt.ascx.vb index cc310b5..df1d33d 100755 --- a/EditReceipt.ascx.vb +++ b/EditReceipt.ascx.vb @@ -334,10 +334,9 @@ Namespace Ventrian.SubscriptionTools End If ' Safely handle role logic - Dim objRoleController As New RoleController Dim objUserRole As UserRoleInfo = Nothing Try - objUserRole = objRoleController.GetUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID) + objUserRole = RoleController.Instance.GetUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID) Catch ex As Exception ' Role lookup failed, continue without role objUserRole = Nothing @@ -395,7 +394,7 @@ Namespace Ventrian.SubscriptionTools If (chkAddToRole.Checked) Then Try ' Add the user to the role (DNN will handle duplicates gracefully) - objRoleController.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, objReceipt.DateStart, objReceipt.DateEnd) + RoleController.Instance.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, RoleStatus.Approved, False, objReceipt.DateStart, objReceipt.DateEnd) Catch ex As Exception ' Role assignment failed, but receipt was created ' Log the error for debugging diff --git a/Libraries/DotNetNuke.dll b/Libraries/DotNetNuke.dll deleted file mode 100644 index 91633a7..0000000 Binary files a/Libraries/DotNetNuke.dll and /dev/null differ diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb index 6b5d96c..3cf6bca 100755 --- a/My Project/Resources.Designer.vb +++ b/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ diff --git a/My Project/Settings.Designer.vb b/My Project/Settings.Designer.vb index 2c9efcf..5f531d2 100755 --- a/My Project/Settings.Designer.vb +++ b/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/SubscriptionTools.dnn b/SubscriptionTools.dnn index 1c0e187..4a5e5da 100755 --- a/SubscriptionTools.dnn +++ b/SubscriptionTools.dnn @@ -1,218 +1,389 @@ - - - - - SubscriptionSignup - Subscription Signup - SubscriptionSignup - SubscriptionSignup + + + + Subscription Signup Allows you to let your users subscribe to defined services. - 01.05.00 - ResourcesSignup.zip - - - SubscriptionSignup - - - Signup.ascx - View - - - ViewOptions - View Options - SignupViewOptions.ascx - Edit - - - Reminders - Send Reminders - SendReminders.ascx - Edit - - - ViewReports - View Reports - Reports.ascx - Edit - - - EditPlans - Edit Plans - EditPlans.ascx - Edit - - - EditPlan - Edit Plan - EditPlan.ascx - Edit - - - EditReceipts - Edit Receipts - EditReceipts.ascx - Edit - - - EditReceipt - Edit Receipt - EditReceipt.ascx - Edit - - - - - - - EditPlan.ascx - - - EditPlans.ascx - - - EditReceipt.ascx - - - EditReceipts.ascx - - - Reports.ascx - - - SendReminders.ascx - - - Signup.ascx - - - SignupDetails.ascx - - - SignupPlan.ascx - - - SignupRegister.ascx - - - SignupViewOptions.ascx - - - ViewInvoice.ascx - - - Tools - IPNHandler.aspx - - - 01.01.00.SqlDataProvider - - - 01.02.00.SqlDataProvider - - - 01.02.01.SqlDataProvider - - - 01.02.04.SqlDataProvider - - - 01.03.00.SqlDataProvider - - - 01.03.01.SqlDataProvider - - - 01.03.02.SqlDataProvider - - - 01.03.03.SqlDataProvider - - - 01.03.04.SqlDataProvider - - - 01.03.05.SqlDataProvider - - - 01.03.06.SqlDataProvider - - - 01.03.07.SqlDataProvider - - - 01.04.00.SqlDataProvider - - - 01.04.02.SqlDataProvider - - - 01.04.03.SqlDataProvider - - - 01.04.04.SqlDataProvider - - - 01.04.06.SqlDataProvider - - - 01.04.08.SqlDataProvider - - - 01.05.00.SqlDataProvider - - - Uninstall.SqlDataProvider - - - Ventrian.SubscriptionTools.dll - - - Ventrian.SubscriptionTools.SqlDataProvider.dll - - - - - SubscriptionStatus - Subscription Content - SubscriptionStatus - SubscriptionStatus - Allows you to target content at specified roles. - 01.05.00 - ResourcesStatus.zip - - - SubscriptionStatus - - - Status.ascx - View - - - ViewOptions - View Options - StatusViewOptions.ascx - Edit - - - EditRole - Edit Role Content - StatusEditRole.ascx - Edit - - - - - - - Status.ascx - - - StatusViewOptions.ascx - - - StatusEditRole.ascx - - - - + /Images/icon_extensions_32px.png + + + + + + + The license for this package is not currently included within the installation file, please check with the vendor for full license details. + This package has no Release Notes + + + + DesktopModules\SubscriptionSignup + + + + + + + + + + + + + + + + + + + + + + + + + SubscriptionSignup + SubscriptionSignup + + + + + SubscriptionSignup + SubscriptionSignup + 0 + + + + DesktopModules/SubscriptionSignup/Signup.ascx + False + + View + + + False + 0 + + + EditPlan + DesktopModules/SubscriptionSignup/EditPlan.ascx + False + Edit Plan + Edit + + + False + 0 + + + EditPlans + DesktopModules/SubscriptionSignup/EditPlans.ascx + False + Edit Plans + Edit + + + False + 0 + + + EditReceipt + DesktopModules/SubscriptionSignup/EditReceipt.ascx + False + Edit Receipt + Edit + + + False + 0 + + + EditReceipts + DesktopModules/SubscriptionSignup/EditReceipts.ascx + False + Edit Receipts + Edit + + + False + 0 + + + Reminders + DesktopModules/SubscriptionSignup/SendReminders.ascx + False + Send Reminders + Edit + + + False + 0 + + + ViewOptions + DesktopModules/SubscriptionSignup/SignupViewOptions.ascx + False + View Options + Edit + + + False + 0 + + + ViewReports + DesktopModules/SubscriptionSignup/Reports.ascx + False + View Reports + Edit + + + False + 0 + + + + + + + + + bin + + Ventrian.SubscriptionTools.dll + + + Ventrian.SubscriptionTools.SqlDataProvider.dll + + + + + + DesktopModules\SubscriptionSignup + + App_LocalResources + EditPlan.ascx.resx + + + App_LocalResources + EditPlans.ascx.resx + + + App_LocalResources + EditReceipt.ascx.resx + + + App_LocalResources + EditReceipts.ascx.resx + + + App_LocalResources + Reports.ascx.resx + + + App_LocalResources + SendReminders.ascx.resx + + + App_LocalResources + Signup.ascx.resx + + + App_LocalResources + SignupDetails.ascx.resx + + + App_LocalResources + SignupPlan.ascx.resx + + + App_LocalResources + SignupRegister.ascx.resx + + + App_LocalResources + SignupViewOptions.ascx.resx + + + App_LocalResources + ViewInvoice.ascx.resx + + + Tools + IPNHandler.aspx + + + EditPlan.ascx + + + EditPlans.ascx + + + EditReceipt.ascx + + + EditReceipts.ascx + + + Reports.ascx + + + SendReminders.ascx + + + Signup.ascx + + + SignupDetails.ascx + + + SignupPlan.ascx + + + SignupRegister.ascx + + + SignupViewOptions.ascx + + + ViewInvoice.ascx + + + + + + + SubscriptionStatus + SubscriptionStatus + + + + + SubscriptionStatus + SubscriptionStatus + 0 + + + + DesktopModules/SubscriptionStatus/Status.ascx + False + + View + + + False + 0 + + + EditRole + DesktopModules/SubscriptionStatus/StatusEditRole.ascx + False + Edit Role Content + Edit + + + False + 0 + + + ViewOptions + DesktopModules/SubscriptionStatus/StatusViewOptions.ascx + False + View Options + Edit + + + False + 0 + + + + + + + + + DesktopModules\SubscriptionStatus + + App_LocalResources + Status.ascx.resx + + + App_LocalResources + StatusEditRole.ascx.resx + + + App_LocalResources + StatusViewOptions.ascx.resx + + + Status.ascx + + + StatusEditRole.ascx + + + StatusViewOptions.ascx + + + + + diff --git a/Tools/IPNHandler.aspx.vb b/Tools/IPNHandler.aspx.vb index 530ff87..38602ca 100755 --- a/Tools/IPNHandler.aspx.vb +++ b/Tools/IPNHandler.aspx.vb @@ -253,10 +253,10 @@ Namespace Ventrian.SubscriptionTools.Tools objReceiptController.Update(objReceipt) End If - Dim objRoleController As New RoleController + 'Dim objRoleController As New RoleController 'objRoleController.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, objReceipt.DateEnd) 'AddUserRole(portalId As Integer, userId As Integer, roleId As Integer, effectiveDate As Date, expiryDate As Date) - objRoleController.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, objReceipt.DateStart, objReceipt.DateEnd) + RoleController.Instance.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, RoleStatus.Approved, False, objReceipt.DateStart, objReceipt.DateEnd) End If Next diff --git a/Ventrian.SubscriptionTools.vbproj b/Ventrian.SubscriptionTools.vbproj index d660912..1c2f817 100755 --- a/Ventrian.SubscriptionTools.vbproj +++ b/Ventrian.SubscriptionTools.vbproj @@ -18,7 +18,7 @@ On - v4.7.2 + v4.8 false @@ -51,15 +51,65 @@ false - + + packages\DotNetNuke.Core.10.2.2\lib\net48\DotNetNuke.dll + False + False + + + packages\DotNetNuke.Abstractions.10.2.2\lib\netstandard2.0\DotNetNuke.Abstractions.dll + False + False + + + packages\DotNetNuke.DependencyInjection.10.2.2\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll + False + False + + + packages\DotNetNuke.Instrumentation.10.2.2\lib\net48\DotNetNuke.Instrumentation.dll + False + False + + + packages\DotNetNuke.Instrumentation.10.2.2\lib\net48\DotNetNuke.Log4Net.dll + False + False + + + packages\DotNetNuke.Core.10.2.2\lib\net48\Microsoft.ApplicationBlocks.Data.dll + False + False + + + packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + False + False + + + packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll + False + False + + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll False False - Libraries\DotNetNuke.dll + + packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + False + False + + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + False + False + @@ -148,6 +198,7 @@ True Application.myapp + True True @@ -324,6 +375,7 @@ My Settings.Designer.vb + diff --git a/packages.config b/packages.config new file mode 100644 index 0000000..4d4ea1f --- /dev/null +++ b/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/web.config b/web.config index 761d489..9ae221c 100644 --- a/web.config +++ b/web.config @@ -11,7 +11,7 @@ --> - +