Upgraded project and fixed dnn obsolete APIs

.gitignore

@@ -0,0 +1,225 @@
+# The following command works for downloading when using Git for Windows:
+# curl -LOf http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore
+#
+# Download this file using PowerShell v3 under Windows with the following comand:
+# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
+#
+# or wget:
+# wget --no-check-certificate http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
+[Bb]in/
+[Oo]bj/
+# build folder is nowadays used for build scripts and should not be ignored
+#build/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# OS generated files #
+.DS_Store*
+Icon?
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+modulesbin/
+tempbin/
+
+# EPiServer Site file (VPP)
+AppData/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# vim
+*.txt~
+*.swp
+*.swo
+
+# Temp files when opening LibreOffice on ubuntu
+.~lock.*
+
+# svn
+.svn
+
+# CVS - Source Control
+**/CVS/
+
+# Remainings from resolving conflicts in Source Control
+*.orig
+
+# SQL Server files
+**/App_Data/*.mdf
+**/App_Data/*.ldf
+**/App_Data/*.sdf
+
+
+#LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac desktop service store files
+.DS_Store
+
+# SASS Compiler cache
+.sass-cache
+
+# Visual Studio 2014 CTP
+**/*.sln.ide
+
+# Visual Studio temp something
+.vs/
+
+# dotnet stuff
+project.lock.json
+
+# VS 2015+
+*.vc.vc.opendb
+*.vc.db
+
+# Rider
+.idea/
+
+# Visual Studio Code
+.vscode/
+
+# Output folder used by Webpack or other FE stuff
+**/node_modules/*
+**/wwwroot/*
+
+# SpecFlow specific
+*.feature.cs
+*.feature.xlsx.*
+*.Specs_*.html
+
+#####
+# End of core ignore list, below put you custom 'per project' settings (patterns or path)
+#####

EditPlan.ascx.vb

@@ -62,7 +62,8 @@ Namespace Ventrian.SubscriptionTools
         Private Sub BindCurrency()
 
             Dim ctlList As New Lists.ListController
-            Dim colCurrency As Lists.ListEntryInfoCollection = ctlList.GetListEntryInfoCollection("Currency", "")
+            'Dim colCurrency As Lists.ListEntryInfoCollection = ctlList.GetListEntryInfoCollection("Currency", "")
+            Dim colCurrency As IEnumerable(Of DotNetNuke.Common.Lists.ListEntryInfo) = ctlList.GetListEntryInfoItems("Currency", "")
 
             drpCurrency.DataSource = colCurrency
             drpCurrency.DataBind()
@@ -74,12 +75,13 @@ Namespace Ventrian.SubscriptionTools
         Private Sub BindRoles()
 
             Dim objRoleController As New RoleController
+            drpRole.DataSource = objRoleController.GetRoles(Me.PortalId)
 
-            drpRole.DataSource = objRoleController.GetPortalRoles(Me.PortalId)
             drpRole.DataBind()
             drpRole.Items.Insert(0, New ListItem(Localization.GetString("SelectRole.Text", Me.LocalResourceFile), "-1"))
 
-            rptRoles.DataSource = objRoleController.GetPortalRoles(Me.PortalId)
+            'rptRoles.DataSource = objRoleController.GetPortalRoles(Me.PortalId)
+            rptRoles.DataSource = objRoleController.GetRoles(Me.PortalId)
             rptRoles.DataBind()
 
         End Sub

EditReceipt.ascx.vb

@@ -186,6 +186,11 @@ Namespace Ventrian.SubscriptionTools
             Try
 
                 ReadQueryString()
+
+                If (_receiptID = Null.NullInteger Or _receiptID < 0) AndAlso (Request("username") IsNot Nothing) Then
+                    txtUserName.Text = Request("username")
+                End If
+
                 BindCrumbs()
                 cmdStartDate.NavigateUrl = DotNetNuke.Common.Utilities.Calendar.InvokePopupCal(txtStartDate)
 
@@ -269,7 +274,8 @@ Namespace Ventrian.SubscriptionTools
                 objReceiptController.Add(objReceipt)
 
                 If (chkAddToRole.Checked) Then
-                    objRoleController.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, objReceipt.DateEnd)
+                    objReceipt.DateStart = objUserRole.ExpiryDate
+                    objRoleController.AddUserRole(objReceipt.PortalID, objReceipt.UserID, objPlan.RoleID, objReceipt.DateStart, objReceipt.DateEnd)
                 End If
 
                 Response.Redirect(EditUrl("EditReceipts"), True)

Entities/ContentController.vb

@@ -14,7 +14,8 @@ Namespace Ventrian.SubscriptionTools.Entities
 
         Public Function [Get](ByVal moduleID As Integer, ByVal settingName As String) As ContentInfo
 
-            Return CType(CBO.FillObject(DataProvider.Instance().GetContent(moduleID, settingName), GetType(ContentInfo)), ContentInfo)
+            'Return CType(CBO.FillObject(DataProvider.Instance().GetContent(moduleID, settingName), GetType(ContentInfo)), ContentInfo)
+            Return CBO.FillObject(Of ContentInfo)(DataProvider.Instance().GetContent(moduleID, settingName))
 
         End Function
 

Entities/OrderController.vb

@@ -14,7 +14,8 @@ Namespace Ventrian.SubscriptionTools.Entities
 
         Public Function [Get](ByVal orderID As Integer) As OrderInfo
 
-            Return CType(CBO.FillObject(DataProvider.Instance().GetOrder(orderID), GetType(OrderInfo)), OrderInfo)
+            'Return CType(CBO.FillObject(DataProvider.Instance().GetOrder(orderID), GetType(OrderInfo)), OrderInfo)
+            Return CBO.FillObject(Of OrderInfo)(DataProvider.Instance().GetOrder(orderID))
 
         End Function
 

Entities/PlanController.vb

@@ -26,7 +26,8 @@ Namespace Ventrian.SubscriptionTools.Entities
 
         Public Function [Get](ByVal planID As Integer) As PlanInfo
 
-            Return CType(CBO.FillObject(DataProvider.Instance().GetPlan(planID), GetType(PlanInfo)), PlanInfo)
+            'Return CType(CBO.FillObject(DataProvider.Instance().GetPlan(planID), GetType(PlanInfo)), PlanInfo)
+            Return CBO.FillObject(Of PlanInfo)(DataProvider.Instance().GetPlan(planID))
 
         End Function
 

Entities/ReceiptController.vb

@@ -20,7 +20,8 @@ Namespace Ventrian.SubscriptionTools.Entities
 
         Public Function [Get](ByVal receiptID As Integer) As ReceiptInfo
 
-            Return CType(CBO.FillObject(DataProvider.Instance().GetReceipt(receiptID), GetType(ReceiptInfo)), ReceiptInfo)
+            'Return CType(CBO.FillObject(DataProvider.Instance().GetReceipt(receiptID), GetType(ReceiptInfo)), ReceiptInfo)
+            Return CBO.FillObject(Of ReceiptInfo)(DataProvider.Instance().GetReceipt(receiptID))
 
         End Function
 

Entities/ReminderJob.vb

@@ -53,9 +53,10 @@ Namespace Ventrian.SubscriptionTools.Entities
             Dim portalID As Integer = Convert.ToInt32(Me.ScheduleHistoryItem.GetSetting("PortalID"))
             Dim moduleID As Integer = Convert.ToInt32(Me.ScheduleHistoryItem.GetSetting("ModuleID"))
 
-            Dim objModuleController As New ModuleController
+            'Dim objModuleController As New ModuleController
 
-            Dim settings As Hashtable = objModuleController.GetModuleSettings(moduleID)
+            'Dim settings As Hashtable = objModuleController.GetModuleSettings(moduleID)
+            Dim settings As Hashtable = ModuleController.Instance.GetModule(moduleID, -1, False).ModuleSettings
 
             Dim period As Integer = Null.NullInteger
             If (settings.Contains(Constants.REMINDER_PERIOD)) Then

Entities/UserSettingController.vb

@@ -14,7 +14,8 @@ Namespace Ventrian.SubscriptionTools.Entities
 
         Public Function [Get](ByVal userID As Integer, ByVal settingName As String) As UserSettingInfo
 
-            Return CType(CBO.FillObject(DataProvider.Instance().GetUserSetting(userID, settingName), GetType(UserSettingInfo)), UserSettingInfo)
+            'Return CType(CBO.FillObject(DataProvider.Instance().GetUserSetting(userID, settingName), GetType(UserSettingInfo)), UserSettingInfo)
+            Return CBO.FillObject(Of UserSettingInfo)(DataProvider.Instance().GetUserSetting(userID, settingName))
 
         End Function