From 4ffbe1c72eec68bce567f526b862b9438e322810 Mon Sep 17 00:00:00 2001 From: TimGeyssens Date: Mon, 23 Feb 2015 14:17:53 +0100 Subject: [PATCH 1/7] Adds marketplace project --- Marketplace/Controls/CountryDropDown.cs | 56 + Marketplace/Css/Custom.css | 522 +++++ Marketplace/Css/Deli.css | 1190 +++++++++++ Marketplace/Css/DeliAdmin.css | 39 + Marketplace/Css/community.css | 761 +++++++ Marketplace/Css/fonts.css | 109 ++ Marketplace/Css/repository.css | 181 ++ Marketplace/Css/screen.css | 1742 +++++++++++++++++ Marketplace/Events/DeliNotificationEvents.cs | 39 + Marketplace/Helpers/ExtensionMethods.cs | 75 + Marketplace/Helpers/Helper.cs | 29 + Marketplace/HttpHandlers/PayPalIPN.cs | 568 ++++++ Marketplace/HttpHandlers/PayPalIPNHandler.cs | 43 + Marketplace/Marketplace.csproj | 771 ++++++++ .../ConfigureProjectLicenses.master | 13 + Marketplace/MasterPages/Deli.master | 40 + Marketplace/MasterPages/DeliCart.master | 20 + .../MasterPages/DeliCartDetails.master | 19 + Marketplace/MasterPages/EditProject.master | 25 + Marketplace/MasterPages/Master.master | 146 ++ Marketplace/MasterPages/PayPalRedirect.master | 38 + Marketplace/MasterPages/Project.master | 44 + Marketplace/MasterPages/ProjectGroup.master | 38 + Marketplace/MasterPages/Projects.master | 68 + Marketplace/MasterPages/ProjectsTags.master | 22 + .../MasterPages/Repository/Community.master | 98 + .../MasterPages/Repository/Master.master | 99 + .../MasterPages/Repository/Nothing.master | 34 + .../MasterPages/Repository/Project.master | 11 + .../Repository/ProjectGroup.master | 32 + .../MasterPages/Repository/Projects.master | 47 + .../Repository/ProjectsTags.master | 21 + .../MasterPages/Repository/Textpage.master | 10 + Marketplace/MasterPages/newest.master | 14 + Marketplace/MasterPages/popular.master | 14 + .../NotificationTypes/DeliNewMember.cs | 72 + .../NotificationTypes/DeliNotifyVendor.cs | 78 + .../NotificationTypes/DeliOrderComplete.cs | 73 + .../NotificationTypes/DeliPayoutRequest.cs | 81 + .../NotificationTypes/Notification.config | 267 +++ Marketplace/ProjectFileUploadHandler.cs | 88 + Marketplace/Properties/AssemblyInfo.cs | 35 + Marketplace/Properties/Settings.Designer.cs | 46 + Marketplace/Properties/Settings.settings | 12 + Marketplace/Razor/Deli-MyProjects.cshtml | 95 + .../Razor/Deli-ProjectCategories.cshtml | 22 + Marketplace/Razor/Deli-TagCloud.cshtml | 33 + .../Razor/VersionCompatibilityReport.cs | 92 + Marketplace/Razor/versionCompatibility.cshtml | 46 + .../Razor/versionCompatibilityReport.cshtml | 26 + Marketplace/Rest.cs | 167 ++ .../com.umbraco.orders/BuyerProxy.datasource | 10 + .../com.umbraco.orders/OrderProxy.datasource | 10 + .../com.umbraco.orders/Reference.cs | 741 +++++++ .../com.umbraco.orders/Reference.map | 7 + .../com.umbraco.orders/orders.disco | 6 + .../com.umbraco.orders/orders.wsdl | 267 +++ .../com.umbraco/MemberData.datasource | 10 + .../Web References/com.umbraco/Reference.cs | 257 +++ .../Web References/com.umbraco/Reference.map | 7 + .../com.umbraco/memberlookup.disco | 6 + .../com.umbraco/memberlookup.wsdl | 83 + Marketplace/Web.Debug.config | 30 + Marketplace/Web.Release.config | 31 + Marketplace/Web.config | 312 +++ Marketplace/adhoc/setalllive.aspx | 16 + Marketplace/adhoc/setalllive.aspx.cs | 47 + Marketplace/adhoc/setalllive.aspx.designer.cs | 26 + Marketplace/library.cs | 143 ++ Marketplace/packages.config | 26 + Marketplace/uVersion/config.cs | 91 + Marketplace/uVersion/uVersion.cs | 42 + .../usercontrols/Deli/Admin/OrderReview.ascx | 152 ++ .../Deli/Admin/OrderReview.ascx.cs | 247 +++ .../Deli/Admin/OrderReview.ascx.designer.cs | 42 + .../Deli/Admin/ProcessRefund.ascx | 39 + .../Deli/Admin/ProcessRefund.ascx.cs | 196 ++ .../Deli/Admin/ProcessRefund.ascx.designer.cs | 78 + .../usercontrols/Deli/Admin/VendorPayout.ascx | 54 + .../Deli/Admin/VendorPayout.ascx.cs | 209 ++ .../Deli/Admin/VendorPayout.ascx.designer.cs | 60 + .../Deli/Admin/VendorPayoutReport.ascx | 121 ++ .../Deli/Admin/VendorPayoutReport.ascx.cs | 143 ++ .../Admin/VendorPayoutReport.ascx.designer.cs | 24 + Marketplace/usercontrols/Deli/Cart/Cart.ascx | 72 + .../usercontrols/Deli/Cart/Cart.ascx.cs | 186 ++ .../Deli/Cart/Cart.ascx.designer.cs | 69 + .../usercontrols/Deli/Cart/CartDetails.ascx | 136 ++ .../Deli/Cart/CartDetails.ascx.cs | 300 +++ .../Deli/Cart/CartDetails.ascx.designer.cs | 150 ++ .../usercontrols/Deli/Cart/CartProgress.ascx | 10 + .../Deli/Cart/CartProgress.ascx.cs | 49 + .../Deli/Cart/CartProgress.ascx.designer.cs | 24 + .../usercontrols/Deli/Cart/CartReview.ascx | 86 + .../usercontrols/Deli/Cart/CartReview.ascx.cs | 241 +++ .../Deli/Cart/CartReview.ascx.designer.cs | 141 ++ .../usercontrols/Deli/Cart/MicroCart.ascx | 4 + .../usercontrols/Deli/Cart/MicroCart.ascx.cs | 51 + .../Deli/Cart/MicroCart.ascx.designer.cs | 42 + .../Deli/Customers/VendorCustomers.ascx | 39 + .../Deli/Customers/VendorCustomers.ascx.cs | 152 ++ .../VendorCustomers.ascx.designer.cs | 24 + .../Deli/Dashboard/VendorBIOverview.ascx | 100 + .../Deli/Dashboard/VendorBIOverview.ascx.cs | 246 +++ .../VendorBIOverview.ascx.designer.cs | 78 + .../Deli/Dashboard/VendorProjectBI.ascx | 104 + .../Deli/Dashboard/VendorProjectBI.ascx.cs | 237 +++ .../VendorProjectBI.ascx.designer.cs | 87 + .../usercontrols/Deli/FeaturedProject.ascx | 51 + .../usercontrols/Deli/FeaturedProject.ascx.cs | 32 + .../Deli/FeaturedProject.ascx.designer.cs | 24 + .../Deli/HQStaffPickProjects.ascx | 8 + .../Deli/HQStaffPickProjects.ascx.cs | 44 + .../Deli/HQStaffPickProjects.ascx.designer.cs | 24 + .../Deli/License/Member/MyLicenses.ascx | 149 ++ .../Deli/License/Member/MyLicenses.ascx.cs | 263 +++ .../Member/MyLicenses.ascx.designer.cs | 213 ++ .../Deli/License/Vendor/ProjectLicenses.ascx | 205 ++ .../License/Vendor/ProjectLicenses.ascx.cs | 381 ++++ .../Vendor/ProjectLicenses.ascx.designer.cs | 366 ++++ .../usercontrols/Deli/ListPagination.ascx | 1 + .../usercontrols/Deli/ListPagination.ascx.cs | 142 ++ .../Deli/ListPagination.ascx.designer.cs | 15 + .../usercontrols/Deli/NewestProjects.ascx | 79 + .../usercontrols/Deli/NewestProjects.ascx.cs | 147 ++ .../Deli/NewestProjects.ascx.designer.cs | 87 + .../usercontrols/Deli/Package/Editor.ascx | 14 + .../usercontrols/Deli/Package/Editor.ascx.cs | 168 ++ .../Deli/Package/Editor.ascx.designer.cs | 42 + .../Deli/Package/Steps/Complete.ascx | 22 + .../Deli/Package/Steps/Complete.ascx.cs | 76 + .../Package/Steps/Complete.ascx.designer.cs | 69 + .../Deli/Package/Steps/Details.ascx | 148 ++ .../Deli/Package/Steps/Details.ascx.cs | 223 +++ .../Package/Steps/Details.ascx.designer.cs | 186 ++ .../Deli/Package/Steps/Files.ascx | 237 +++ .../Deli/Package/Steps/Files.ascx.cs | 315 +++ .../Deli/Package/Steps/Files.ascx.designer.cs | 78 + .../Deli/Package/Steps/Licenses.ascx | 138 ++ .../Deli/Package/Steps/Licenses.ascx.cs | 267 +++ .../Package/Steps/Licenses.ascx.designer.cs | 168 ++ .../Deli/Package/Steps/Screenshots.ascx | 150 ++ .../Deli/Package/Steps/Screenshots.ascx.cs | 197 ++ .../Steps/Screenshots.ascx.designer.cs | 51 + .../Deli/Payout/VendorPayout.ascx | 121 ++ .../Deli/Payout/VendorPayout.ascx.cs | 137 ++ .../Deli/Payout/VendorPayout.ascx.designer.cs | 87 + .../Deli/Payout/VendorPayoutHistory.ascx | 93 + .../Deli/Payout/VendorPayoutHistory.ascx.cs | 103 + .../VendorPayoutHistory.ascx.designer.cs | 24 + .../usercontrols/Deli/PopularProjects.ascx | 83 + .../usercontrols/Deli/PopularProjects.ascx.cs | 151 ++ .../Deli/PopularProjects.ascx.designer.cs | 87 + .../Deli/Profile/MemberDataLookup.ascx | 24 + .../Deli/Profile/MemberDataLookup.ascx.cs | 91 + .../Profile/MemberDataLookup.ascx.designer.cs | 78 + .../usercontrols/Deli/Profile/MyProjects.ascx | 96 + .../Deli/Profile/MyProjects.ascx.cs | 56 + .../Deli/Profile/MyProjects.ascx.designer.cs | 42 + .../usercontrols/Deli/Profile/Signup.ascx | 312 +++ .../usercontrols/Deli/Profile/Signup.ascx.cs | 297 +++ .../Deli/Profile/Signup.ascx.designer.cs | 465 +++++ .../usercontrols/Deli/ProjectView.ascx | 429 ++++ .../usercontrols/Deli/ProjectView.ascx.cs | 553 ++++++ .../Deli/ProjectView.ascx.designer.cs | 294 +++ .../usercontrols/Deli/ProjectsList.ascx | 62 + .../usercontrols/Deli/ProjectsList.ascx.cs | 132 ++ .../Deli/ProjectsList.ascx.designer.cs | 51 + .../Deli/Purchase/PayPalConfirm.ascx | 61 + .../Deli/Purchase/PayPalConfirm.ascx.cs | 527 +++++ .../Purchase/PayPalConfirm.ascx.designer.cs | 51 + .../Deli/Purchase/PayPalPayment.ascx | 42 + .../Deli/Purchase/PayPalPayment.ascx.cs | 243 +++ .../Purchase/PayPalPayment.ascx.designer.cs | 24 + .../Deli/Repository/RepoProjectView.ascx | 215 ++ .../Deli/Repository/RepoProjectView.ascx.cs | 165 ++ .../RepoProjectView.ascx.designer.cs | 195 ++ .../Deli/Support/Member/RefundRequest.ascx | 46 + .../Deli/Support/Member/RefundRequest.ascx.cs | 66 + .../Member/RefundRequest.ascx.designer.cs | 105 + .../Support/Vendor/VendorSupportRequest.ascx | 47 + .../Vendor/VendorSupportRequest.ascx.cs | 66 + .../VendorSupportRequest.ascx.designer.cs | 114 ++ .../Deli/TopPaidProjectsList.ascx | 9 + .../Deli/TopPaidProjectsList.ascx.cs | 25 + .../Deli/TopPaidProjectsList.ascx.designer.cs | 24 + .../our.umbraco.org/HeaderLogin.ascx | 12 + .../Login_novalidationscript.ascx | 20 + .../Login_novalidationscript.ascx.cs | 46 + .../Login_novalidationscript.ascx.designer.cs | 78 + .../umbracoMemberControls/umbLogin.ascx | 27 + Marketplace/xslt/repository.xslt | 423 ++++ our.umbraco.org.sln | 12 + packages/repositories.config | 2 + 194 files changed, 25665 insertions(+) create mode 100644 Marketplace/Controls/CountryDropDown.cs create mode 100644 Marketplace/Css/Custom.css create mode 100644 Marketplace/Css/Deli.css create mode 100644 Marketplace/Css/DeliAdmin.css create mode 100644 Marketplace/Css/community.css create mode 100644 Marketplace/Css/fonts.css create mode 100644 Marketplace/Css/repository.css create mode 100644 Marketplace/Css/screen.css create mode 100644 Marketplace/Events/DeliNotificationEvents.cs create mode 100644 Marketplace/Helpers/ExtensionMethods.cs create mode 100644 Marketplace/Helpers/Helper.cs create mode 100644 Marketplace/HttpHandlers/PayPalIPN.cs create mode 100644 Marketplace/HttpHandlers/PayPalIPNHandler.cs create mode 100644 Marketplace/Marketplace.csproj create mode 100644 Marketplace/MasterPages/ConfigureProjectLicenses.master create mode 100644 Marketplace/MasterPages/Deli.master create mode 100644 Marketplace/MasterPages/DeliCart.master create mode 100644 Marketplace/MasterPages/DeliCartDetails.master create mode 100644 Marketplace/MasterPages/EditProject.master create mode 100644 Marketplace/MasterPages/Master.master create mode 100644 Marketplace/MasterPages/PayPalRedirect.master create mode 100644 Marketplace/MasterPages/Project.master create mode 100644 Marketplace/MasterPages/ProjectGroup.master create mode 100644 Marketplace/MasterPages/Projects.master create mode 100644 Marketplace/MasterPages/ProjectsTags.master create mode 100644 Marketplace/MasterPages/Repository/Community.master create mode 100644 Marketplace/MasterPages/Repository/Master.master create mode 100644 Marketplace/MasterPages/Repository/Nothing.master create mode 100644 Marketplace/MasterPages/Repository/Project.master create mode 100644 Marketplace/MasterPages/Repository/ProjectGroup.master create mode 100644 Marketplace/MasterPages/Repository/Projects.master create mode 100644 Marketplace/MasterPages/Repository/ProjectsTags.master create mode 100644 Marketplace/MasterPages/Repository/Textpage.master create mode 100644 Marketplace/MasterPages/newest.master create mode 100644 Marketplace/MasterPages/popular.master create mode 100644 Marketplace/NotificationTypes/DeliNewMember.cs create mode 100644 Marketplace/NotificationTypes/DeliNotifyVendor.cs create mode 100644 Marketplace/NotificationTypes/DeliOrderComplete.cs create mode 100644 Marketplace/NotificationTypes/DeliPayoutRequest.cs create mode 100644 Marketplace/NotificationTypes/Notification.config create mode 100644 Marketplace/ProjectFileUploadHandler.cs create mode 100644 Marketplace/Properties/AssemblyInfo.cs create mode 100644 Marketplace/Properties/Settings.Designer.cs create mode 100644 Marketplace/Properties/Settings.settings create mode 100644 Marketplace/Razor/Deli-MyProjects.cshtml create mode 100644 Marketplace/Razor/Deli-ProjectCategories.cshtml create mode 100644 Marketplace/Razor/Deli-TagCloud.cshtml create mode 100644 Marketplace/Razor/VersionCompatibilityReport.cs create mode 100644 Marketplace/Razor/versionCompatibility.cshtml create mode 100644 Marketplace/Razor/versionCompatibilityReport.cshtml create mode 100644 Marketplace/Rest.cs create mode 100644 Marketplace/Web References/com.umbraco.orders/BuyerProxy.datasource create mode 100644 Marketplace/Web References/com.umbraco.orders/OrderProxy.datasource create mode 100644 Marketplace/Web References/com.umbraco.orders/Reference.cs create mode 100644 Marketplace/Web References/com.umbraco.orders/Reference.map create mode 100644 Marketplace/Web References/com.umbraco.orders/orders.disco create mode 100644 Marketplace/Web References/com.umbraco.orders/orders.wsdl create mode 100644 Marketplace/Web References/com.umbraco/MemberData.datasource create mode 100644 Marketplace/Web References/com.umbraco/Reference.cs create mode 100644 Marketplace/Web References/com.umbraco/Reference.map create mode 100644 Marketplace/Web References/com.umbraco/memberlookup.disco create mode 100644 Marketplace/Web References/com.umbraco/memberlookup.wsdl create mode 100644 Marketplace/Web.Debug.config create mode 100644 Marketplace/Web.Release.config create mode 100644 Marketplace/Web.config create mode 100644 Marketplace/adhoc/setalllive.aspx create mode 100644 Marketplace/adhoc/setalllive.aspx.cs create mode 100644 Marketplace/adhoc/setalllive.aspx.designer.cs create mode 100644 Marketplace/library.cs create mode 100644 Marketplace/packages.config create mode 100644 Marketplace/uVersion/config.cs create mode 100644 Marketplace/uVersion/uVersion.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/OrderReview.ascx create mode 100644 Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx create mode 100644 Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/Cart.ascx create mode 100644 Marketplace/usercontrols/Deli/Cart/Cart.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/Cart.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartDetails.ascx create mode 100644 Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartProgress.ascx create mode 100644 Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartReview.ascx create mode 100644 Marketplace/usercontrols/Deli/Cart/CartReview.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/CartReview.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/MicroCart.ascx create mode 100644 Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx create mode 100644 Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/FeaturedProject.ascx create mode 100644 Marketplace/usercontrols/Deli/FeaturedProject.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/FeaturedProject.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx create mode 100644 Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx create mode 100644 Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx create mode 100644 Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/ListPagination.ascx create mode 100644 Marketplace/usercontrols/Deli/ListPagination.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/ListPagination.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/NewestProjects.ascx create mode 100644 Marketplace/usercontrols/Deli/NewestProjects.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/NewestProjects.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Editor.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Editor.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Details.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Files.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/PopularProjects.ascx create mode 100644 Marketplace/usercontrols/Deli/PopularProjects.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/PopularProjects.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx create mode 100644 Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/MyProjects.ascx create mode 100644 Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx create mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/ProjectView.ascx create mode 100644 Marketplace/usercontrols/Deli/ProjectView.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/ProjectView.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/ProjectsList.ascx create mode 100644 Marketplace/usercontrols/Deli/ProjectsList.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/ProjectsList.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx create mode 100644 Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx create mode 100644 Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx create mode 100644 Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.designer.cs create mode 100644 Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx create mode 100644 Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.cs create mode 100644 Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.designer.cs create mode 100644 Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx create mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx create mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs create mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs create mode 100644 Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx create mode 100644 Marketplace/xslt/repository.xslt diff --git a/Marketplace/Controls/CountryDropDown.cs b/Marketplace/Controls/CountryDropDown.cs new file mode 100644 index 00000000..fb7bedfe --- /dev/null +++ b/Marketplace/Controls/CountryDropDown.cs @@ -0,0 +1,56 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections.Generic; +using System.Web; +using System.Linq; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using System.Collections.Specialized; +using System.Globalization; + +namespace Marketplace.Controls +{ + public class CountryDropDownList : DropDownList + { + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + GetCountries(); + + } + + + private void GetCountries() + { + + Dictionary dic = new Dictionary(); + List col = new List(); + + foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.SpecificCultures)) + { + + RegionInfo ri = new RegionInfo(ci.LCID); + if (!dic.ContainsKey(ri.EnglishName)) + dic.Add(ri.EnglishName, ri.TwoLetterISORegionName.ToLowerInvariant()); + + if (!col.Contains(ri.EnglishName)) + col.Add(ri.EnglishName); + } + + col.Sort(); + + + + this.Items.Add(new ListItem("", "")); + foreach (var i in dic.OrderBy(x => x.Key)) + { + this.Items.Add(new ListItem(i.Key, i.Value)); + } + + } + } +} \ No newline at end of file diff --git a/Marketplace/Css/Custom.css b/Marketplace/Css/Custom.css new file mode 100644 index 00000000..d666f39d --- /dev/null +++ b/Marketplace/Css/Custom.css @@ -0,0 +1,522 @@ +/* THIS STYLESHEET CONTAINS ALL THE THINGS WE'VE ADDED TO THE DESIGN */ + +/* adjusting the header if there is no promoted content */ + + +.Class-VideoTutorial h1{display: none !Important;} + +.class-empty #wrapper{padding-top: 150px !Important;} +.class-emtpy #header{height: 150px !Important;} + +.class-shopFlow #wrapper{padding-top: 200px !Important;} +.class-shopFlow #header{padding-left: 0px; height: 200px !Important;} +.class-shopFlow .breadcrumb{display: none !Important;} + +#panes div.tabPanel{display: none;} + +.get-started-table td {vertical-align: top; width: 33%;} +.get-started-table li {margin-bottom: 5px;} +.get-started-table ul {margin: 0;} +td {vertical-align: top;} +.no-margin {margin:0;} +.boxLeft { +float: left; +width: 48% +} +.boxRight { +float: right; +width: 48% +} + +/* SUBMITTED SITES */ +#tagSelector{height: 130px; display: block; list-style: none; +margin-bottom: 20px; padding: 0px;} + +#tagSelector li{float: left; margin: 0px; display: block; width: 180px; padding: 5px;} +#tagSelector li a{padding: 3px;} +#tagSelector li a.current{font-weight: bold;} +#tagSelector li.header{width: 100%; float: none; color: #444444; font-weight: bold; text-size: 12px;} + +#viewToggle{text-align: center; display: block; width: 120px; padding: 6px; border: solid 1px #e7e7e7; text-decoration: none; clear: both; margin-bottom: 20px; } + +#featuredSites{display: block; margin: 0px; padding: 0px;} + +#featuredSites li{display: block; text-align: center; width: 297px; height: 270px; float: left; margin: 0px 10px 14px 0px; padding: 7px; +border-top: 1px solid #E7E7E7; +border-left: 1px solid #E7E7E7; +border-right: 2px solid #E7E7E7; +border-bottom: 2px solid #E7E7E7; +overflow: hidden +} + +#sites.grid{display: block; margin: 0px; padding: 0px;} +#sites.grid li{opacity:0.2; display: block; text-align: center; width: 135px; height: 145px; float: left; margin: 0px 20px 20px 0px; padding: 0px; + background: #252525; color: #fff; + overflow: hidden +} + +#sites.grid li.last{margin-right: 0px; clear: right;} +#sites.grid li a.thumb{color: #fff; display: block; margin: auto; background: #fff no-repeat top center; width: 136px; padding-top: 101px; height: 1px; overflow: hidden;} +#sites.grid li h5{margin-top: 3px; padding: 5px; font-size: 11px; font-weight: normal; color: #fff;} +#sites.grid li h5 a{color: #fff;} +#sites.grid li p{display: none;} +#sites.grid li.show{opacity: 0.99;} + +#sites.list{background: none !Important; display: block; margin: 0px; padding: 0px; width: auto; list-style: none;} + +#sites.list li{background: none !Important; opacity: 0.99 !Important; display: none; border-bottom: 1px solid #ccc; text-align: left; +padding: 10px 10px 10px 150px; position: relative; min-height: 90px; height: auto !Important; height: 90px;} + +#sites.list li a.thumb{display: block; border: 1px solid #999; background: no-repeat top center; width: 115px; padding-top: 81px; height: 1px; +overflow: hidden; position: absolute; top: 15px; left: 10px;} + +#sites.list li h5{margin: 2px 0px 5px 0px; padding: 2px; font-size: 16px;} + +#sites.list li p{} +#sites.list li.show{opacity: 0.99 !Important; display: block;} + +div#showcase{width: 750px; height: 470px; overflow: auto; padding: 5px;} +div#showcase div.image{margin: 0px 0px 20px 20px; width: 450px; height: 280px; overflow: hidden; border: 1px solid #ccc; text-align: center; +position: absolute; top: 20px; right:0px; +} +div#showcase h1{float: left; color: #575757; width: 280px;} + +div#showcase div.desc{overflow: auto; position: absolute; bottom: 0px; height: 125px; +padding: 7px; border-top: #e7e7e7 1px solid; margin-top: 35px; width: 745px;} + +div#showcase div.desc p{font-size: 12px !Important; line-height: 20px;} + +div#showcase dl{clear: left;} +div#showcase dt{font-weight: bold;} +div#showcase dd{margin-bottom: 10px;} + +/* FAQ */ +.faqGroup{list-style: none; margin: 0; padding: 0px;} +.faqGroup li{display: block; width: 350px; height: 100px; float: left; margin:0px 20px 30px 0px;} +.faqGroup li h3{margin: 5px 0 0 0; padding: 0px;} +.faqGroup li p{padding-top: 10px; margin: 0px; } +.faqGroup li.alt{float: right; } +.faqGroup h3 a{color: #000 !Important; text-decoration: none !Important;} +.faqGroup a:hover h3{color: #000; text-decoration: underline !Important;} + +.faqGroupFeatureLink li{display: block; width: 150px; float: left; margin:0px 10px 15px 0px;} +.faqGroupFeatureLink a{color: #000 !Important; text-decoration: none !Important;} +.faqGroupFeatureLink a:hover{color: #000; text-decoration: underline !Important;} + +/* Partners */ + +.solutionProvider img{float: right; margin-top: 10px} +.solutionProvider .meta{margin-bottom: 15px} +.solutionProvider .meta p{font-size: 13px; margin-bottom: 0px} +.solutionProvider{border-bottom: 1px solid #efefef; padding: 10px; margin-bottom: 10px} + +.goldProvider{border: 1px solid #efefef; background: #f7f7f7;} + +/* GOLD PARTNERS */ +ul.goldPartners, ul.standardPartners{margin: 0px; padding: 0px;} +li.partner{display: block; float: left; padding: 10px; margin: 7px; width: 225px; border: 1px solid #efefef} +li.partner a, li.partner a *{text-decoration: none !Important; color: #000} +li.partner h3{color: #000; font-size: 18px; font-weight: bold; margin: 0px;} + +li.partner span.location{line-height: 15px; display: block; padding: 7px 0px 7px 0px; margin-bottom: 10px; border-bottom: #dbdbdb 1px solid; color: #666 !Important; font-size: 12px;} + +li.partner div.providerLogo{height: 160px; display: block; overflow: hidden;} +li.partner span.abstract{border: 1px solid #efefef; line-height: 17px; display: none; font-size: 12px; color: #666; padding: 10px; background: #f9f9f9; height: 138px;} + +ul.goldPartners li.partner a:hover img{display: none;} +ul.goldPartners li.partner a:hover span.abstract{display: block;} +li.partner a:hover h3{text-decoration: underline !Important;} +li.partner img{margin: auto;} + +ul.standardPartners li.partner h3{height: 18px; overflow: hidden} +ul.standardPartners li.partner{width: 135px; padding: 3px; margin: 7px;} +ul.standardPartners li.partner h3{font-size: 12px;} +ul.standardPartners li.partner div.providerLogo{height: 90px;} +ul.standardPartners li.partner span.location{line-height: 10px; font-size: 12px;} + +/*Licenses */ + +.licenseTable td{padding: 7px; border-bottom: 1px solid #efefef;} +.licenseTable{margin-bottom: 30px;} + + +/* PRODUCTS */ +div.product{padding-left: 70px; padding-bottom: 20px; background: url(/images/bg-ico2.gif) no-repeat 10px 0px; } + +/* ABOUT US */ +.class-team img {margin: 0 15px 15px 15px;} + +/* TEST YOUR NEEDS */ +#test-your-needs-container p { + margin-bottom: 2px; +} +.need-cost { + font-weight: bold; + margin-bottom: 8px; + +} + +.need-result{ + padding-left: 60px; + background: url(/images/custom/need-result-selected.png) no-repeat; +} + +.need-result-summary{ + padding-left: 60px; +} + +.needs-total { + font-weight: bold; + font-size: 130%; + padding-bottom: 10px; +} +.btn-add-to-cart { + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(/images/custom/btn-order-inline.png) no-repeat; + width:152px; + height:50px; + margin-top: 25px; +} +.btn-add-to-cart:hover { + background:url(/images/custom/btn-order-inline-hover.png) no-repeat; +} + +.btn-calculate-my-price { + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(/images/custom/btn-calculate-price.png) no-repeat; + width:152px; + height:50px; + margin-top: 25px; +} +.btn-calculate-my-price:hover { + background:url(/images/custom/btn-calculate-price-hover.png) no-repeat; +} + +.test-your-needs-questions{list-style: none; margin-left: 0; padding-left: 0;} +.test-your-needs-questions li{display: block; margin: 0; padding: 10px 0;} +.test-your-needs-questions input {margin-top: 0px; padding-top: 0px;} +.test-your-needs-questions label{padding-left: 5px; font-size: 20px;} +#test-your-needs-container h2 { +line-height: 125%; +} + + +/* 2 column pages */ +.two-column .left-column{width: 380px;} +.two-column .right-column{width: 380px;} + +.noSidebar .left-column, .noSidebar .right-column{width: 450px;} + +/* 3 column pages */ +.three-column .left-column{width: 310px; margin: 0px;} +.three-column .center-column{width: 310px; float: left; margin: 0px 15px 0px 15px;} +.three-column .right-column{width: 310px; margin: 0px;} + +/* SHOP FLOW UL */ +ul.shop-flow{display: block; list-style: none; height: 50px; padding: 0px; margin: 0px; margin-left: -10px;} +ul.shop-flow li{ display: block; padding: 0px; margin: 0px; border-bottom: 3px solid #000; float: left; height: 40px; margin-right: 2px;} +ul.shop-flow li span{display: block; padding: 20px;} +ul.shop-flow li.active{border-color: #ff6e00;} +ul.shop-flow li.done{border-color: #7a7a7a;} + +/* SHOP FLOW BUTTONS */ +#umbracoFormNavigation a{ + display: block; + width: 93px; + height: 22px; + padding-top: 6px; + font-size: 14px; + text-decoration: none; + color: white; + background: url(/images/custom/btn_sqr_blank.png) no-repeat top left; + text-align: center; +} + +/* Shop flow Checkout */ +.checkOut #couponCode{display: none;} + + +/*BREADCRUMB */ +ul.breadcrumb{z-index: 99; position: relative; list-style: none; margin: 0; padding: 0; margin-bottom: 20px;} +ul.breadcrumb li{color: #999 !Important; list-style: none; margin: 0; padding: 0; display: inline;} + +ul.breadcrumb li a{color: #999 !Important;} + + +/* BIRD */ +#bird{z-index: 999; position: relative; background: no-repeat url(/images/custom/bird0.gif) bottom left; height: 100px; width: 100px;} + + +/* EXTRA HEADER BUTTONS */ +a.support{ + width:108px; + height:108px; + text-indent:-9999px; + overflow:hidden; + float:right; + background:url(../images/btn-support.png) no-repeat; +} + +a.support:hover{background:url(../images/btn-support-hover.png) no-repeat;} + + +/* VIDEO PAGE*/ +div.videoChapter, div.videoChapter *{text-decoration: none !Important; color: #000 !Important;} +.video-list a{text-decoration: none !Important; color: #000 !Important; font-weight: normal; font-size: 10px} + +/* New list of videos... */ +.video-list2{list-style: none; display: block; padding: 0px; marging: 0px;} +.video-list2 li{width: 140px; overflow: hidden; display: block; float: left; margin: 7px; height: 145px; background: #252525;} +.video-list2 li .image{overflow: hidden; display: block; height: 100px;} + +.video-list2 li a{font-size: 11px; font-weight: normal; line-height: 13px; color: #fff !Important; text-decoration: none !Important; display: block; text-align: center;} +.video-list2 li a:hover{text-decoration: underline !Important;} +.video-list2 span.text2{display: block; padding: 4px;} +.video-list2 span.image{display: block; background: #efefef} + +/*Video Tutorial Page*/ +#VideoPlayer{margin-top: 0px; border-bottom: 2px solid #000; padding-bottom: 10px; margin-bottom: 20px;} +ul#VideoRelatedVideos{height: 555px; overflow: auto; float: right; width: 220px; list-style: none; padding: 0px; margin: 0px; } +ul#VideoRelatedVideos li{display: block; border-bottom: 1px solid #efefef; padding: 10px; height: 50px;} +ul#VideoRelatedVideos li.header{padding: 0px 10px 0px 10px; height: 25px} +ul#VideoRelatedVideos li img{float: left; margin: 0px 10px 10px 0px; border: 1px solid #efefef; background: #fff} +ul#VideoRelatedVideos li h5{padding: 0px; font-weight: normal; margin: 0; font-size: 12px; line-height: 16px} +ul#VideoRelatedVideos li h3{padding: 0px; margin: 0px; line-height: 20px} +ul#VideoRelatedVideos li.playing{background: #efefef;} + +/*Featured video */ +#tutorialFeature{border-bottom: 2px solid #EFF2F2; padding: 10px; margin-bottom: 10px; color: #666;} +#tutorialFeature h2, #tutorialFeature p, #tutorialFeature li{color: #666;} +#tutorialFeature a.preview{margin: 10px; margin-right: 35px; width: 350px; height: 190px; float: left; border: 1px solid #666} +#tutorialFeature ul{padding: 0px; list-style: none;} +#tutorialFeature ul li{padding-left: 20px; display: block; } +#tutorialFeature img{margin-bottom: 20px;} + + +/*developer page */ +.ajax ul{list-style: none; padding: 0px; margin: 0px; margin-bottom: 4px} +.ajax ul li{display: block; padding: 5px; border-bottom: 1px solid #efefef; height: 50px} +.ajax ul li small{display: block; padding: 2px; color: #999} +.ajax ul li img{width: 48px; height: 48px; float: left; margin: 0px 7px 5px 0px;} + +/* Training */ +table.reservations{} +table.reservations td, table.reservations th{padding: 7px; text-align: left; border-bottom: 1px solid #efefef} +table.reservations tbody th{width: 120px;} +table.reservations tbody td{padding-right: 10px;} +table.reservations tbody input{padding: 2px; width: 200px; font-size: 16px;} + +.center{display: block; padding: 2px; text-align: center} + +.eventList{margin: 0px; padding: 0px; list-style: none;} +.eventList li{margin: 0px; padding: 3px; border-bottom: 1px solid #efefef; display: block;} +.eventList h4{padding: 0px; margin: 0} +.eventList small{ color: #666;} + +/*RELEASES*/ +.releases-list a{color: black !Important; text-decoration: none !Important;} +.releases-list .summary{ + padding: 10px; background: #efefef; margin: 7px 7px 7px 20px; display: none; +} + + +/* BLOG */ + +p.postmetadata{color: #666; margin-bottom: 30px} +.post small{color: #666; margin-top: -10px; padding-bottom: 15px; display: block;} + + +#commentform{ + padding-left: 10px; + padding-top: 10px; + padding-bottom: 10px; +} + #commentform #gravatar{ + float:right; + margin-right: 190px; + margin-top: 20px; +} +#commentform label +{ + float:none; +} +#commentform .form-input{ + margin-top: 5px; + margin-bottom: 5px; +} +#commentform .form-input textarea{ + width: 400px; +} +#commentform .error{ +padding:0 0em; +} +#commentform label.error{ +border:none; + +padding:0 0.8em; +} +#commentform label.error { +background:#FFF; +border-color:#FBC2C4; +color:#8A1F11; +} + +#commentPosted { +border:1px solid #DDDDDD; +margin-bottom:0.5em; +padding:0 0.8em; +padding:10px; +} + +#commentPosted { +background:#FFF6BF none repeat scroll 0 0; +border-color:#FFD324; +color:#514721; +} + +ol.commentlist{margin-left: 0px; padding: 0px; list-style: none;} + +ol.commentlist li{ +margin-bottom: 10px; +padding: 10px; +background: #FAFAFA; +} + + +ol.commentlist li small.commentmetadata{display: block; font-size: 10px; padding-bottom: 5px;} +ol.commentlist li small.commentmetadata a{color: #999;} +ol.commentlist li img.gravatar{float: right; margin: 0px 0xp 10px 10px; border: 1px solid #ccc; padding: 1px;} + +/* Twitter */ +#twitterUpdates{padding: 0px; margin: 0px; list-style: none} +#twitterUpdates li{display: block; padding: 5px; margin-bottom: 20px;} +#twitterUpdates li img{float: left; clear: left; margin: 0px 20px 20px 0px;} + + +/* SEARCH */ +.searchResults{list-style: none; padding: 0px; margin: 0px;} +.searchResults li{display: block; padding-left: 60px; background: url(/images/custom/search_text.gif) no-repeat 15px 7px;} + + +.searchResults li.videochapter, .searchResults li.videotutorial{background-image: url(/images/custom/search_video.gif);} +.searchResults li.umbracoblogpost{background-image: url(/images/custom/search_blog.gif);} +.searchResults li small{color: #666; display: block; font-size: 11px} +.searchResults li h3{margin-bottom: 2px;} +.searchResults li p{margin-top: 2px;} + +/* Paypal redirect */ +body.redirecting{ + margin-top: 100px; + text-align: center; +} + +body.redirecting h1{display: block !Important; font-size: 22px} +body.redirecting div{ + margin: auto; + text-align: center; + width: 600px; + padding: 30px; + + font-size: 18px; + color: #666; + background-color: #fff; + border: 5px solid #CCDDFF +} + + +/* -- 23Videos (List for 23videos - used on CG11 ticket page) -- */ +#video23List { margin:0; padding:0; } +#video23List li { display:inline-block; height:140px; list-style-type:none; margin:0 2px; overflow:hidden; position:relative; width:170px;} +#video23List li a { color:#fff; display:block; text-decoration:none; } +#video23List li img { position:absolute; z-index:10; } +#video23List li span { background:#000; background:rgba(0,0,0,0.8); bottom:0; color:#fff; font-size:11px; height:30px; /*40-5-5=30*/ line-height:12px; padding:5px; position:absolute; width:160px; /*170-5-5=160*/ z-index:11; } + +/* -- Image Cover for Convince your boss pdf -- */ +.convinceCover { -moz-box-shadow:1px 1px 5px #666; -o-box-shadow:1px 1px 5px #666; -webkit-box-shadow:1px 1px 5px #666; box-shadow:1px 1px 5px #666; float:left; margin-right:20px; } + +/* -- CodeGarden homepage panel & button text --*/ +.tabset li a span.codegarden { background:url(../images/custom/text-codegarden-panel-label.png) no-repeat 0 0; width:92px; } +.promo-box .cyan-alt .container { background:url(../images/custom/bg-container-cyan-alt.jpg) no-repeat scroll 50% 0 transparent; } +.cgPanelHeader { background:url(../images/custom/text-codegarden-panel-header.png) no-repeat; height:89px; overflow:hidden; text-indent:-9999px; width:459px;} +.cgPanelText { width:470px; } +.cgBuyTicketBtn { background:url(../images/custom/btn_get-your-ticket.png) no-repeat 0 0; cursor: pointer; float: right; height: 108px; margin:20px 0 0 15px; overflow: hidden; text-indent: -9999px; width: 108px; } +.cgBuyTicketBtn:hover { background-position:0 -108px; } + + + +/* -- Nivio Slider styles --*/ +#slider { + position:relative; + width:692px; + height:461px; + background:url(../images/nivio-slider-2.4/loading.gif) no-repeat 50% 50%; + /*margin-bottom:50px;*/ +} +#slider img { + position:absolute; + top:0px; + left:0px; + display:none; +} +#slider a { + border:0; + display:block; +} + +.nivo-controlNav { + position:absolute; + left:260px; + bottom:-42px; +} +.nivo-controlNav a { + display:block; + width:22px; + height:22px; + background:url(../images/nivio-slider-2.4/bullets.png) no-repeat; + text-indent:-9999px; + border:0; + margin-right:3px; + float:left; +} +.nivo-controlNav a.active { + background-position:0 -22px; +} + +.nivo-directionNav a { + display:block; + width:30px; + height:30px; + background:url(../images/nivio-slider-2.4/arrows.png) no-repeat; + text-indent:-9999px; + border:0; +} +a.nivo-nextNav { + background-position:-30px 0; + right:15px; +} +a.nivo-prevNav { + left:15px; +} + +.nivo-caption +{ + color:#fff; +} + +.nivo-caption p { color:#fff; } + +.nivo-caption a { + text-decoration:underline; +} + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/Deli.css b/Marketplace/Css/Deli.css new file mode 100644 index 00000000..c195b183 --- /dev/null +++ b/Marketplace/Css/Deli.css @@ -0,0 +1,1190 @@ +/* profile primary navigation */ + +.options ul, +.projectOptions ul, +.stepNavigation +{ + height:30px!important; + display:block; + border-bottom: 1px solid #82B84F; + margin:1em 0 0 0; + padding:0; +} + +.projectOptions +{ + position:absolute; + top:0; + left:0; + height:30px; + +} + +.projectOptions ul +{ + border-bottom:none!important; + +} + +.options ul li, +.projectOptions ul li, +.stepNavigation li +{ + float:left; + list-style:none; + padding:5px !important; + margin-bottom:-1px; + z-index:100; + height:20px; + margin:0!important; + -webkit-border-top-left-radius: 3px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + -moz-border-radius-topleft: 3px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.5s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.5s ease-in; + -moz-transition: background 0.5s ease-in; +} + + + +.options ul li:hover, +.projectOptions ul li:hover, +.stepNavigation li:hover +{ + background:#efefef; +} + +.projectOptions ul li:hover +{ + background:#FFF6BF; +} + +.options ul li.current, +.projectOptions ul li.current, +.stepNavigation li.current +{ + border-top: 1px solid #82B84F; + border-left: 1px solid #82B84F; + border-right: 1px solid #82B84F; + background: #d3f39c; + font-weight:bold; +} + +.projectOptions ul li.current +{ + border:none; + background:#efefef; +} + +.projectOptions ul li.current a{ + text-decoration:none!important; + color:#333!important; + font-weight:normal!important; +} + +.options ul li.current:hover +{ + background: #d3f39c; +} + +.projectOptions ul li.current:hover{ + background:#efefef; +} + +.options a, +.projectOptions a, +.stepNavigation a +{ + font-size:13px !important; +} + +#projectDescription .options a +{ + font-size:11px !important; +} + +.options li.current a, +.stepNavigation li.current a +{ + text-decoration:none; + color:#252525; +} + +/* profile & package creation sub navigation */ +.stepNavigation +{ + border-bottom: 1px solid #FFD324; +} + +.stepNavigation li.current +{ + border-top: 1px solid #FFD324; + border-left: 1px solid #FFD324; + border-right: 1px solid #FFD324; + background:#FFF6BF; +} + +.stepNavigation li.current:hover +{ + background:#FFF6BF; +} + +#tabs +{ + position:relative; + padding-top:43px; +} + +.tabContent +{ + padding:0px 1em 5px 1em; + border: 1px solid #efefef; + background:#F6F7F7; + overflow:hidden; + /*-webkit-border-bottom-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-topright: 5px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + border-top-right-radius: 5px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px;*/ + + +} + +/* Cart Progress Indicator */ + +.cartProgress +{ + clear:both; + overflow:hidden; + margin-bottom:10px; +} + +.cartProgress ul +{ + margin:0; + padding:0; +} + +.cartProgress ul li +{ + list-style:none; + display:block; + height:20px; + line-height:20px; + padding:5px 0px 5px 0px; + width:195px; + color:#ccc; + float:left; + margin: 0; + text-align:center; + font-size:14px; + +} + +.cartProgress ul li.complete +{ + color:#666; + background:#d3f39c; + font-weight:bold; +} + +.cartProgress ul li.current +{ + color:#fff; + font-weight:bold; + background:#8ECA56; + background:#8ECA56 url(img/progress_indicator.png) no-repeat top left; + -webkit-border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-topright: 3px; + -moz-border-radius-bottomright: 3px; + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; +} + +.cartProgress ul li.first +{ + background-image:none; + -webkit-border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-topleft: 3px; + -moz-border-radius-bottomleft: 3px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; +} + + + + + + + +/* profile projects styles */ +.profileProjectsHolder +{ + width:650px; + float:left; +} + +.profileProjects +{ + margin:0; + padding:0; + clear:both; + overflow:hidden; +} + +.profileProjects>li +{ + list-style:none; + float:left; + display:block; + width:220px; + height:90px; + border:1px solid #ccc; + background:#eee; + padding:10px 10px 10px 80px; + margin:0 1em 1em 0; + position:relative; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; +} + +.profileProjects>li.add +{ + background:#e6ffc6; + border:1px solid #8ECA56; +} + + +.profileProjects img +{ + position:absolute; + left:15px; + top:10px; +} + +.profileProjects>li.add img +{ + top:20px; + left:55px; +} + +.profileProjects>li:hover +{ + background:#ddd; +} + +.profileProjects>li.add:hover +{ + background:#baf581; +} + +.profileProjects>li h3 +{ + margin:0; + padding:0; +} + +.profileProjects>li.add h3 +{ + margin-top:27px; + margin-left:35px; +} + +.profileProjects .projectNav +{ + margin:.5em 0 0 0; + padding:0; +} + +.profileProjects .projectNav li +{ + margin:0; + padding:0; + float:left; + list-style:none; +} + +.profileProjects .projectNav li a +{ + display:block; + padding:.3em .5em; + background:#999; + text-decoration:none; + font-size:.9em; + font-weight:bold; + color:#fff; + margin:.1em; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.1s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.1s ease-in; + -moz-transition: background 0.1s ease-in; +} + +.profileProjects .projectNav li a:hover +{ + background:#8ECA56; +} + +.profileProjects .projectIcon +{ + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + + +/* Deli BI styles */ + +.overviewCharts .biChart +{ + float:left; + width:215px; + height:225px; + padding:10px; + margin:10px 10px 10px 0; + border:1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + + +.overviewCharts .biChart.last +{ + margin-right:0; +} + + + +.overviewCharts .biChart h3, .statsBoxLine h3 +{ + margin:0; + padding:0; +} + + +.statsBoxLine +{ + float:left; + width:485px; + height:220px; + padding:10px; + margin:10px 10px 10px 0; + border:1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +fieldset p{ +clear:both; +} + +.dataTable +{ + border-collapse:collapse; + border:1px solid #ddd; + width:100%; + margin-bottom:1em; +} + +.dataTable td, .dataTable th +{ + padding:8px !important; +} + + +.dataTable th +{ + color: #fff; + background: #8ECA56; + font-size:14px; +} + +.dataTable tbody tr +{ + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; +} + +.dataTable tbody tr:hover +{ + /*text-shadow: 0 0 3px #fff;*/ + background:#ddd; +} + +.dataTable tbody tr.totals:hover td +{ + + background:#82B84F; +} + +.dataTable tr.totals +{ + font-weight:bold; + font-size:14px; +} + +.dataTable tr.totals td +{ + border-top:3px solid #8ECA56; +} + +.dataTable .count, .dataTable .center +{ + text-align:center; +} + +.dataTable .money, .dataTable .right +{ + text-align:right; +} + +.statsOverview +{ + overflow:hidden; +} + +.statsBox +{ + width:200px; + height:90px; + float:left; + margin:10px 10px 10px 0; + border:1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +.statsBox .holder50 +{ + overflow:hidden; +} + +.statsBox .stat, .statsBox .stat50 +{ + text-align:center; + padding:10px; + background:#eee; +} + +.statsBox .stat span +{ + font-size:25px; + font-weight:bold; +} + +.statsBox .stat50 span +{ + font-size:20px; + font-weight:bold; +} + +.stat50 +{ + + width:80px; + float:left; + padding-bottom:5px!important; + padding-top:5px!important; +} + +.statsBox.green .stat +{ + background:#D3F39C; +} + +.statsBox.red .stat +{ + background:#ffbebe; +} + +.statsBox .statType +{ + font-size:15px; + font-weight:bold; + text-align:center; + padding:10px; + color:#fff; + background:#999; + border-top:1px solid #fff; +} + +.statsBox.green .statType +{ + background:#8ECA56; +} + +.statsBox.red .statType +{ + background:#bc3a3a; +} + +.statsBox.tall +{ + height:141px; +} + +/* package creation go live check styles */ + + +.eligibilityNotification, .errorBox +{ + padding:.5em 1em 0 1em; + font-weight:bold; +} + +.eligible +{ + border:4px solid #8ECA56; + background:#ddffbe; +} + +.notEligible, .errorBox +{ + border:4px solid #bc3a3a; + background:#ffbebe; +} + + +/* addtocart styles */ + +.projectPurchase, .projectDownload +{ + display:block; + margin-bottom:10px; + padding:10px 10px 10px 50px!important; + text-decoration:none; + position:relative; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color:#999999; + font-size:80%; + text-decoration:none !important; +} + +.downloadBtn img{ +border:0; +} + + +.projectPurchase +{ + background:url("img/shoppingbasket.png") no-repeat 10px 10px #CCE2F8; +} + +.projectDownload +{ + background:#DDF8CC!important; +} + +.projectDownload .downloadBtn +{ + display:block; + position:absolute; + left:7px; + bottom:3px; + border:0; +} + + +.projectPurchase h4, .projectDownload h4 +{ + margin:0; + padding:0; +} + +.projectPurchase ul +{ + margin:0; + padding:0; +} + +.projectPurchase li +{ + font-size:11px; + display:block; + list-style:none; + margin:0; + padding:3px; + line-height:18px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color:#999; +} + +.projectPurchase li:hover +{ + background-color:#eee; +} + +.projectPurchase li .addToCart +{ + float:right; + width:30px; + height:18px; + border:0; +} + +.microCart +{ + color:#fff; + margin-left:10px; + display:inline-block; + background:#8ECA56; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + padding:3px 3px 3px 0px; + + +} + +.microCart a +{ + text-decoration:none; +} + +#top #memberHeaderProfile +{ + top:0!important; + right:0!important; +} + +.deliLeft +{ + float:left; + width:220px; +} + +.deliRight +{ + float:left; + width:760px; +} + +.deliNav +{ + width:190px; + padding:10px; + background:#efefef; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + margin-right:10px; + margin-bottom:10px; +} + +.deliNav.paid, .deliNav.hqPicks +{ + background:#CCE2F8; +} + +.deliHelp +{ + background:#FFF6BF; +} + + +.deliNav h3 +{ + padding:0 0 5px 0; + margin:0; + border-bottom:1px solid #ddd; +} + +.deliNav ul, +ul.linkList +{ + margin:5px 0; + padding:0; +} + +.deliNav li, + ul.linkList li +{ + list-style:none; + padding:3px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; + font-size:13px; + font-weight:bold; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + position:relative; +} + + ul.linkList.icons li + { + padding-left:40px; + } + + ul.linkList.icons li img + { + position:absolute; + left:3px; + top:3px; + } + +.deliNav li:hover, +ul.linkList li:hover, +.deliNav li.current, +ul.linkList li.current +{ + background:#fff; +} + +.deliNotification ul.linkList li:hover +{ + background:#FFD324; +} + +.deliNotification ul.linkList small +{ + font-weight:normal; +} + +.deliNav li a, +ul.linkList li a +{ + text-decoration:none!important; +} + +.deliFeatureBox +{ + border: 1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + padding:10px; + margin-top: 0px; + position:relative; +} + +.deliFeatureBox +{ + padding:0; +} + +.deliFeatureBox img +{ + display:block; + border:0; +} + +.deliFeatureBox:hover .deliPackage +{ + display:block; + position:absolute; + left:10px; + top:10px; + width:300px; + height:230px; + background:#fff; + z-index:200; + + + border:1px solid #fff; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); + -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); + -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); +} + +.deliPromoBox{ + position:relative; +} + + +.deliPromoBox h2 +{ + margin-top: 8px; + margin-bottom: 10px; + padding-bottom: 3px; + + border-bottom: 1px solid #efefef; +} + +.deliPromoBox a.viewAll +{ + position:absolute; + right:10px; + top:2px; + font-size:13px; +} + +.deliPromoBox ul +{ + margin:0; + padding:0; +} + +.deliPromoBox li +{ + list-style:none; + float:left; + background:#fff; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + width:164px; + height:110px; + margin:10px; + text-align:center; + position:relative; +} + +.deliPromoBox li .deliPackage +{ + padding:5px; +} + +.deliPromoBox li .deliPackage a +{ + color: #000; + text-decoration: none; +} + +.deliPromoBox li .deliPackage a:hover +{ + text-decoration: underline; +} + + + +.commercialIndicator +{ + position:absolute; + top:0; + right:0; + width:30px; + height:30px; + text-indent:-9999em; + font-size:1px; +} + +.commercialIndicator.commercial +{ + background:url(img/paid-euro.png) no-repeat top right; +} + + + +.deliPromoBox li .hiLite, +.deliFeatureBox .deliPackage +{ + display:none; +} + +.packageIcon +{ + margin:0 auto; + display:block; + width:50px; + height:1px; + padding: 0; + overflow: hidden; + padding-top: 50px; +} + +.deliPromoBox li h3 +{ + font-size:12px; + margin:0; + padding:0; +} + +.deliPromoBox li .creator, +.deliFeatureBox .deliPackage .creator +{ + font-size:9px; + display: none; +} + +.deliPromoBox li .category +{ + font-size:9px; +} + +.deliPromoBox li .popularity +{ + display: none; +} + + +.deliPromoBox li:hover .deliPackage +{ + position:absolute; + top:-25px; + left:-65px; + width:300px; + height:200px; + background:#fff; + border:1px solid #fff; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + z-index:200; + text-align:left; + padding:0; + box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); + -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); + -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); +} + +.deliPromoBox li:hover .deliPackage .brief, +.deliFeatureBox .deliPackage .brief +{ + padding:5px 10px 10px 85px; + position:relative; + height:50px; +} + + +.deliPromoBox li:hover .deliPackage .brief .packageIcon, +.deliFeatureBox .deliPackage .brief .packageIcon +{ + position:absolute; + left:10px; + top:5px; +} + + +.deliPromoBox li:hover .deliPackage h3, +.deliFeatureBox .deliPackage h3 +{ + font-size:14px; + margin-top:12px; +} + +.deliPromoBox li:hover .deliPackage .creator, +.deliFeatureBox .deliPackage .creator +{ + position:absolute; + bottom:5px; + right:5px; +} + +.deliPromoBox li:hover .hiLite, +.deliFeatureBox .deliPackage .hiLite +{ + display:block; + padding:5px 10px 10px 85px; +} + +.deliPromoBox li:hover .hiLite p, +.deliFeatureBox .deliPackage .hiLite p +{ + font-size:12px!important; + margin:0; + padding:0; + line-height:15px; + color: #444444 +} + +.deliPromoBox li:hover .hiLite a, +.deliFeatureBox .deliPackage .hiLite a +{ + text-decoration:none!important; +} + +.deliPromoBox li:hover .popularity, +.deliFeatureBox .deliPackage .popularity +{ + display:block; + position: absolute; + top: 70px; + left: 10px; + width: 50px; + text-align: center; + font-size: 14px; + font-weight: bold; + color: #5c5c5c +} + +.deliPromoBox li:hover .popularity .karma, +.deliFeatureBox .deliPackage .popularity .karma{ + padding-bottom: 7px; + border-bottom: 1px solid #ccc; + margin-bottom: 7px; + +} + +.deliPromoBox li:hover .popularity small, +.deliFeatureBox .deliPackage .popularity small +{font-size: 10px; + font-weight: normal; display: block; text-variant: uppercase} + +.deliTags #tagCloud +{ + margin:0; + padding:0; +} + +.deliTags #tagCloud a +{ + text-decoration:none; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; + padding:3px 5px; + margin:0; +} + +.deliTags #tagCloud a:hover +{ + background:#8ECA56; + color:#fff; +} + + + .deliNotification + { + padding:10px 20px 10px 20px; + background:#FFF6BF; + border:1px solid #FFD324; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + margin-bottom:10px; + } + + .sidebarNotification + { + margin-top:44px; + width:288px; + float:left; + } + + .deliNotification h3 + { + margin:0; + padding:0; + } + + +.deliPaging +{ + clear:both; +} + +.deliPaging li +{ + width:auto!important; + height:auto!important; +} + +.deliPaging li a +{ + display:block; + background:#eee; + color:#000; + padding:5px; + text-decoration:none; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-transition-property: background; + -webkit-transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -o-transition: background 0.3s ease-in; + -moz-transition: background 0.3s ease-in; +} + +.deliPaging li a:hover +{ + background:#8ECA56; + color:#fff; +} + +.deliPaging li a.selected +{ + background:#8ECA56; + color:#fff; +} + + +.clearfix:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} + + + +.clearfix { + display: inline-block; +} + +html[xmlns] .clearfix { + display: block; +} + +* html .clearfix { + height: 1%; +} + + + + + + + + + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/DeliAdmin.css b/Marketplace/Css/DeliAdmin.css new file mode 100644 index 00000000..1a43b924 --- /dev/null +++ b/Marketplace/Css/DeliAdmin.css @@ -0,0 +1,39 @@ +.dataTable +{ + width:100% !important; + table-layout: auto; + border-collapse: collapse; + border:#ccc 1px solid; +} +/*Header and Pager styles*/ +.dataTable thead tr +{ + background-image: url(../images/HeaderWhiteChrome.jpg); + background-position:center; + background-repeat:repeat-x; + background-color:#fff; + border-bottom:solid 1px #ccc; +} +.dataTable th +{ + padding: 5px; + color: #333; + text-align:left; +} + + +/*RowStyles*/ +.dataTable td +{ + padding: 5px; + border-right: solid 1px #ccc; +} + +.dataTable .borderTop +{ + border-bottom: solid 1px #ccc; +} + +.dataTable .right{ + text-align:right; +} \ No newline at end of file diff --git a/Marketplace/Css/community.css b/Marketplace/Css/community.css new file mode 100644 index 00000000..6258bbc0 --- /dev/null +++ b/Marketplace/Css/community.css @@ -0,0 +1,761 @@ +/*OVERALL LAYOUT*/ +html, body{padding: 0px; margin: 0px; border: none; height: 100%;} +body{font-size: 12px; background: #f5f5f5 url(img/body_bg.gif) repeat-y top center; +font-family: Trebuchet MS,Arial,sans-serif; color: #2d2c2e; padding-bottom: 0px;} + +body#tinymce{background-image: none !Important; text-align: left !Important; padding: 10px !Important;} + +#main{text-align: center; + min-height: 100%; height: auto !Important; height: 100%; +} + +.wrapper, #contentArea{margin: auto; text-align: center; width: 980px; position: relative} +.divider{padding: 5px; border-bottom: 1px #999 dotted; clear: both; margin-bottom: 10px;} + +#body, .subpage{text-align: left; } +body a{color: #2244BB } + +/*TOP + TOPNavi */ +#top{ +background: url(img/top_bg_green2.gif) repeat-x top #8ECA56; +position:relative; margin-bottom: 0px; height: 83px;} + +#top #memberInfo{background: #82b84f; height: 20px; padding: 5px;} + +#top a#logo{display: block; top: 9px; left: 0px; padding: 36px 161px 0px 0px; width: 1px; height: 1px; overflow: hidden; +background: url(img/top_logo.png) no-repeat left top; position: absolute; +} + +#top ul{float: right; list-style: none; margin: 12px 0 0 18px; padding: 0px; height: 29px; display: block;} +#top ul li{display: block; float: left; padding: 0; padding-left: 5px; height: 29px;} + +#top ul li a{ +color:#FFFFFF; display:block; +font-size:1.2em; font-variant:normal; font-weight:bold; +padding: 7px; text-decoration: none; height: 27px} + + +#top ul li a:hover{text-decoration: underline;} +#top ul li.current a{background: url(img/top_nav_a_bg.png) no-repeat bottom center;} + +#top #memberHeaderProfile{position: absolute; top: 5px; right: 7px; font-size: 11px; color: #fff; text-align: right; width: 700px;} +#top #memberHeaderProfile a{color: #fff; margin-left: 5px;} +#top #memberHeaderProfile div{display: inline !Important;} + + +#searchBar{background: #f4f4f2; border-bottom: 1px solid #dadad9; position: relative; padding: 0px; font-weight: bold; padding: 5px;} +#searchBar input.field{clear: both; margin: 0px; font-size: 1.3em; border: 1px solid #ccc; background: #fff; width: 260px} +#searchBar #bt_search{position: absolute; right: 0px; margin: 0px; font-size: 1.3em;} + +#searchBar .ui{text-align: left; width: 350px; position: relative; margin: auto;} + +#searchBarOptions{display: none; padding-top: 10px;} +#searchBarOptions label{padding-right: 15px; padding-left 5px;} + +/* Box Elemenet */ +.box { +background:#F6F7F7; +border:1px solid #F2F2F2; +display:block; +list-style-image:none; +list-style-position:outside; +list-style-type:none; +margin:0 0 20px; +padding:0 0 6px;} + +.box h4{color:#444444; font-size:12px; font-weight:bold; line-height:12px; padding: 10px !Important; background: #F0F2F2; + margin-top: 0px; margin-bottom: 0px; position: relative; +} + +.rounded{ + -webkit-border-radius: 10px; /* Safari prototype */ + -moz-border-radius: 10px; /* Gecko browsers */ + border-radius: 10px; /* Everything else - limited support at the moment */ +} + +.infoBox{padding: 7px 7px 7px 50px; height: auto !Important; min-height: 35px; height: 35px; background: #DDF8CC no-repeat 10px 7px; font-size: 11px;} +#forumTools{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/info.png); } +#projectsInfo{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } +#newTopic{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } +#solutionBox{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } + +.infoBox ul{list-style: none; margin: 0px; padding: 0px;} +.infoBox ul li{padding: 0px 0px 3px 0px;} +.infoBox a{padding: 2px; font-size: 12px;} +.infoBox small{color: #999; display: block; padding-top: 2px;} + +div.buttons{padding: 20px; background: #F0F2F2; font-size: 18px;} + +a.button{padding: 10px 0px 10px 0px; border: 1px solid #EFEFEF; text-decoration: none;} +a.button em{border: 5px solid #fff; padding: 5px; color: #fff; background: #F5366D; } + +/*Breadcrumb*/ +#breadcrumb{margin: 0px; margin-top: -10px !Important; padding: 4px; list-style: none; font-size: 10px; color: #999; display: block; margin-bottom: 10px;} +#breadcrumb li{display: inline; padding-right: 5px; margin: 0px;} +#breadcrumb li a{color: #999; padding-right: 3px;} + + +/*Footer*/ +.push{height: 60px; clear: both;} +#footer{font-size: 10px; background: #252525; color: #fff; padding: 20px; height: 19px; text-align: center; +border-top: 1px dotted #999; margin-top: -60px; clear: both; position: relative;} + +#footer a{color: #fff !Important} + +/* FORM ELEMENTS */ +label.inputLabel {font-weight:bold; width: 10em; display: block; float: left; padding: 1.5em 1.5em 1em 0; text-align: right; } + +fieldset {padding:0em;margin:1.5em 0 0 0;border:none; border-bottom:1px solid #ccc;} +fieldset small{display: block;} +legend {font-weight:bold;font-size:1.2em;} +input.text, input.title, textarea, select {margin:0.5em 0;border:1px solid #bbb;} +input.text:focus, input.title:focus, textarea:focus, select:focus {border:1px solid #666;} +input.text, input.title, select.title {width:300px;padding:5px;} +input.title, select.title {font-size:1.5em;} + +.buttons input{font-size: 18px;} + +textarea {width:300px;height:250px;padding:5px;} +.error, .notice, .success, .focus {padding:.2em;margin-bottom:1em;border:2px solid #ddd;} +.error {background:#FBE3E4 !Important;color:#8a1f11;border-color:#FBC2C4 !Important;} +.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} +.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} + +.error * {color:#8a1f11 !Important;} +.notice * {color:#514721;} +.success * {color:#264409;} + +.focus{border: none; border-top: 1px solid; border-bottom: 1px solid; border-color: #999; background: #F0F0F0;} + +.spotlight{padding: 0px; margin-bottom: 20px; border: none; background: none;} +.spotlight h3, .spotlight h4, .spotlight h2{position: relative; font-size: 14px; margin-bottom: 0px; margin-top: 0px; color: #333; border-bottom: 3px solid #efefef; padding-bottom: 4px;} +.spotlight h2{font-size: 18px;} + +.spotlight ul{list-style: none; margin: 0px; padding-left: 10px;} +.spotlight ul.pager{padding-left: 0px;} +.spotlight li{padding: 3px;} +.spotlight a{font-size: 12px;} + +.spotlight ul.summary{padding: 5px 0px;} +.spotlight ul.summary li{padding-bottom: 12px !Important; border: none !Important} +.spotlight a.rss_small{top: 3px;} + +dt{font-style: italic;} +dd{padding-bottom: 5px;} +label.error, label.notice, label.success {background: none; border: none; padding-left: 1em;} + +input.wikiheadline{display: block; background: white; border: 1px solid #DEE4EF; color: #46484B; width: 100%;} + +/* SEARCH RESULTS */ +#search .result{padding: 10px 10px 25px 80px; background: 20px 10px no-repeat url(search/forum.gif);} + +#search .result h3{padding: 0px; font-weight: normal; margin: 0px;} +#search .result h3 a{font-size: 14px; font-weight: bold; display: block; color: #333; text-decoration: none;} +#search .result a:hover{text-decoration: underline;} + +#search .result a *{color: inherit} +#search .result p{color: #000; font-size: 12px; padding: 0px; margin: 0px;} +#search .result cite{color: #666; font-size: 11px;} +#search .result em{font-weight: bold !Important;} + +#search .wiki{background-image: url(search/wiki.gif);} +#search .project{background-image: url(search/project.gif);} +#search .forum{background-image: url(search/forum.gif);} +#search .solution{background-image: url(search/solved.gif);} + +/* Member Badge */ +div.memberBadge{background: #f0f0f0; padding: 10px 0px 10px 0px; text-align: center;} +div.memberBadge *{color: #333;} +div.memberBadge img{display: block; margin: auto; border: 1px solid #999;} +div.memberBadge span{padding-top: 8px; display: block; font-weight: bold; font-size: 12px} +div.memberBadge small{display: block; font-weight: normal; margin-top: -6px; color: #999} + +/* FRONTPAGE */ +#dashboard{width: 980px; position: relative} +#sidebar{text-align: left; width: 300px; float: right; margin:20px 0px 20px 0px;} + +.callToAction h1{font-size: 20px;} +.callToAction p{font-size: 12px;} +.callToAction h1 a{color: #066808; text-decoration: none;} + +ul.summary{list-style: none; padding: 7px; margin: 0px; } +ul.summary li{display: block; border-bottom: #e7e7e7 1px dotted; padding: 3px;} +ul.summary li a{display: block; font-size: 11px;} +ul.summary li small a{display: inline;} + +ul.summary img{float: left; height: 32px; width: 32px; margin-right: 10px; overflow: hidden; font-size: 1px;} +ul.forumTopics li{height: auto !Important; height: 37px; min-height: 37px;} + +ul.wiki li{padding-left: 42px; background: url(img/doc.png) no-repeat left top;} +ul.projects li{padding-left: 42px; background: url(img/package.png) no-repeat left top;} + +a.rss_small{font-size: 9px; position: absolute; right: 10px; top: 8px; font-weight: normal; display: block; +padding: 14px 14px 0px 0px; overflow: hidden; height: 0px; width: 0px; background: url(img/rss.png) no-repeat top left; +} + +a.more{display: block; font-size: 11px; color: #999; text-align: center} + +/* PROJECTS */ +a.projectDownload{background: #ddf8cc url(img/down.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} +a.projectDownload span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} + +a.projectPurchase{background: #cce2f8 url(img/piggybank.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} +a.projectPurchase span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} + +.openForCollab{background: #cce2f8 url(img/group.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} +.openForCollab span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} + + +.projectGroups{margin: 0; padding: 0; list-style: none;} +.projectGroups li{margin: 0; float: left;} +.projectGroups li div{width: 380px; margin: 15px; margin-right: 30px; background: top left no-repeat; padding-left: 50px; height: 80px} + +.projectGroups h3{padding: 0px; font-weight: normal; margin: 0px;} +.projectGroups h3 a{font-size: 14px; font-weight: bold; display: block; color: #333; text-decoration: none;} +.projectGroups a:hover{text-decoration: underline;} + +.projectGroups a *{color: inherit} +.projectGroups p{color: #000; font-size: 12px; padding: 0px; margin: 0px;} + + +/* Options */ +#body .options{text-align: right; padding: 4px; font-size: 11px; margin-top:0px; margin-bottom: 10px;} +/*#body .options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 25px;} +#body .options ul li{float: left; padding-right: 15px;} +#body .options ul li a{font-size: 11px;}*/ + + +#body .options ul li.create{float: right!important;} + + +dl.summary{padding: 7px; font-size: 11px;} + + +#divFileProgressContainer{width: 300px; margin-top: 10px;} +#divFileProgressContainer .progressContainer{border: 1px solid #ccc; padding: 3px;} +#divFileProgressContainer .progressBarStatus{font-size: 10px; color: #999; } +#divFileProgressContainer .progressBarInProgress{background: green; height: 2px; overflow: hidden;} + + + +/* Member Profile */ +#profileNavigation{background: #F0F0F0; padding: 10px; border-bottom: 1px solid #ccc} +#profileNavigation #memberInfo{height: 70px; float: right; width: 300px; background: no-repeat right top; text-align: right; padding-right: 10px;} +#profileNavigation #memberInfo h3{color: #999; font-size: 18px; margin-bottom: 0px; margin-top: 5px;} +#profileNavigation #memberInfo h4{color: #999; font-size: 13px; margin: 0px;} +#profileNavigation #memberAvatar {float: right;} +#profileNavigation #memberAvatar img {height: 50px;} +#profileNavigation ul{padding: 17px; display: block; list-style: none; margin: 0px; font-size: 13px; font-weight: bold; color: #999;} +#profileNavigation ul li{display: inline;} +#profileNavigation ul a{padding: 10px;} + +#memberProfile #avatar{float: left; margin: 20px 25px 0px 0px; width: 55px} +#memberProfile #details{float: left; width: 800px;} +#memberProfile .badge{margin: auto; margin-top: 10px;} + +.yourProjects +{ + list-style-type:none; + margin-left:0; +} + +.yourProjects .projectImage +{ + float:left; + margin-right: 10px; +} + +.yourProjects .projectActions +{ + float:left; +} +.yourProjects h2 +{ + font-weight: normal; +} +.yourProjects p a +{ + color: #999999; +} + +/* Buddy Icon Form */ +#buddyIconForm {padding: 10px; display: block;} +#buddyIconForm .iconOption{width: 320px; display: block; text-align: center; float: left; font-size: 18px; font-weight: bold; color: #999;} +#buddyIconForm .iconOption img{display: block; margin: auto; border: none;} + +#webcamHolder{width: 320px; float: right; margin: 0px 0px 20px 20px;} + +/* VOTING */ +.voting{text-align: center; background: #FFF6BF; border: 2px solid #FFD324; padding: 10px 0px 10px 0px;} +.voting span{font-size: 25px; font-weight: bold; +color: #514721; display: block; text-align: center; margin-bottom: 7px;} +.voting span a{color: #514721; text-decoration: none; border-bottom: 1px dotted #999} + +.voting a.vote, .voting a.noVote{border: 1px solid #eacf5c; background: #fff; color: #514721; padding: 2px; font-size: 9px; text-decoration: none;} +.voting a.noVote{border: 1px solid #eacf5c; background: #FFF6BF; color: #eacf5c;} + + +.voting span.good a{color: green;} +.voting span.bad a{color: red;} + +.voting a img{border: none;} +.voting .like, .voting .dislike, .voting .kill{font-size: 11px; color: #066808;} + +.voting .TopicSolver{border: 1px solid #066808; padding: 2px; display: block; margin-top: 3px } + +#moveList{ z-index: 99999; text-align: right; display: none; margin: 7px 0px 0px 20px; padding: 7px; border: 1px solid #ccc; background: #fff; position: absolute; width: 250px;} +#moveList li{text-align: left !Important; padding: 0px; list-style: none; display: block !Important; float: none !Important;} +#moveList li a{padding: 3px; display: block !Important; float: none;} + +.voting .kill, .voting #ToggleMoveList{background: #fff !Important; color: #680708; border: 1px solid #680708; padding: 3px; display: block; font-size: 11px; margin-top: 10px;} +#ToggleMoveList{border-color: #ccc !Important; color: blue !Important;} + + + + +/* Pager */ +.pager{margin: 0px; padding: 10px 0px 0px 0px; list-style: none;} +.pager li{display: block; padding-right: 2px; margin: 0px; margin-bottom: 9px;float:left;} +.pager li a{font-size: 11px; padding: 3px 6px; border: 1px solid #ccc; text-decoration: none;} +.pager li.current a{border: none;} +.pager li a:hover{color: white; background: #2244BB;} +.pager li.current a{font-weight: bold;} + +#memberLoader span, #memberLoader_weeks span, #memberLoader_year span{display: block; background: url(img/ajax-loadercircle.gif) no-repeat center left; + font-size: 11px; color: #999; margin: 10px; padding: 5px 30px 10px 40px; width: 200px;} + +/* Member Locator */ + + +#memlocresults{ + margin-top: 10px; +} +#memlocradius{ + width: 470px; + +} +#memlocslider{ + float:right; + margin-top: 10px; +} + +/* SIMPLE MODAL */ +#simplemodal-container{background:#FFF6BF; color:#514721; width: 520px; border: 4px solid #FFD324; padding: 20px;} +#simplemodal-container h3, #simplemodal-container p{color:#514721; margin: 0px; padding: 0px;} +#simplemodal-container h3{font-size: 20px} +#simplemodal-container textarea{display: block; padding: 5px; width: 510px; height: 50px;} +#modalCloseButton{position: absolute; top: 10px; right: 10px; color: #514721; font-size: 11px;} + +/* Voting history */ +ul.votingHistory{display: block; padding: 5px; margin: 0px; margin-bottom: 10px; list-style: none; overflow: auto; height: 400px;} +ul.votingHistory li{display: block; padding: 10px 10px 10px 35px; margin: 0px; border-top: 1px dotted #ccc; font-size: 11px; background: 5px 12px no-repeat;} + +ul.votingHistory li.up{background-image: url(img/icons/thumb_up.png); color: #118B00} +ul.votingHistory li.down{background-image: url(img/icons/thumb_down.png); color: #8B0006} + + +/* NOTIFICATION BANNER */ +#notification{text-align: center; background:#FFF6BF; color:#514721; font-size: 14px; font-weight: bold; +border-bottom: 1px solid #FFD324; padding: 10px; + +} + +/*Project Tagger*/ +.tagger { float:left; } +.tagAdd { margin:0 0 0 6px;} +.tagList { list-style:none; padding:0; margin:0; clear:both; border-left:3px solid #ddd; padding-left:4px; float:left; margin:5px 10px;} +.tagName { cursor:pointer; float:left; clear:both; padding:0.1em 1.5em 0.1em 0.4em;} +.tagName:hover { background:#efefef url(img/bullet_toggle_minus.png) right 2px no-repeat; } + + + +/* TAGGER AUTOCOMPLETE */ +.ac_results { + padding: 0px; + border: 1px solid black; + background-color: white; + overflow: hidden; + z-index: 99999; +} + +.ac_results ul { + width: 100%; + list-style-position: outside; + list-style: none; + padding: 0; + margin: 0; +} + +.ac_results li { + margin: 0px; + padding: 2px 5px; + cursor: default; + display: block; + /* + if width will be 100% horizontal scrollbar will apear + when scroll mode will be used + */ + /*width: 100%;*/ + font: menu; + font-size: 12px; + /* + it is very important, if line-height not setted or setted + in relative units scroll will be broken in firefox + */ + line-height: 16px; + overflow: hidden; +} + +.ac_loading { + background: white url('img/indicator.gif') right center no-repeat; +} + +.ac_odd { + background-color: #eee; +} + +.ac_over { + background-color: #0A246A; + color: white; +} + +/*TAGCLOUD*/ +#tagCloud +{ + margin-top: 10px; + padding:10px; + margin-bottom:10px; + text-align:justify; +} + +#tagCloud A +{ + text-decoration:none; + margin-left:5px; + margin-right:5px; + font-family:Verdana, Arial; + text-transform:lowercase; + color: #8a8a8a; +} + +#tagCloud A:hover, #tagCloud a.current +{ + color:#000; + text-decoration:underline; +} + +#tagCloud A.weight1 +{ + font-size: 2em; + font-weight:bolder; +} +#tagCloud A.weight2 +{ + font-size:1.7em; + font-weight:bolder; +} +#tagCloud A.weight3 +{ + font-size: 1.4em; + font-weight:bolder; +} +#tagCloud A.weight4 +{ + + font-size: 1.1em; +} +#tagCloud A.weight5 +{ + font-size: 0.8em; +} + +#tagCloud span +{ + font-size: 10px !Important; + color: #595a5a!Important; + font-weight: normal !Important; +} + +.spotlight ul.projectsTagged li{border-bottom:1px solid #EFEFEF !important;} +ul.projectsTagged li h5 a, .projectsTagged h5{text-decoration: none; font-weight: bold; font-size: 14px; margin-bottom: 0px; margin-top: 10px; color: #000;} +ul.projectsTagged li h5 a:hover{text-decoration: underline;} + + +.projectsTagged p{#search .result p{color: #000; font-size: 12px; padding: 0px; margin: 0px;}} + +.hLabel{ + font-size: 10px; + color: #adc251; +} + +/* Project Page */ +#project{position: relative;} +#projectOwner{float: left; width: 55px; text-align: center; margin: 10px 20px 0px 0px;} +#projectDescription{float: left;} + +#projectvoting{position: absolute; top: 10px; right: 0px;} +#project .options{border-top: #efefef 1px solid; font-size: 11px; padding: 2px 0px 25px 0px; margin-right: 80px } +#project .badge{margin: auto; margin-top: 10px;} + +/* Project Screenshots */ +.projectscreenshot{ + display:block; + float:left; + padding:10px; + background-color: #F6F7F7; + margin-right: 5px; + margin-bottom: 5px; +} +.projectscreenshot:hover{ + background-color: #F0F2F2; +} + +a.badge{display: block; background: no-repeat center center; width: 40px; height: 40px; text-decoration: none; border: none; overflow: hidden; text-indent: -9999px;} +a.mvp{background-image: url(badges/mvp.png);} +a.core{background-image: url(badges/core.png);} +a.hq{background-image: url(badges/hq.png);} +a.vendor{background-image: url(badges/vendor.png);} +a.admin{background-image: url(badges/admin.png);} +a.mvpcandidate {background-image: url(badges/mvp_nominee.png);} + +/* Options */ +#options{display: block; height: 20px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 0px 0;} +#options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 20px;} +#options ul li{float: left; padding-right: 15px; margin: 0px;} +#options ul li a{font-size: 11px; margin: 0px;} +#options ul li.right{float: right} + +/* Alert */ +.alert{ +background:#FFF6BF; +color:#514721; +font-size: 14px; +border: 1px solid #FFD324; +padding: 5px; +margin-bottom:5px; +} + +.confirm{ +background:#8ECA56; + +font-size: 14px; +border: 1px solid #6AAE30; +padding: 5px; +margin-bottom:5px; +} +/* Top Notifications */ +#topNotificationContainer +{ + display:none; +} +.topNotification +{ + background-color: #FFF6BF; + padding: 7px 0px; + border-bottom:1px solid #FFD324; + color: #735005; + font-weight:bold; +} +.notifyClose +{ + display:block; + float:right; + cursor:pointer; + border: 2px solid #FFD324; + background-color: #FFF6BF; + color: #735005; + padding: 0px 4px; + margin-right: 20px; + font-family: Arial; + text-align:center; + font-weight: 700; + line-height: 1; +} + +.notifyClose a +{ + color: ##514721; +} + +/* General */ + +a.remove +{ + color:#680708; +} + + +/* Project mark verified */ +.verifyWikiFile +{ + cursor:pointer; + color:green; + margin-top: 5px; + padding-left:18px; + background: url('img/verify.png') no-repeat bottom left; + font-size:100% !Important; +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/fonts.css b/Marketplace/Css/fonts.css new file mode 100644 index 00000000..2083872c --- /dev/null +++ b/Marketplace/Css/fonts.css @@ -0,0 +1,109 @@ +/*FONTS */ + +body{font-family: Arial, Helvetica, sans-serif; font-size: 13px;} + +h1, h2, h3, h4, h5, p{font-family: Arial, Helvetica, sans-serif; color: #333;} +a{color: #1A6AB3;} + +p{font-size: 13px; margin-top: 7px; margin-bottom: 15px; color: #333; line-height: 18px} +small{font-size: 11px; color: #5b5b5b;} + +em{color: #332e2e; font-style: normal; font-weight: bold;} +h1{font-size: 28px; font-weight: bold; margin-bottom: 7px;} +h2{font-size: 18px; font-weight: bold; margin-top: 0px; margin-bottom: 3px;} +h3{font-size: 14px; font-weight: bold;} +h4{font-size: 12px; font-weight: bold; } +h5{font-size: 11px; font-weight: bold; } + +code, pre { +background-color:#F2F2F2; +border:1px solid #E3E3E3; +border-left: 4px solid #e3e3e3; +display:block !Important; +font-family:monospace; +font-size:12px; +line-height:1.4em; +margin:0 6em 1em 1em; +padding: 0.5em; +max-width: 650px; +overflow: auto; +} + +code pre{padding: 0px; border: none} + + +a.act{padding: 2px; padding-left: 20px; color: #252525; background: no-repeat center left;} + + +a.topics{background-image: url(img/ico/balloons.png);} +a.yourtopics{background-image: url(img/ico/balloon-smiley.png);} + +a.edit{background-image: url(img/ico/pencil-small.png);} +a.delete{background-image: url(img/ico/cross-small.png);} +a.move{background-image: url(img/ico/document-tree.png);} + +a.subscribe{background-image: url(img/ico/mail--plus.png);} +a.UnSubscribeTopic, a.UnSubscribeForum{background-image: url(img/ico/mail--delete.png);} +a.upload{background-image: url(img/ico/document--plus.png);} +#options a.history{background-image: url(img/ico/clock-history.png);} + + +.options{padding: 3px !Important;} + +a.add{background: #8ECA56 2px 2px url(img/ico/plus-button.png) no-repeat; padding: 3px 3px 3px 25px; +border: 1px solid #618A3B; color: #fff; text-decoration: none; margin-top: 2px; + -webkit-border-radius: 3px; /* Safari prototype */ + -moz-border-radius: 3px; /* Gecko browsers */ + border-radius: 3px; /* Everything else - limited support at the moment */ +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/repository.css b/Marketplace/Css/repository.css new file mode 100644 index 00000000..eba2b64b --- /dev/null +++ b/Marketplace/Css/repository.css @@ -0,0 +1,181 @@ +/* GENERAL STYLES */ +body,html{padding: 10px !Important; margin: 0px !Important; padding: 10px; background: white; background-image: none !Important;} +#closeHandle{display: none !Important;} + +#header{font-size: 14px; font-weight: bold; color: rgb(153, 153, 153); margin-bottom: 7px;} + +#header img{display: none !Important;} +img.gradient{display: none !Important;} +#theForm{margin-top: -15px; width: 100%; position: relative;} +#Table1{width: auto !Important; width: 100%; display: block; margin: 0px;} + +#profileInfo{font-size: 10px; position: absolute; right: 10px; top: 10px; color: #999;} +.propertyPane{padding: 10px; background-repeat: repeat-x} + +a{color: black;} + +body { + margin: 2px +} + +#body{margin-top: 50px;} + +.repoBox{display: block; clear: both; padding: 10px; border-bottom: 1px solid #ccc; margin-bottom: 15px;} +.noborder{border: none !Important;} +h4{margin-top: 0px; margin-bottom: 15px; font-size: 15px;} +.gradient{background-repeat: no-repeat;} + +#header{position: absolute; top: 10px; right: 15px;} +#profile{text-align: right; font-size: 10px;} +#profile input{width: 200px; margin-left: 15px;} + + +.deliLeft{ + + width: 200px; /*Width of left column*/ + position: absolute; +} + +.deliRight +{ + float: none !Important; + margin-left: 230px !Important; + width: auto !Important; +} +a.viewAll{top: 14px !Important;} + + + +.deliNav{background: none !Important; padding-left: 0;} +.deliNav a:hover{text-decoration: underline !Important;} + + +/* Project page */ + + + +/*MOVE STUFF */ +#breadcrumb{position: absolute; top: 20px; left: 10px; margin: 0px; margin-top: -10px !Important; padding: 4px; list-style: none; font-size: 11px; color: #333; display: block; margin-bottom: 10px;} +#breadcrumb li{display: inline; padding-right: 5px; margin: 0px;} +#breadcrumb li a{color: #999; padding-right: 3px;} + +/*HIDE STUFF*/ +h1{display: none !Important;} +.options{display: none !Important;} +.deliFeatureBox{display: none !Important;} +#projectOwner{display: none !Important;} + + +/*TAGCLOUD*/ +#tagCloud +{ + margin-top: 10px; + padding:10px; + margin-bottom:10px; + text-align:justify; +} + +#tagCloud A +{ + text-decoration:none; + margin-left:5px; + margin-right:5px; + font-family:Verdana, Arial; + text-transform:lowercase; + color: #8a8a8a; +} + +#tagCloud A:hover, #tagCloud a.current +{ + color:#000; + text-decoration:underline; +} + +#tagCloud A.weight1 +{ + font-size: 2em; + font-weight:bolder; +} +#tagCloud A.weight2 +{ + font-size:1.7em; + font-weight:bolder; +} +#tagCloud A.weight3 +{ + font-size: 1.4em; + font-weight:bolder; +} +#tagCloud A.weight4 +{ + + font-size: 1.1em; +} +#tagCloud A.weight5 +{ + font-size: 0.8em; +} + +#tagCloud span +{ + font-size: 10px !Important; + color: #595a5a!Important; + font-weight: normal !Important; +} + + +/* CLEAR FIX */ +clearfix:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} +.clearfix { + display: inline-block; +} +html[xmlns] .clearfix { + display: block; +} +* html .clearfix { + height: 1%; +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/screen.css b/Marketplace/Css/screen.css new file mode 100644 index 00000000..f518255f --- /dev/null +++ b/Marketplace/Css/screen.css @@ -0,0 +1,1742 @@ +* {font-size: 100.01%;} +html {font-size: 62.5%;} +body{ + color:#1d1d1d; + font:1.3em Calibri, Arial, Helvetica, sans-serif; + margin:0; + background:#fff; + min-width:999px; +} + + +a{ + text-decoration:none; + color:#252525; +} +a:hover{text-decoration:underline;} +a.ShopButton{display: block; width: 100px; heigth: 100px; background: red;} + +img{border-style:none;} +form,fieldset{ + margin:0; + padding:0; + border-style:none; +} +input,textarea,select{ + font:100% Calibri, Arial, Helvetica, sans-serif; + vertical-align:middle; +} +#wrapper{ + width:100%; + position:relative; + padding:439px 0 0; +} + +#wrapper.Class-Frontpage{padding:489px 0 0;} + +.none{display:none;} +/* header */ +#header{ + position:absolute; + top:0; + left:0; + height:469px; + width:100%; +} +/* form-box */ +.form-box{ + width:100%; + background:#171717 url(../images/bg-form-box.gif) repeat-x; +} +.form-box .holder{ + margin:0 auto; + width:940px; + overflow:hidden; + padding:6px 10px 8px; + position: relative; +} +/* search */ +.search { + float:right; + width:220px; +} +.search span{ + float:left; + background: url(../images/bg-search.gif) no-repeat; + width:178px; + height:17px; + padding:3px 10px 0; + font-size:12px; +} +.search span input{ + display:block; + background:none; + border:none; + outline:none; + margin:0; + padding:0; + width:100%; + color:#fff; +} +.search .submit{float:right;} +/* add-nav */ +.add-nav{ + float:right; + margin:0; + padding:3px 7px 0 0; + list-style:none; + font-size:12px; + line-height:14px; + letter-spacing:-1px; +} +.add-nav li{ + float:left; + padding:0 16px 0 0; +} +.add-nav li a{color:#fff;} +/* promo-box */ +.promo-box{ + width:100%; + position:relative; +} +/* container */ +.promo-box .container{ + height:380px; + width:100%; + overflow:hidden; +} +.promo-box .holder{ + margin:0 auto; + width:940px; + padding:98px 10px 0; +} +.promo-box .holder:after{ + display:block; + clear:both; + content:""; +} + +.promo-box .tab{width: 100%} + + +.promo-box .blackBlue .holder, +.promo-box .blackPurple .holder{ + width:943px; + padding-left:7px; +} + +.promo-box .yellow .holder{padding-top:70px;} + + +.promo-box .blue, +.promo-box .green, +.promo-box .tabPanel{ + background:url(../images/bg-tab-content2.gif) repeat-x; +} +/* tab-content4 */ +.promo-box .yellow{ + background:url(../images/bg-tab-content4.gif) repeat-x; +} +/* tab-content5 */ +.promo-box .cyan{ + background:url(../images/bg-tab-content4.gif) repeat-x; +} + +.promo-box .cyan-alt{ + background:url(../images/bg-tab-content4.gif) repeat-x; +} + +.promo-box .bg-get-started, .promo-box .bg-natural-born { + background:url(../images/bg-tab-content4.gif) repeat-x; +} + +/* tab-content1 */ +.promo-box .blackPurple{background:#252525 url(../images/bg-tab-content1.gif) repeat-x;} + +/* tab-content6 */ +.promo-box .blackBlue{ + background:url(../images/bg-tab-content6.gif) repeat-x; +} + +.promo-box .tabPanel .container{background:url(../images/bg-container2.gif) no-repeat 50% 0;} +.promo-box .bg-support .container{background:url(../images/bg-support.jpg) no-repeat 50% 0;} +.promo-box .bg-get-started .container{background:url(../images/bg-start.jpg) no-repeat 50% 0;} +.promo-box .bg-natural-born .container{background:url(../images/bg-natural-niels.jpg) no-repeat 50% 0;} + +/* Shop Flow Tab */ +.promo-box .shopFlow{background: url(../images/bg-tab-content-none.gif) repeat-x !Important;} +.promo-box .shopFlow .container{background:url(../images/bg-tab-container-none.gif) no-repeat 50% 0; height: 180px !Important;} +.promo-box .shopFlow .holder{padding:98px 0px 0 !Important;} + +/* Empty Tab */ +.promo-box .empty{background: url(../images/bg-tab-content-none.gif) repeat-x !Important;} +.promo-box .empty .container{background:url(../images/bg-tab-container-none.gif) no-repeat 50% 0; height: 120px !Important;} + +/* Map tab */ +.partnerMap{width: 100%;} +.partnerMap .holder{padding: 0px; padding-left: 0px !Important; padding-top:70px !Important; width: 100% !Important; margin-left: 0px;} +.partnerMap .container{background:url(../images/bg-container4.gif) no-repeat 50% 0;} + +.promo-box .blackPurple .container{background:url(../images/bg-container1.gif) no-repeat 50% 0;} +.promo-box .green .container{background:url(../images/bg-container2.gif) no-repeat 50% 0;} +.promo-box .blue .container{background:url(../images/bg-container3.gif) no-repeat 50% 0;} +.promo-box .yellow .container{background:url(../images/bg-container4.gif) no-repeat 50% 0;} +.promo-box .cyan .container{background:url(../images/bg-container5.jpg) no-repeat 50% 0;} +.promo-box .blackBlue .container{background:url(../images/bg-container6.gif) no-repeat 50% 0;} + +/* panel */ +.panel{ + position:absolute; + top:0; + left:0; + width:100%; +} +.panel-holder{ + margin:0 auto; + width:940px; + overflow:hidden; +} +/* logo */ +.logo{ + float:left; + width:168px; + height:51px; + overflow:hidden; + text-indent:-9999px; + background:url(../images/logo.png) no-repeat; + margin:10px 0 0; +} +.logo a{ + height:100%; + display:block; +} +/* nav */ +#nav{ + float:right; + margin:0; + padding:0; + list-style:none; +} +#nav li{ + float:left; + background:url(../images/bg-nav.png) no-repeat; + padding:12px 0 0 16px; + margin:0 15px 0 0; + height:58px; + display:inline; +} +#nav li:first-child{background:none;} +#nav li a{ + float:left; + text-indent:-9999px; + overflow:hidden; + height:34px; + cursor:pointer; + outline:none; +} +#nav li a.get-started{ + background:url(../images/text-get-started.png) no-repeat; + width:81px; +} +#nav li.active a.get-started, +#nav li a.get-started:hover{background:url(../images/text-get-started-hover.png) no-repeat;} + +#nav li a.products{ + background:url(../images/text-products.png) no-repeat; + width:66px; +} +#nav li.active a.products, +#nav li a.products:hover{background:url(../images/text-products-hover.png) no-repeat;} + +#nav li a.certified-partners{ + background:url(../images/text-partners.png) no-repeat; + width:66px;} +#nav li.active a.certified-partners, +#nav li a.certified-partners:hover{background:url(../images/text-partners-hover.png) no-repeat;} + + +#nav li a.help-and-support{ + background:url(../images/text-support.png) no-repeat; + width:106px; +} +#nav li.active a.help-and-support, +#nav li a.help-and-support:hover{background:url(../images/text-support-hover.png) no-repeat;} + +#nav li a.developers-site{ + background:url(../images/text-site.png) no-repeat; + width:111px; +} +#nav li.active a.developers-site, +#nav li a.developers-site:hover{background:url(../images/text-site-hover.png) no-repeat;} + +#nav li a.about-us{ + background:url(../images/text-about-us.png) no-repeat; + width:62px; +} +#nav li.active a.about-us, +#nav li a.about-us:hover{background:url(../images/text-about-us-hover.png) no-repeat;} +/* video-holder */ +.video-holder{ + float:left; + background:url(../images/bg-video-holder.png) no-repeat; + width:465px; + height:265px; + padding:2px 0 0 3px; +} +.video-holder a{position:relative;} +.video-holder img{display:block;} +.tab-content6 .text-holder, +.tab-content1 .text-holder{ + overflow:hidden; + height:1%; + padding:3px 0 0 15px; +} +.cms{ + display:block; + background:url(../images/text-cms.png) no-repeat; + width:364px; + height:154px; + text-indent:-9999px; + overflow:hidden; + margin:0 0 7px 2px; +} +/* section */ +.section{ + overflow:hidden; + width:372px; +} +/* list */ +.list{ + margin:0; + padding:10px 0 0; + list-style:none; + float:left; + width:200px; +} +.list li{ + background:url(../images/bg-list.gif) no-repeat 0 8px; + padding:0 0 0 5px; + margin:0 0 2px; + float:left; + width:100%; +} +.list li span{ + text-indent:-9999px; + overflow:hidden; + height:22px; + float:left; +} +.list li span.solutions{ + width:260px; + background:url(../images/text-solutions_new.png) no-repeat; +} +.list li span.free{ + width:68px; + background:url(../images/text-free.png) no-repeat; +} +.download{ + float:right; + background:url(../images/btn-download.png) no-repeat; + text-indent:-9999px; + overflow:hidden; + width:108px; + height:108px; + cursor:pointer; +} +.download:hover{background:url(../images/btn-download-hover.png) no-repeat;} +/* certificat */ +.certificat{ + position:absolute; + top:70px; + right:0; + width:180px; +} +.certificat span{ + display:block; + background:url(../images/bg-certificat.png) no-repeat; + width:180px; + height:107px; + text-indent:-9999px; + overflow:hidden; +} + + +a.our{ + float:right; + background:url(../images/btn_our.png) no-repeat; + text-indent:-9999px; + overflow:hidden; + width:108px; + height:108px; + cursor:pointer; + margin-top: -25px; +} +a.our:hover{background:url(../images/btn_our_hover.png) no-repeat;} + + +/* carousel-w */ +.carousel-w{width:100%;} +.site-running{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-site-running.png) no-repeat; + width:385px; + height:51px; +} +.as-free-as-you-need{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-as-free-as-you-need.png) no-repeat; + width:382px; + height:50px; + margin-top: 25px; +} +.text-developers-dream{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-a-developers-dream.png) no-repeat; + width:382px; + height:50px; + margin-top: 25px; +} +.prices-text { + margin-top: 15px; + width: 520px; +} +.text-well-help{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-well-help.png) no-repeat; + width:272px; + height:50px; + margin-top: 25px; +} +.support-text { + margin-top: 15px; + width: 520px; +} +.text-natural-born{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-natural-born-umbracians.png) no-repeat; + width:480px; + height:50px; + margin-top: 25px; +} +.get-started-text { + margin-top: 0px; + width: 520px; +} +.text-get-started{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-dont-worry-be-umbraco.png) no-repeat; + width:272px; + height:90px; + margin-top: 25px; + margin-bottom: 25px; +} +.about-text { + margin-top: 15px; + width: 520px; +} +.take-the-test { + float:right; + width:108px; + height:108px; + text-indent:-9999px; + overflow:hidden; + background:url(../images/btn-test-your-needs.png) no-repeat; + cursor:pointer; + margin-top: 50px; + margin-left: 10px; +} +.take-the-test:hover{background:url(../images/btn-test-your-needs-hover.png) no-repeat;} + +/* twocolumns */ +.twocolumns{ + float:right; + width:627px; + padding:37px 0 0; +} +/* switcher */ +.switcher{ + width:100%; + overflow:hidden; + border-bottom:2px solid #212627; + padding:0 0 9px; + margin:0 0 20px; +} +.switcher-inner{ + float:right; + margin:-2px 0 0; +} +.switcher ul{ + margin:0; + padding:0; + list-style:none; + float:right; +} +.switcher ul li{ + float:left; + padding-left:9px; +} +.switcher ul li a{ + float:left; + background:url(../images/bg-link.gif) no-repeat; + width:11px; + height:12px; + overflow:hidden; + text-indent:-9999px; + font-size:1px; + line-height:1px; +} +.switcher ul li a.current, +.switcher ul li a:hover{background-position:0 100%;} +/* carousel-container */ +.carousel-container{ + overflow:hidden; + height:1%; + padding:0 7px; +} +.link-prev, +.link-next{ + text-indent:-9999px; + overflow:hidden; + width:46px; + height:46px; + margin-top:62px; + outline:none; +} +.link-prev{ + float:left; + background:url(../images/bg-link-prev.gif) no-repeat; + margin-right:26px; +} +.link-next{ + float:right; + background:url(../images/bg-link-next.gif) no-repeat; +} +.link-prev:hover, +.link-next:hover{background-position:0 100%;} +.carousel-container div{ + float:left; + position:relative; + width:784px; + height:175px; + overflow:hidden; +} +.carousel-container div ul{ + margin:0; + padding:0; + list-style:none; + float:left; + width:99999px; +} +.carousel-container div ul li{ + float:left; + width:784px; + overflow:hidden; +} +.carousel-container div ul li ul{ + width:792px; + margin-right:-8px; +} +.carousel-container div ul li ul li{ + width:190px; + margin:0 8px 0 0; +} +.carousel-container div.visual{ + background:url(../images/bg-visual.png) no-repeat; + width:188px; + padding-left:1px; + float:none; +} +.carousel-container div ul li img{display:block;} +/* guidance-box */ +.guidance-box{ + float:left; + padding:14px 0 0; + width:222px; +} +.easy{ + background:url(../images/text-easy.png) no-repeat; + display:block; + text-indent:-9999px; + overflow:hidden; + width:175px; + height:90px; + padding:0 0 50px; +} +.get-books{ + float:right; + width:108px; + height:108px; + text-indent:-9999px; + overflow:hidden; + background:url(../images/btn-get-books.png) no-repeat; + cursor:pointer; +} +.get-books:hover{background:url(../images/btn-get-books-hover.png) no-repeat;} +/* twocolumns */ +.twocolumns{ + float:right; + width:627px; + padding:37px 0 0; +} +/* column */ +.column{ + float:left; + width:137px; +} +.white-paper{ + display:block; + width:120px; + height:24px; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-white-paper.png) no-repeat; +} +.twocolumns .switcher{margin-bottom:29px;} +.twocolumns .switcher-inner{ + margin:-6px 0 0; +} +.twocolumns .switcher ul{margin-top:0;} +/* long */ +.long{ + float:right; + width:460px; +} +.videos{ + display:block; + text-indent:-9999px; + overflow:hidden; + width:121px; + height:18px; + background:url(../images/text-videos.png) no-repeat; +} +.twocolumns .link-prev, +.twocolumns .link-next{margin-top:53px;} +.twocolumns .link-prev{margin-right:24px;} +.twocolumns .carousel-container div{width:308px;} +.twocolumns .carousel-container div ul li{width:308px;} +.twocolumns .carousel-container div ul li ul{ + width:320px; + margin-right:-12px; +} +.twocolumns .carousel-container div ul li ul li{ + width:148px; + margin-right:12px; +} +.carousel-container div.visual2{ + background:url(../images/bg-visual2.png) no-repeat; + width:145px; + padding:2px 0 0 3px; + float:none; +} +.visual2 .text{ + display:block; + background:#252525; + height:63px; + width:122px; + padding:6px 9px 2px; + color:#fff; + font-size:11px; + line-height:18px; + cursor:pointer; +} +.visual2 .text strong{ + display:block; + font-size:14px; +} +.carousel-container div ul li a:hover .text{color:#ff6e00;} +.price{ + float:left; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-price.png) no-repeat; + width:195px; + height:100px; + margin:84px 104px 0 0; +} +/* listing */ +.listing{ + margin:0; + padding:0; + list-style:none; + float:left; + background:url(../images/bg-listing.gif) repeat-y 171px 0; + width:400px; + height:310px; + position:relative; +} +.listing li{ + position:absolute; + float:left; +} +.listing li a{outline:none;} +.listing li.style1{ + left:0; + top:80px; +} +.listing li.style2{ + left:191px; + top:59px; +} +.listing li.style3{ + left:255px; + top:146px; +} +.listing li.style4{ + left:190px; + top:211px; +} +.listing li.style5{ + left:115px; + bottom:17px; +} +.listing li.style6{ + left:182px; + bottom:20px; +} +.listing li a img{ + float:left; + margin-right:6px; +} +.listing li.style1 a img{ + display:block; + float:none; +} +.listing li a span{ + float:left; + cursor:pointer; + text-indent:-9999px; + overflow:hidden; +} +.listing li a span.cms2{ + float:none; + display:block; + background:url(../images/text-cms2.png) no-repeat; + width:24px; + height:8px; + margin:0 0 -4px; +} +.complete{ + background:url(../images/text-complete.png) no-repeat; + width:58px; + height:15px; + margin-top:45px; +} +.channel{ + background:url(../images/text-channel.png) no-repeat; + width:80px; + height:12px; + margin-top:41px; +} +.course{ + background:url(../images/text-course.png) no-repeat; + width:42px; + height:8px; + margin-top:29px; +} +.free2{ + background:url(../images/text-free2.png) no-repeat; + width:46px; + height:15px; +} +.extras{ + background:url(../images/text-extras.png) no-repeat; + width:59px; + height:11px; +} +/* button */ +.button{ + margin: 0; + padding:0; + list-style:none; + float:right; +} +.button li{ + float:left; + margin-left:7px; + display:inline; +} +.button li a{ + display:block; + text-indent:-9999px; + overflow:hidden; + width:108px; + height:108px; +} +a.product{background:url(../images/btn-product.png) no-repeat;} +a.product:hover{background:url(../images/btn-product-hover.png) no-repeat;} +a.test{background:url(../images/btn-test.png) no-repeat;} +a.test:hover{background:url(../images/btn-test-hover.png) no-repeat;} +a.order{background:url(../images/btn-order.png) no-repeat;} +a.order:hover{background:url(../images/btn-order-hover.png) no-repeat;} +.integrator{ + background:url(../images/text-integrator.png) no-repeat; + text-indent:-9999px; + overflow:hidden; + width:354px; + height:154px; +} +.integratorText{ + width:354px; +} +.download-big{ + float:right; + background:url(../images/btn-download-big.png) no-repeat; + width:163px; + height:163px; + text-indent:-9999px; + overflow:hidden; + margin:100px 20px 0 0; + display:inline; +} +.download-big:hover{background:url(../images/btn-download-big-hover.png) no-repeat;} +/* tabs */ +.tabs{ + width:100%; + background:#060606 url(../images/bg-tabs.gif) repeat-x; +} +/* tabset */ +.tabset{ + margin:0 auto; + padding:0; + list-style:none; + width:960px; + overflow:hidden; +} +.tabset li{ + float:left; + background:url(../images/bg-tabset.gif) no-repeat; +} +.tabset li:first-child{background:none;} +.tabset li a{ + float:left; + width:139px !Important; + height:41px; + padding:14px 0 0 21px; +} +.tabset li a span{ + display:block; + text-indent:-9999px; + overflow:hidden; + height:30px; + cursor:pointer; +} +.tabset li a span.need{ + background:url(../images/text-need.png) no-repeat; + width:76px; +} +.tabset li a span.see{ + background:url(../images/text-see.png) no-repeat; + width:99px; +} +.tabset li a span.read{ + background:url(../images/text-read.png) no-repeat; + width:93px; +} +.tabset li a span.prices{ + background:url(../images/text-prices.png) no-repeat; + width:38px; +} +.tabset li a span.get-started2{ + background:url(../images/text-get-started2.png) no-repeat; + width:47px; +} +.tabset li a:hover{background:url(../images/bg-tabset-hover.gif) no-repeat 1px 0;} +.tabset li a.current{background:url(../images/bg-tabset-active.gif) no-repeat 100% 22px !important;} +/* main */ +#main{ + margin:0 auto; + width:964px; + overflow:hidden; + padding:0 4px 67px 0; + position: relative; + z-index: 20; +} +.Frontpage #main{ + padding:55px 0 56px 0; + width:960px; + min-height:356px; +} +* html .Frontpage #main { + height:356px; + overflow:visible; +} + +#main.noSidebar{ + width:960px !Important; +} + +/* Cart special rules */ +#wrapper.cart{padding-top: 250px;} +#wrapper.cart .txt-holder{width: 850px;} + +#main.noSidebar .main-holder{background: none;} +#main.noSidebar #content{float: left; width: 960px; background: none !Important;} + + + +/* block */ +.block{ + width:930px; + overflow:hidden; + padding:0 11px 0 19px; + line-height:1.3em; +} +/* extras-box */ +.extras-box{ + color:#212627; + float:left; + width:440px; + margin:0 40px 0 0; +} +/* title */ +.title{ + border-bottom:2px solid #252525; + padding:0 0 9px; + margin:0 0 16px; +} +#content .title{border-color:#000;} +.title h2{ + margin:0; + height:24px; + text-indent:-9999px; + overflow:hidden; +} +.umbraco-extras{ + background:url(../images/text-umbraco-extras.png) no-repeat; + width:159px; +} +.releases{ + background:url(../images/text-release.png) no-repeat; + width:189px; +} +.step{ + background:url(../images/text-step.png) no-repeat; + width:155px; +} +.test1{ + width:146px; + background:url(../images/text-test1.png) no-repeat; +} +/* ico-list */ +.ico-list{ + margin:0; + padding:0; + list-style:none; +} +.ico-list li{margin:0 0 13px;} +.ico-list li a{ + display:block; + width:389px; + padding:13px 0 0 51px; +} +.ico-list li a:hover{text-decoration:none;} +.ico-list li a strong{ + display:block; + text-indent:-9999px; + overflow:hidden; + height:23px; +} +.ico-list li a span{display:block;} +.ico1{background:url(../images/bg-ico1.gif) no-repeat;} +.ico1:hover{background:url(../images/bg-ico1-hover.gif) no-repeat;} +.ico2{background:url(../images/bg-ico2.gif) no-repeat;} +.ico2:hover{background:url(../images/bg-ico2-hover.gif) no-repeat;} +.ico3{background:url(../images/bg-ico3.gif) no-repeat;} +.ico3:hover{background:url(../images/bg-ico3-hover.gif) no-repeat;} +.ico-list li a strong.complete1{ + width:330px; + background:url(../images/text-complete1.png) no-repeat; +} +.ico-list li a strong.channel1{ + width:211px; + background:url(../images/text-channel1.png) no-repeat; +} +.ico-list li a strong.course1{ + width:178px; + background:url(../images/text-course1.png) no-repeat; +} +/* releases-box */ +.releases-box{ + float:left; + width:200px; + overflow:hidden; +} +/* releases-list */ +.releases-list{ + margin:0; + padding:0; + list-style:none; +} +.releases-list li{ + border-bottom:1px solid #c7c9c9; + padding:0 0 6px; + margin:0 0 6px; + height:1%; +} +.releases-list li a{ + display:block; + padding:0 0 0 18px; + background:url(../images/separator.png) no-repeat 0 20%; + color:#212627; +} +.releases-list li a strong{ + display:block; + font-size:1.07em; +} +.releases-list li a span{ + display:block; + font-size:0.85em; +} +.releases-list li a:hover{ + text-decoration:none; + background:url(../images/separator-hover.png) no-repeat 0 20%; +} +.releases-list li a:hover strong{color:#ff6e00;} +/* previouse */ +.previouse{ + background:url(../images/bg-previouse.gif) no-repeat 0 60%; + padding:0 0 0 8px; +} +/* feature-box */ +.feature-box{ + overflow:hidden; + width:100%; + padding:24px 0 0; +} +.wish{ + float:right; + text-indent:-9999px; + overflow:hidden; + width:66px; + height:66px; + background:url(../images/bg-wish.gif) no-repeat; +} +.feature-box p{margin:0;} +.feature{ + display:block; + text-indent:-9999px; + overflow:hidden; + background:url(../images/text-feature.png) no-repeat; + width:109px; + height:16px; + margin:0 0 7px; +} +/* step-box */ +.step-box{ + float:right; + width:220px; +} +.step-box .title{ + width:200px; + margin-left:10px; +} +/* accordion */ +.accordion{ + margin:-6px 0 0; + padding:0; + list-style:none; +} +* html .accordion{position:relative;} +.accordion li a{ + display:block; + width:200px; + background:#dfdfdf url(../images/bg-accordion.gif) repeat-x; + padding:0 10px; + outline:none; +} +.accordion li a strong{ + display:block; + width:100%; + background:url(../images/bg-arrow1.gif) no-repeat 100% 50%; + height:20px; + font-size:1.07em; + cursor:pointer; + padding:7px 0 3px; +} +.accordion li a:hover{ + background:#ff6f01 url(../images/bg-accordion-hover.gif) repeat-x; + text-decoration:none; +} +.accordion a:hover strong{ + background:url(../images/bg-arrow3.gif) no-repeat 100% 50%; + color:#fff; +} +.accordion a.ui-state-active{background:#dfdfdf url(../images/bg-accordion.gif) repeat-x !important;} +.accordion a.ui-state-active strong{ + background:url(../images/bg-arrow2.gif) no-repeat 100% 50% !important; + color:#252525 !important; +} +* html .slide{position:relative;} +.slide ul{ + margin:0; + padding:0 10px 5px; + list-style:none; + overflow:hidden; + width:200px; + background:#dfdfdf; +} +.slide ul li{ + float:left; + width:100%; + margin:0 0 6px; +} +.accordion .slide ul li a{ + display:block; + background:url(../images/separator.png) no-repeat 0 10%; + width:auto; + padding:1px 0 0 19px; +} +.accordion .slide ul li a:hover{background:url(../images/separator-hover.png) no-repeat 0 10%;} +/* navigation */ +.navigation{ + width:100%; + background:#252525; + margin:0 0 13px; +} +.navigation .holder{ + margin:0 auto; + width:960px; + position:relative; +} +/* main-nav */ +.main-nav{ + margin:0; + padding:0; + list-style:none; + width:100%; + overflow:hidden; + line-height:1.2em; +} +.main-nav li{ + float:left; + background:url(../images/divider.gif) no-repeat; + width:160px; +} +.main-nav li:first-child{background:none;} +.main-nav li a{ + float:left; + width:145px; + color:#fff; + padding:19px 5px 17px 10px; + min-height:69px; +} +* html .main-nav li a{height:69px;} +.main-nav li a strong{ + display:block; + text-indent:-9999px; + overflow:hidden; + height:16px; + margin:0 0 6px; +} +.main-nav li a span{display:block;} +.sign-in{ + background:url(../images/text-sign-in.png) no-repeat; + width:44px; +} +.get-inspired{ + background:url(../images/text-get-inspired.png) no-repeat; + width:80px; +} +.follow-us{ + background:url(../images/text-follow-us.png) no-repeat; + width:61px; +} +.providers{ + width:124px; + background:url(../images/text-providers.png) no-repeat; +} +.main-nav .developer-site{ + width:104px; + background:url(../images/text-site1.png) no-repeat; +} +.dev-area { + margin-left: 0px; + margin-top: 10px; +} + +.contact{ + width:53px; + background:url(../images/text-contact.png) no-repeat; +} +.get-it{ + width:41px; + background:url(../images/text-get-it.png) no-repeat; +} +.main-nav li a:hover{ + background:url(../images/bg-main-nav-hover.gif) no-repeat 1px 0; + text-decoration:none; +} +.main-nav li a.last{width:60px;} +.main-nav li a.last:hover{background:none;} +.main-nav li a.download-small{ + float:right; + background:url(../images/bg-download-small.gif) no-repeat !important; + width:60px; + min-height:61px !important; + overflow:hidden; + text-indent:-9999px; + padding:0; + margin:24px 10px 0 0; + display:inline; +} +* html .main-nav li a.download-small{height:61px !important;} +.main-nav li a.download-small:hover{background-position:0 100% !important;} +/* picture */ +.picture{ + position:absolute; + top:-100px; + left:237px; + background:url(../images/bg-picture.gif) bottom right no-repeat; + width:573px; + height:100px; +} +.main-holder{ + background:url(../images/bg-main-holder.gif) no-repeat; + width:960px; + overflow:hidden; +} +/* content */ +#content { + float:right; + width:790px; + color:#1d1d1d; + padding:25px 0 0; + line-height:1.3em; + overflow:hidden; + position:relative; + z-index:5; +} + +#content h1{ + font-size: 2em; margin: 0 0 1em 0; +} + +#content h1.umbraco-cms{ + background:url(../images/text-umbraco-cms.png) no-repeat; + width:188px; +} +#content h1.video-tutorials{ + background:url(../images/text-video-tutorials.png) no-repeat; + width:208px; +} +.content-holder{ + width:100%; + overflow:hidden; + margin:0 0 33px; +} +.tab-contents{ + width:100%; + overflow:hidden; +} +.txt-holder{ + float:left; + width:455px; +} + + +.short .txt-holder{ + width:220px; + color:#000; +} + +.txt-holder p{margin:0 0 17px;} +.txt-holder .big{ + font-size:1.2em; + line-height:1.3em; + margin:0 0 12px; +} + +.right-column{width: 300px; float: right;} + +.short .txt-holder .big{margin-bottom:19px;} +.txt-holder .big p{margin:0;} +.content-holder .alignright{ + float:right; + margin:4px 0 0; +} +.platea{ + display:block; + font-size:1.08em; + margin:0 0 7px; +} +/* item-list */ +.item-list{ + margin:-16px -20px 24px 0; + padding:0; + list-style:none; + width:800px; + overflow:hidden; + font-size:1.07em; + background:#eaeaea url(../images/bg-item-list.gif) repeat-x; +} +.item-list li{ + width:160px; + float:left; + background:url(../images/sep1.gif) no-repeat; + display:table; +} +.item-list li:first-child{background:none;} +.item-list li a{ + color:#000 !Important; + text-decoration: none !Important; + height:55px; + display:table-cell; + vertical-align:middle; + outline:none; +} +* html .item-list li a{float:left;} +*+html .item-list li a{float:left;} +.item-list li a:hover{ + text-decoration:none; + background:url(../images/bg-item-list-hover.gif) no-repeat; +} +.item-list li a span{ + display:block; + width:130px; + background:url(../images/bg-arrow4.gif) no-repeat 100% 50%; + padding:2px 20px; + position:relative; + margin:0 -10px 0 0; + cursor:pointer; +} +.item-list li a.active{background:none !important;} +.item-list li a.active span{background:url(../images/bg-arrow5.gif) no-repeat 100% 50% !important;} +/* article */ +.article{ + border-collapse:collapse; + float:right; + width:541px; + color:#fff; + margin:6px 0 0; +} +.article th{ + padding:10px 1px 10px 0; + border-bottom:1px solid #fff; + background:#333 url(../images/sep2.gif) repeat-y 100% 0; + font-size:1.15em; + line-height:1.35em; +} +.article th.style1{ + width:153px; + background:none; +} +.article th.style2{width:125px;} +.article th.style3{width:114px;} +.article th.style4{ + width:145px; + background:#333; + padding-right:0; +} +.article td{ + padding:8px 1px 9px 0; + border-bottom:1px solid #fff; + background:#6f6f6f url(../images/sep2.gif) repeat-y 100% 0; + text-align:center; + font-size:0.92em; + letter-spacing:-1px; +} +.article td.style1{ + background-color:#efefef; + color:#333; +} +.article td.style4{ + background:#6f6f6f; + padding-right:0; +} +/* sidebar */ +#sidebar{ + float:left; + width:154px; + padding:5px 0 0; +} +/* nav-bar */ +.nav-bar{ + background:url(../images/bg-nav-bar.gif) repeat-y; +} +.nav-bar ul{ + margin:0; + padding:0 0 45px 4px; + list-style:none; + background:url(../images/bg-nav-bar-ul.gif) no-repeat 0 100%; + font-size:1.08em; + line-height:1em; +} +.nav-bar ul li{ + background:url(../images/bg-nav-bar-li.gif) no-repeat; +} +.nav-bar ul li:first-child{background:none;} +.nav-bar ul li a{ + color:#252525; + display:block; + width:125px; + padding:18px 5px 18px 20px; +} +.nav-bar ul li.active a{ + background:#fff; + text-decoration:none; +} +.offernewblack{ + text-indent:-9999px; + overflow:hidden; + display:block; + background:url(../images/text-free-new-black.png) no-repeat; + width:341px; + height:50px; + padding:0 0 30px; +} +.core-channel{ + text-indent:-9999px; + overflow:hidden; + display:block; + background:url(../images/text-core-channel.png) no-repeat; + width:246px; + height:37px; + padding:0 0 30px; +} +.text1{ + display:block; + + overflow:hidden; + + width:258px; + height:75px; + margin:0 0 9px; + color:white; +} +.section2{ + width:100%; + overflow:hidden; +} +.order1{ + width:108px; + height:108px; + text-indent:-9999px; + overflow:hidden; + float:right; + background:url(../images/btn-order1.png) no-repeat; +} +.order1:hover{background:url(../images/btn-order1-hover.png) no-repeat;} +/* video-list */ +.video-list{ + margin:0 0 30px; + padding:14px 0 0 3px; + list-style:none; + width:830px; + overflow:hidden; + font-size:0.85em; +} +.offersignup{ + width:108px; + height:108px; + text-indent:-9999px; + overflow:hidden; + float:right; + background:url(../images/btn-signup.png) no-repeat; +} +.video-list li{ + display:inline-block; + vertical-align:top; + width:144px; + margin:0 15px 26px 0; +} +* html .video-list li{display:inline;} +*+html .video-list li{display:inline;} +.video-list li a{ + color:#252525; + display:block; + cursor:pointer; + outline:none; + width:144px; + overflow:hidden; +} +.video-list li a .image{ + display:block; + width:144px; + height:83px; + overflow:hidden; + margin:0 0 8px; + border-bottom: 1px solid #ccc; +} +.video-list li a:hover{ + text-decoration:none; + background:none; +} +.video-list li a .image img{vertical-align:top;} +.video-list li a:hover img{} +.video-list li a .text2{ + display:block; + background:url(../images/bg-arrow6.png) no-repeat; + padding:0 0 0 20px; + width:124px; +} +.video-list li a .text2 strong{ + display:block; + font-size:1.28em; + margin:0 0 3px; +} +.video-list li a:hover .text2{background:url(../images/bg-arrow7.png) no-repeat;} +.video-list li a:hover .text2 strong{color:#ff6e00;} +.next-step{ + text-indent:-9999px; + overflow:hidden; + display:block; + background:url(../images/text-next-step.png) no-repeat; + width:112px; + height:24px; +} +#content .switcher-inner{margin-top:-12px;} +/* carousel-container2 */ +.carousel-container2{ + overflow:hidden; + height:1%; + padding:8px 3px 0 11px; + margin:0 0 35px; + background:url(../images/bg-carousel-container2.gif) repeat-x 0 100%; +} +.carousel-container2 .link-prev, +.carousel-container2 .link-next{margin-top:52px;} +.carousel-container2 .link-prev{margin-right:24px;} +.carousel-container2 div{ + float:left; + position:relative; + width:628px; + height:180px; + overflow:hidden; +} +.carousel-container2 div ul{ + margin:0; + padding:0; + list-style:none; + float:left; + width:99999px; +} +.carousel-container2 div ul li{ + float:left; + width:628px; + overflow:hidden; +} +.carousel-container2 div ul li ul{ + margin:0 -12px 0 0; + padding:0; + list-style:none; + width:640px; +} +.carousel-container2 div ul li ul li{ + width:148px; + margin:0 12px 0 0; +} +.carousel-container2 div.visual3{ + width:145px; + height:175px; + background:url(../images/bg-visual3.png) no-repeat; + padding:2px 0 0 3px; +} +.carousel-container2 div ul li a{ + display:block; + width:140px; + height:150px; + background:#252525 url(../images/bg-visual-a.gif) no-repeat; + position:relative; + font-size:14px; + line-height:1.3em; + color:#fff; +} +.carousel-container2 div ul li a:hover{ + background:#252525 url(../images/bg-visual-a-hover.gif) no-repeat; + color:#ff6e00; + text-decoration:none; +} +.carousel-container2 div ul li a strong{ + position:absolute; + bottom:0; + left:0; + background:#252525; + width:124px; + padding:7px 6px 9px 10px; + cursor:pointer; +} +/* footer-w */ +.footer-w{ + overflow:hidden; + width:100%; + background:url(../images/bg-footer-w.gif) repeat-x 0 100%; +} +.footer{ + width:100%; + background:url(../images/bg-footer.gif) no-repeat 50% 100%; +} +.footer .holder{ + margin:0 auto; + width:940px; + overflow:hidden; + padding:0 10px 18px; + color:#2f2f2f; + line-height:1em; +} +.footer address{font-style:normal;} +.footer address strong, +.footer address span{ + margin:0 0 5px; + display:block; +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Events/DeliNotificationEvents.cs b/Marketplace/Events/DeliNotificationEvents.cs new file mode 100644 index 00000000..b28374a8 --- /dev/null +++ b/Marketplace/Events/DeliNotificationEvents.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +using NotificationsCore; +using NotificationsWeb; + +using umbraco.BusinessLogic; +using umbraco; +using umbraco.cms.businesslogic.member; + +using Marketplace.Interfaces; + + +namespace Marketplace.Events +{ + public class DeliNotificationEvents : ApplicationBase + { + + protected void NewMemberNotification() + { + + //memberTasks.NewMember += new memberTasks.NewUIMemberEventHandler(memberTasks_NewMember); + + } + + void memberTasks_NewMember(Member sender, string unencryptedPassword, NewMemberUIEventArgs e) + { + + if ((bool)sender.getProperty("createdByDeli").Value) + { + InstantNotification not = new InstantNotification(); + not.Invoke(Config.ConfigurationFile, Config.AssemblyDir, "DeliNewMember", sender, unencryptedPassword); + } + } + + } +} \ No newline at end of file diff --git a/Marketplace/Helpers/ExtensionMethods.cs b/Marketplace/Helpers/ExtensionMethods.cs new file mode 100644 index 00000000..1d4c3c43 --- /dev/null +++ b/Marketplace/Helpers/ExtensionMethods.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Marketplace.Interfaces; + +namespace Marketplace.Helpers +{ + public static class ExtensionMethods + { + public static string ListingTypeAsString(this ListingType listingType) + { + switch (listingType) + { + case ListingType.free: + return "free"; + break; + case ListingType.commercial: + return "commercial"; + break; + case ListingType.promoted: + return "promoted"; + break; + default: + return "free"; + break; + } + } + + public static string FileTypeAsString(this FileType fileType) + { + switch (fileType) + { + case FileType.screenshot: + return "screenshot"; + break; + case FileType.package: + return "package"; + break; + case FileType.docs: + return "docs"; + break; + case FileType.source: + return "source"; + break; + default: + return "package"; + break; + } + + } + + public static string LicenseTypeAsString(this LicenseType licenseType) + { + switch (licenseType) + { + case LicenseType.Domain: + return "Domain"; + break; + case LicenseType.IP: + return "IP"; + break; + case LicenseType.Unlimited: + return "Unlimited"; + break; + case LicenseType.SourceCode: + return "Source Code"; + break; + default: + return "Domain"; + break; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/Helpers/Helper.cs b/Marketplace/Helpers/Helper.cs new file mode 100644 index 00000000..dc900fcd --- /dev/null +++ b/Marketplace/Helpers/Helper.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web.UI; +using Marketplace.usercontrols.Deli.Package; + +namespace Marketplace.Helpers +{ + public static class ProjectCreatorHelper + { + + public static void MoveToNextStep(UserControl control, int projectId) + { + Editor c = (Editor)control.Parent.Parent; + c.GotoNextStep(c.Step.Value, projectId); + + } + + public static void MoveToPreviousStep(UserControl control, int projectId) + { + Editor c = (Editor)control.Parent.Parent; + c.GoToPreviousStep(c.Step.Value, projectId); + + } + + + } +} diff --git a/Marketplace/HttpHandlers/PayPalIPN.cs b/Marketplace/HttpHandlers/PayPalIPN.cs new file mode 100644 index 00000000..526aff3a --- /dev/null +++ b/Marketplace/HttpHandlers/PayPalIPN.cs @@ -0,0 +1,568 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Net; +using System.Text; +using System.Collections.Specialized; + +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Orders; +using Marketplace.Providers.OrderNote; +using Marketplace.Providers.MemberLicense; +using Marketplace.Providers.Listing; + +using Umbraco.Ecommerce.BusinessLogic; +using Umbraco.Ecommerce.PaymentMethods; + +using umbraco.BusinessLogic; +using System.Configuration; +using NotificationsCore; +using System.Globalization; + + +namespace Marketplace.HttpHandlers +{ + public class PayPalIPN + { + #region properties + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + public IOrder dOrder; + + private IDeliOrderItemProvider _orderItemProvider; + public IDeliOrderItemProvider OrderItemProvider + { + get + { + if (_orderItemProvider != null) + return _orderItemProvider; + else + { + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + return _orderItemProvider; + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + private OrderNoteProvider _orderNoteProvider; + public OrderNoteProvider OrderNoteProvider + { + get + { + if (_orderNoteProvider != null) + return _orderNoteProvider; + else + { + _orderNoteProvider = (OrderNoteProvider)MarketplaceProviderManager.Providers["OrderNoteProvider"]; + return _orderNoteProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + public MemberLicense mLicense; + + private IMemberLicenseProvider _memberLicenseProvider; + public IMemberLicenseProvider MemberLicenseProvider + { + get + { + if (_memberLicenseProvider != null) + return _memberLicenseProvider; + else + { + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["memberLicenseProvider"]; + return _memberLicenseProvider; + } + } + } + + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + #endregion + + public void Process(HttpContext context, bool TestMode) + { + + try + { + if (VerifiedByPaypal(context, TestMode)) + { + NameValueCollection form = context.Request.Form; + HandleOrder(form, TestMode); + + } + else + { + string formStr = ""; + foreach (string key in context.Request.Form.AllKeys) + formStr += key + ": " + context.Request.Form[key] + "..."; + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "PAYPAL IPN: Response:" + formStr); + } + + } + catch (Exception ex) + { + string formStr = ""; + foreach (string key in context.Request.Form.AllKeys) + formStr += key + ": " + context.Request.Form[key] + "..."; + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "PAYPAL IPN: Response: " + ex.ToString() + formStr); + + } + + } + + public bool VerifiedByPaypal(HttpContext context, bool TestMode) + { + try + { + string _url = "https://www.paypal.com/cgi-bin/webscr"; + if (TestMode) + { + _url = "https://www.sandbox.paypal.com/cgi-bin/webscr"; + } + + HttpWebRequest req = (HttpWebRequest)WebRequest.Create(_url); + req.Method = "POST"; + req.ContentType = "application/x-www-form-urlencoded"; + byte[] param = context.Request.BinaryRead(HttpContext.Current.Request.ContentLength); + string strRequest = Encoding.UTF8.GetString(param); + strRequest += "&cmd=_notify-validate"; + req.ContentLength = strRequest.Length; + + // Modify the POST string. + string formPostData = "cmd = _notify-validate"; + foreach (String postKey in context.Request.Form) + { + string postValue = Encode(context.Request.Form[postKey]); + formPostData += string.Format("&{0}={1}", postKey, postValue); + } + + // POST the verification response back to PayPal. + WebClient client = new WebClient(); + client.Encoding = Encoding.UTF8; + + client.Headers.Add("Content-Type", "application/x-www-form-urlencoded"); + + byte[] postByteArray = Encoding.UTF8.GetBytes(formPostData); + byte[] responseArray = client.UploadData(_url, "POST", postByteArray); + string response = Encoding.UTF8.GetString(responseArray); + + // check the response, return 'true' if its "VERIFIED" + return (response == "VERIFIED"); + } + catch + { + return false; + } + } + + public void TESTHandleOrder(NameValueCollection form, bool testMode) + { + try + { + string amount = form["amount"]; + int invoice = int.Parse(form["invoice"]); + string status = form["payment_status"]; + string txt_id = form["txn_id"]; + + // log the IPN response in the umbracoLog + string formStr = ""; + foreach (string key in form.AllKeys) + formStr += key + ": " + form[key] + "...."; + + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN: - " + formStr); + + } + catch (Exception ex) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN ERROR: " + ex.ToString()); + } + } + + public void HandleOrder(NameValueCollection form, bool testMode) + { + try + { + string amount = form["mc_gross"]; + int invoice = int.Parse(form["invoice"]); + string status = form["payment_status"]; + string txt_id = form["txn_id"]; + string NoteText = ""; + + // log the IPN response in the umbracoLog before anything else + string formStr = ""; + foreach (string key in form.AllKeys) + formStr += key + ": " + form[key] + "...."; + + // getDeli Order + dOrder = OrderProvider.GetOrder(invoice); + + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN: Order: " + dOrder.Id.ToString() + " - " + formStr); + + switch (status) + { + case "Completed": + // make sure this isn't a duplicate from paypal + if (dOrder.Status != OrderStatus.Confirmed) + { + if (!testMode) // production! + { + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Confirmed.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Confirmed; + dOrder.TransactionId = txt_id; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + dOrder.PaymentDate = DateTime.Now.ToUniversalTime(); + dOrder.ProcessedTotal = Convert.ToDouble(amount); + + // create a MemberLicense for each OrderItem + foreach (IOrderItem item in dOrder.Items) + { + // create licenses for multiple quantity + for (int i = 0; i < item.Quantity; i++) + { + mLicense = new MemberLicense(); + mLicense.LicenseId = LicenseProvider.GetLicense(item.LicenseId).Id; + mLicense.Member = dOrder.Member; + mLicense.OrderItemId = item.Id; + mLicense.ListingItemId = item.ListingItemId; + mLicense.CreateDate = DateTime.Now.ToUniversalTime(); + mLicense.IsActive = true; + + MemberLicenseProvider.SaveOrUpdate(mLicense); + } + } + + OrderProvider.SaveOrUpdate(dOrder); + + // webservice call to create order on umbraco.com + string invoicePath; + + try + { + invoicePath = CreateDotComOrder(dOrder, txt_id); + } + catch (Exception e) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN ERROR: " + e.Message + " :: " + e.InnerException + " :: " + e.StackTrace); + + invoicePath = string.Empty; + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli Error: invoice generation failed"); + + } + + if (invoicePath.Length > 0) + { + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli invoice: " + invoicePath); + + } + + // send order complete mail + InstantNotification not = new InstantNotification(); + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliOrderComplete", dOrder, dOrder.Member, txt_id); + + foreach(var oi in dOrder.Items) + { + var listing = ListingProvider.GetListing(oi.ListingItemId,false); + var body = "

Hi " + listing.Vendor.Member.Name + ",


" + + "

The following order has just been received for the following product on the Umbraco Deli


" + + "

" + listing.Name + " " + LicenseProvider.GetLicense(oi.LicenseId).LicenseType.ToString() + "
" + + "ordered by" + dOrder.Member.Name + " email " + dOrder.Member.Email + "

" + + "

Best,
The Umbraco Deli Robot

"; + + + umbraco.library.SendMail("robot@umbraco.org", listing.Vendor.Member.Email, "New Deli Order", body, true); + } + } + else // test! + { + NoteText = "DEV order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Confirmed.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Confirmed; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + dOrder.PaymentDate = DateTime.Now.ToUniversalTime(); + dOrder.ProcessedTotal = Convert.ToDouble(amount); + + // create a MemberLicense for each OrderItem + foreach (IOrderItem item in dOrder.Items) + { + // create licenses for multiple quantity + for (int i = 0; i < item.Quantity; i++) + { + mLicense = new MemberLicense(); + mLicense.LicenseId = LicenseProvider.GetLicense(item.LicenseId).Id; + mLicense.Member = dOrder.Member; + mLicense.OrderItemId = item.Id; + mLicense.ListingItemId = item.ListingItemId; + mLicense.CreateDate = DateTime.Now.ToUniversalTime(); + mLicense.IsActive = true; + + MemberLicenseProvider.SaveOrUpdate(mLicense); + } + } + + OrderProvider.SaveOrUpdate(dOrder); + + // webservice call to create order on umbraco.com + string invoicePath; + + try + { + invoicePath = CreateDotComOrder(dOrder, txt_id); + } + catch (Exception e) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN ERROR: " + e.Message + " :: " + e.InnerException + " :: " + e.StackTrace); + + invoicePath = string.Empty; + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli Error: invoice generation failed - Error:" + e.Message + " :: " + e.InnerException + " :: " + e.StackTrace); + + } + + if (invoicePath.Length > 0) + { + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli invoice: " + invoicePath); + + } + + // send order complete mail + InstantNotification not = new InstantNotification(); + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliOrderComplete", dOrder, dOrder.Member, txt_id); + foreach (var oi in dOrder.Items) + { + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliNotifyVendor", oi, dOrder.Member, oi.Id); + } + } + } + break; + + case "Pending": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Pending.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Pending; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + case "Failed": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Rejected.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Rejected; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + case "Refunded": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Refunded.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Refunded; + dOrder.IsRefunded = true; + dOrder.RefundDate = DateTime.Now.ToUniversalTime(); + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + // todo: revoke license here + // todo: mark specific OrderItems as Refunded + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + default: + break; + } + + } + catch (Exception ex) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL IPN " + ex.Message + " :: " + ex.InnerException+ " :: " +ex.StackTrace); + } + } + + public int CreateEcomOrder(IOrder o, bool TestMode) + { + try + { + // Create customer information + CustomerInfo ci = new CustomerInfo(); + ci.AddData("id", o.Member.Id.ToString()); + ci.AddData("email", o.Member.Email); + + Guid payment = new CreditCard().Id; + + // create order + Order providerOrder = Order.MakeNew(ci.ToXml(), o.Id.ToString(), payment, "deli order", o.Member.Email); + providerOrder.CustomerReference = o.Id.ToString(); + providerOrder.ChangeStatus(Order.Status.Confirmed); + providerOrder.Comment = "deli order"; + + if(TestMode) + providerOrder.TestMode = true; + + foreach(IOrderItem item in dOrder.Items) + { + OrderLine l = new OrderLine(); + l.Quantity = item.Quantity; + l.ProductName = ListingProvider.GetListing(item.ListingItemId, false).Name + ", License: " + LicenseProvider.GetLicense(item.LicenseId).LicenseType.ToString(); + l.Price = (decimal)item.NetPrice; + l.ProductId = item.ListingItemId.ToString(); + l.Note = "deli order id: " + o.Id.ToString(); + + providerOrder.AddOrderLine(l); + } + + // generate invoice + if(!TestMode) + providerOrder.GenerateInvoice(false); + else + providerOrder.GenerateInvoice(true); + + + return providerOrder.OrderId; + } + catch + { + return 0; + } + } + + protected string CreateDotComOrder(IOrder dOrder, string transactionId) + { + com.umbraco.orders.Orders orderService = new com.umbraco.orders.Orders(); + com.umbraco.orders.OrderProxy orderProxy = new com.umbraco.orders.OrderProxy(); + com.umbraco.orders.BuyerProxy buyerProxy = new com.umbraco.orders.BuyerProxy(); + + // set up Ecomm Order + orderProxy.DeliOrderID = dOrder.Id; + orderProxy.PurchaseOrder = ""; + orderProxy.TransactionID = transactionId; + + // buyer + buyerProxy.ourMemberId = dOrder.Member.Id; + buyerProxy.ourMemberGuid = dOrder.Member.UniqueId; + buyerProxy.IP = dOrder.IP; + buyerProxy.Name = dOrder.Member.Name; + buyerProxy.Login = dOrder.Member.Name; + buyerProxy.Address = dOrder.Member.CompanyAddress; + buyerProxy.Company = dOrder.Member.Company; + buyerProxy.Country = Marketplace.library.GetCountry(dOrder.Member.CompanyCountry); + buyerProxy.Email = dOrder.CompanyInvoiceEmail; + buyerProxy.VAT = !dOrder.Member.VatInvalid ? dOrder.Member.CompanyVATNumber : ""; + buyerProxy.Phone = ""; + + //order lines + var orderLineProxyList = new List(); + + foreach (IOrderItem item in dOrder.Items) + { + com.umbraco.orders.OrderLineProxy lineProxy = new com.umbraco.orders.OrderLineProxy(); + IListingItem listingItem = ListingProvider.GetListing(item.ListingItemId); + + lineProxy.VendorEconomicID = listingItem.Vendor.EconomicId; + lineProxy.Amount = (decimal)item.NetPrice; + lineProxy.Quantity = item.Quantity; + lineProxy.description = ListingProvider.GetListing(item.ListingItemId, false).Name + ", License Type: " + LicenseProvider.GetLicense(item.LicenseId).LicenseType.ToString(); + + // add order line to order + orderLineProxyList.Add(lineProxy); + + } + + + orderProxy.OrderLines = orderLineProxyList.ToArray(); + orderProxy.Buyer = buyerProxy; + + bool isTestMode = bool.Parse(ConfigurationManager.AppSettings["deliPayPalTest"]); + + + com.umbraco.orders.OrderProxy returnOrderProxy = orderService.Create(orderProxy, isTestMode, ConfigurationManager.AppSettings["deliWebServiceUser"], ConfigurationManager.AppSettings["deliWebServicePass"]); + + + // set Ecomm order id + dOrder.OrderId = returnOrderProxy.EcommerceOrderID; + OrderProvider.SaveOrUpdate(dOrder); + + + return returnOrderProxy.InvoicePath; + + } + + #region Utilities + + private string Encode(string oldValue) + { + string newValue = oldValue.Replace("\"", "'"); + newValue = System.Web.HttpUtility.UrlEncode(newValue); + newValue = newValue.Replace("%2f", "/"); + return newValue; + } + + + + #endregion + + } +} \ No newline at end of file diff --git a/Marketplace/HttpHandlers/PayPalIPNHandler.cs b/Marketplace/HttpHandlers/PayPalIPNHandler.cs new file mode 100644 index 00000000..aa9f4823 --- /dev/null +++ b/Marketplace/HttpHandlers/PayPalIPNHandler.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Marketplace.HttpHandlers +{ + public class PayPalIPNHandler : IHttpHandler + { + #region IHttpHandler Members + + bool IHttpHandler.IsReusable + { + get { return true; } + } + + void IHttpHandler.ProcessRequest(HttpContext context) + { + PayPalIPN ipn = new PayPalIPN(); + ipn.Process(context, false); + } + + #endregion + } + + public class PayPalIPNHandlerTEST : IHttpHandler + { + #region IHttpHandlerTEST Members + + bool IHttpHandler.IsReusable + { + get { return true; } + } + + void IHttpHandler.ProcessRequest(HttpContext context) + { + PayPalIPN ipn = new PayPalIPN(); + ipn.Process(context, true); + } + + #endregion + } +} \ No newline at end of file diff --git a/Marketplace/Marketplace.csproj b/Marketplace/Marketplace.csproj new file mode 100644 index 00000000..20c0b566 --- /dev/null +++ b/Marketplace/Marketplace.csproj @@ -0,0 +1,771 @@ + + + + + Debug + AnyCPU + + + 2.0 + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Marketplace + Marketplace + v4.5.1 + false + + + + + 4.0 + + + + + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\ + TRACE + prompt + 4 + false + + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + + False + ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + + + ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + + + ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + + + False + ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + + ..\packages\Examine.0.1.57.2941\lib\Examine.dll + + + ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + + ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll + + + ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll + + + False + ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + + + ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + + + False + ..\..\Our\dependencies\MarketPlace\Marketplace.BusinessLogic.dll + + + False + ..\..\Our\dependencies\MarketPlace\Marketplace.Data.dll + + + False + ..\..\Our\dependencies\MarketPlace\Marketplace.Interfaces.dll + + + ..\..\Our\dependencies\MarketPlace\Marketplace.Presentation.dll + + + False + ..\..\Our\dependencies\MarketPlace\Marketplace.Providers.dll + + + False + ..\..\Our\dependencies\MarketPlace\Marketplace.Umbraco.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + + + + ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + + + False + ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + + ..\forigndlls\NotificationsCore.dll + + + ..\forigndlls\NotificationsWeb.dll + + + ..\forigndlls\our.umbraco.org.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + + + + + + + True + ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + + + True + ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + + + True + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll + + + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll + + + + + + + + + + + ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + + + ..\forigndlls\uComponents.Core.dll + + + ..\forigndlls\uForum.dll + + + False + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + + + ..\forigndlls\Umbraco.Ecommerce.dll + + + False + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + + + ..\forigndlls\Umbraco.Support.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + + + ..\forigndlls\umbracoMemberControls.dll + + + ..\forigndlls\uPowers.dll + + + ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + + + ..\forigndlls\uVersion.dll + + + + + setalllive.aspx + ASPXCodeBehind + + + setalllive.aspx + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + OrderReview.ascx + ASPXCodeBehind + + + OrderReview.ascx + + + ProcessRefund.ascx + ASPXCodeBehind + + + ProcessRefund.ascx + + + VendorPayout.ascx + ASPXCodeBehind + + + VendorPayout.ascx + + + VendorPayoutReport.ascx + ASPXCodeBehind + + + VendorPayoutReport.ascx + + + Cart.ascx + ASPXCodeBehind + + + Cart.ascx + + + CartDetails.ascx + ASPXCodeBehind + + + CartDetails.ascx + + + CartProgress.ascx + ASPXCodeBehind + + + CartProgress.ascx + + + CartReview.ascx + ASPXCodeBehind + + + CartReview.ascx + + + MicroCart.ascx + ASPXCodeBehind + + + MicroCart.ascx + + + VendorCustomers.ascx + ASPXCodeBehind + + + VendorCustomers.ascx + + + VendorBIOverview.ascx + ASPXCodeBehind + + + VendorBIOverview.ascx + + + VendorProjectBI.ascx + ASPXCodeBehind + + + VendorProjectBI.ascx + + + FeaturedProject.ascx + ASPXCodeBehind + + + FeaturedProject.ascx + + + HQStaffPickProjects.ascx + ASPXCodeBehind + + + HQStaffPickProjects.ascx + + + MyLicenses.ascx + ASPXCodeBehind + + + MyLicenses.ascx + + + ProjectLicenses.ascx + ASPXCodeBehind + + + ProjectLicenses.ascx + + + ListPagination.ascx + ASPXCodeBehind + + + ListPagination.ascx + + + NewestProjects.ascx + ASPXCodeBehind + + + NewestProjects.ascx + + + Complete.ascx + ASPXCodeBehind + + + Complete.ascx + + + Licenses.ascx + ASPXCodeBehind + + + Licenses.ascx + + + Screenshots.ascx + ASPXCodeBehind + + + Screenshots.ascx + + + Details.ascx + ASPXCodeBehind + + + Details.ascx + + + Editor.ascx + ASPXCodeBehind + + + Editor.ascx + + + Files.ascx + ASPXCodeBehind + + + Files.ascx + + + VendorPayout.ascx + ASPXCodeBehind + + + VendorPayout.ascx + + + VendorPayoutHistory.ascx + ASPXCodeBehind + + + VendorPayoutHistory.ascx + + + PopularProjects.ascx + ASPXCodeBehind + + + PopularProjects.ascx + + + MemberDataLookup.ascx + ASPXCodeBehind + + + MemberDataLookup.ascx + + + MyProjects.ascx + ASPXCodeBehind + + + MyProjects.ascx + + + Signup.ascx + ASPXCodeBehind + + + Signup.ascx + + + ProjectsList.ascx + ASPXCodeBehind + + + ProjectsList.ascx + + + ProjectView.ascx + ASPXCodeBehind + + + ProjectView.ascx + + + PayPalConfirm.ascx + ASPXCodeBehind + + + PayPalConfirm.ascx + + + PayPalPayment.ascx + ASPXCodeBehind + + + PayPalPayment.ascx + + + RepoProjectView.ascx + ASPXCodeBehind + + + RepoProjectView.ascx + + + RefundRequest.ascx + ASPXCodeBehind + + + RefundRequest.ascx + + + VendorSupportRequest.ascx + ASPXCodeBehind + + + VendorSupportRequest.ascx + + + TopPaidProjectsList.ascx + ASPXCodeBehind + + + TopPaidProjectsList.ascx + + + Login_novalidationscript.ascx + ASPXCodeBehind + + + Login_novalidationscript.ascx + + + + + True + True + Reference.map + + + True + True + Reference.map + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + Reference.map + + + Reference.map + + + + MSDiscoCodeGenerator + Reference.cs + + + Reference.map + + + + + Designer + + + + MSDiscoCodeGenerator + Reference.cs + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + Dynamic + Web References\com.umbraco\ + http://umbraco.com/umbraco/plugins/memberlookup/memberlookup.asmx + + + + + Settings + Marketplace_com_umbraco_MemberLookUp + + + Dynamic + Web References\com.umbraco.orders\ + http://umbraco.com/webservices/orders.asmx + + + + + Settings + Marketplace_com_umbraco_orders_Orders + + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + False + True + 54542 + / + + + False + False + + + False + + + + + + xcopy /s /y "$(TargetDir)marketplace*.*" "$(SolutionDir)OurUmbraco.Site\bin\" +xcopy /s /y "$(ProjectDir)*.ascx" "$(SolutionDir)OurUmbraco.Site\" +xcopy /s /y "$(ProjectDir)razor\*.cshtml" "$(SolutionDir)OurUmbraco.Site\macroscripts\" + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/ConfigureProjectLicenses.master b/Marketplace/MasterPages/ConfigureProjectLicenses.master new file mode 100644 index 00000000..d9c8e92f --- /dev/null +++ b/Marketplace/MasterPages/ConfigureProjectLicenses.master @@ -0,0 +1,13 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/Deli.master b/Marketplace/MasterPages/Deli.master new file mode 100644 index 00000000..311e69d6 --- /dev/null +++ b/Marketplace/MasterPages/Deli.master @@ -0,0 +1,40 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + +
+ + + + +
+ +
+ + + +
+ <%if(umbraco.library.IsLoggedOn()){ %> + Create a new project + <% } %> +
+ +
+
+ +
+ +
+

HQ Picks

+ +
+
+
+ +
+
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/DeliCart.master b/Marketplace/MasterPages/DeliCart.master new file mode 100644 index 00000000..e52f513f --- /dev/null +++ b/Marketplace/MasterPages/DeliCart.master @@ -0,0 +1,20 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + + + + +
+ +
+ +
+ +

+ + + +
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/DeliCartDetails.master b/Marketplace/MasterPages/DeliCartDetails.master new file mode 100644 index 00000000..f4d7a7b9 --- /dev/null +++ b/Marketplace/MasterPages/DeliCartDetails.master @@ -0,0 +1,19 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + + + + +
+ +
+ +
+ + + + +
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/EditProject.master b/Marketplace/MasterPages/EditProject.master new file mode 100644 index 00000000..e1a3c22c --- /dev/null +++ b/Marketplace/MasterPages/EditProject.master @@ -0,0 +1,25 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + + + + + + + +
+
+ +
+ +

+
+ +
+ + + + +
+ \ No newline at end of file diff --git a/Marketplace/MasterPages/Master.master b/Marketplace/MasterPages/Master.master new file mode 100644 index 00000000..73326285 --- /dev/null +++ b/Marketplace/MasterPages/Master.master @@ -0,0 +1,146 @@ +<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + + + + + + + + + + + + + + + <umbraco:Macro Alias="Title" runat="server"></umbraco:Macro> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + x + + First time here? Check out the FAQ +
+
+ + +
+ +
+
+
+ + +
+
+
+ +
+ + +
+
+ + + + + + + + +
+ + + +
+
+ +
+

+ + + + +
+ + +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/PayPalRedirect.master b/Marketplace/MasterPages/PayPalRedirect.master new file mode 100644 index 00000000..6f818070 --- /dev/null +++ b/Marketplace/MasterPages/PayPalRedirect.master @@ -0,0 +1,38 @@ +<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> + + + + + + + + <umbraco:Item ID="Item1" field="pageName" runat="server"></umbraco:Item> - Umbraco.org - the friendly CMS + + + + + + + + + +
+

Please wait...

+

+ We are redirecting you to paypal.com, where you can pay your order securely. Please do not hit the "back" or "forward" + navigation buttons on your browser. +

+

+ Thank you for your patience +

+ + + +
+ + + + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Project.master b/Marketplace/MasterPages/Project.master new file mode 100644 index 00000000..88ea25b8 --- /dev/null +++ b/Marketplace/MasterPages/Project.master @@ -0,0 +1,44 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +<% if( umbraco.presentation.nodeFactory.Node.GetCurrent().Children.Count > 0 ){ %> +

Package discussions

+ +<% +} +%> + +
+ +
+ \ No newline at end of file diff --git a/Marketplace/MasterPages/ProjectGroup.master b/Marketplace/MasterPages/ProjectGroup.master new file mode 100644 index 00000000..33acc7da --- /dev/null +++ b/Marketplace/MasterPages/ProjectGroup.master @@ -0,0 +1,38 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + + +
+ +
+ +
+ +

+
+ <%if(umbraco.library.IsLoggedOn()){ %> + Create a new project + <% } %> +
+ +
+
+ +
+ +
+

HQ Picks

+ +
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/Projects.master b/Marketplace/MasterPages/Projects.master new file mode 100644 index 00000000..fa574153 --- /dev/null +++ b/Marketplace/MasterPages/Projects.master @@ -0,0 +1,68 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> + + +
+ +<%-- div style="margin-top: 25px"> + +
+ +

+
+ <%if(umbraco.library.IsLoggedOn()){ %> + Create a new project + <% } %> +
+ +
+
+ +
+ +
+

HQ Picks

+ +
+
+

About Deli

+ +
+
+ +
+ +
+
+ +
+
+

Popular Packages

+ " class="viewAll">All popular + +
+
+

New Packages

+ " class="viewAll">All new + +
+
List your package here! Whether it's free or a commercial, it's easy to list in the Deli. Get started today
+
+

Browse by Tag

+ +
+
+ +
+ + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/ProjectsTags.master b/Marketplace/MasterPages/ProjectsTags.master new file mode 100644 index 00000000..7c1084dd --- /dev/null +++ b/Marketplace/MasterPages/ProjectsTags.master @@ -0,0 +1,22 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> + + + +
+ +
+

Browse projects by tag

+ + + +
+

Browse by tag

+ +
+
+

Projects tagged with: <%= Request["tag"] %>

+ +
+ + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Community.master b/Marketplace/MasterPages/Repository/Community.master new file mode 100644 index 00000000..04ad75da --- /dev/null +++ b/Marketplace/MasterPages/Repository/Community.master @@ -0,0 +1,98 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + + +
+ +
+

The friendliest CMS community on the planet

+ +
+

+our.umbraco.org is the central hub for the friendly umbraco community. Search for documentation, get +help and guidance from seasoned experts, download and collaborate on plugins and extensions. +

+ + <%if(!umbraco.library.IsLoggedOn()){ %> +

Register an account or Login

+ <%}%> +
+ +
+ + +
+
+

Forum talk rss

+
Loading forum list...
+More.. +
+
+ +
+ +
+

New projects rss

+
Loading the newest projects...
+More.. +
+ +
+

New documentation rss

+
Loading the latest documentation...
+More.. +
+
+ +
+ +
+

Community blogs rss

+
Loading blog list...
+
+ +
+

Twitter rss

+
Loading tweets...
+
+ +
+ + +
+ + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Master.master b/Marketplace/MasterPages/Repository/Master.master new file mode 100644 index 00000000..9050413e --- /dev/null +++ b/Marketplace/MasterPages/Repository/Master.master @@ -0,0 +1,99 @@ +<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + + + Umbraco Package Repository + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + + + +

+ + + + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Nothing.master b/Marketplace/MasterPages/Repository/Nothing.master new file mode 100644 index 00000000..d8e768ef --- /dev/null +++ b/Marketplace/MasterPages/Repository/Nothing.master @@ -0,0 +1,34 @@ +<%@ Master Language="C#" MasterPageFile="/umbraco/masterpages/default.master" AutoEventWireup="true" %> + + + + + + + + +
+ +

our.umbraco.org is getting a massage

+

We are truly sorry for the inconvenience, but our.umbraco.org is getting an upgrade to fix a couple of issues +reported by our lovely community. +

+ +

Update: Bug is found, patch has been applied, testing as we speak

+ + +

+We will be back ASAP
+/Per Ploug Hansen +

+ +






+ + + +
+ + + + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Project.master b/Marketplace/MasterPages/Repository/Project.master new file mode 100644 index 00000000..e4453a80 --- /dev/null +++ b/Marketplace/MasterPages/Repository/Project.master @@ -0,0 +1,11 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + + +
+ + + + +
+ \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/ProjectGroup.master b/Marketplace/MasterPages/Repository/ProjectGroup.master new file mode 100644 index 00000000..d88bfee5 --- /dev/null +++ b/Marketplace/MasterPages/Repository/ProjectGroup.master @@ -0,0 +1,32 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + + +
+ + + +
+
+ +
+ +
+

HQ Picks

+ +
+
+ +
+
+

+ +
+
+ +
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Projects.master b/Marketplace/MasterPages/Repository/Projects.master new file mode 100644 index 00000000..8c2d95a0 --- /dev/null +++ b/Marketplace/MasterPages/Repository/Projects.master @@ -0,0 +1,47 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + +
+ +
+
+ +
+ +
+

HQ Picks

+ +
+
+ +
+ +
+
+ +
+
+

Popular Packages

+ " class="viewAll">All popular + +
+
+

New Packages

+ " class="viewAll">All new + +
+
List your package here! Whether it's free or a commercial, it's easy to list in the Deli. Get started today
+
+

Browse by Tag

+ +
+
+ +
+
+ + + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/ProjectsTags.master b/Marketplace/MasterPages/Repository/ProjectsTags.master new file mode 100644 index 00000000..ade63286 --- /dev/null +++ b/Marketplace/MasterPages/Repository/ProjectsTags.master @@ -0,0 +1,21 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + +
+ +
+ +
+ +

Browse projects by tag

+
+ Create a new project +
+ +<%-- umbraco:Macro Alias="Project-tagcloud" runat="server"> + + + +
+ + \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Textpage.master b/Marketplace/MasterPages/Repository/Textpage.master new file mode 100644 index 00000000..31c69a09 --- /dev/null +++ b/Marketplace/MasterPages/Repository/Textpage.master @@ -0,0 +1,10 @@ +<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> + + +
+
+

+ +
+
+ diff --git a/Marketplace/MasterPages/newest.master b/Marketplace/MasterPages/newest.master new file mode 100644 index 00000000..c3c13549 --- /dev/null +++ b/Marketplace/MasterPages/newest.master @@ -0,0 +1,14 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> + + +
+ +
+

Newest packages

+ + + +
+ +
+ \ No newline at end of file diff --git a/Marketplace/MasterPages/popular.master b/Marketplace/MasterPages/popular.master new file mode 100644 index 00000000..882c94f3 --- /dev/null +++ b/Marketplace/MasterPages/popular.master @@ -0,0 +1,14 @@ +<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> + + +
+ +
+

Popular packages

+ + + +
+ +
+ \ No newline at end of file diff --git a/Marketplace/NotificationTypes/DeliNewMember.cs b/Marketplace/NotificationTypes/DeliNewMember.cs new file mode 100644 index 00000000..313b90b4 --- /dev/null +++ b/Marketplace/NotificationTypes/DeliNewMember.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Net.Mail; + +using NotificationsCore; + +using umbraco.cms.businesslogic.member; + +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.NotificationTypes +{ + public class DeliNewMember : Notification + { + + public DeliNewMember() + { + + } + + public override bool SendNotification(System.Xml.XmlNode details, params object[] args) + { + IMemberProvider MemberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + + try + { + SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText); + c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText); + + MailAddress from = new MailAddress( + details.SelectSingleNode("//from/email").InnerText, + details.SelectSingleNode("//from/name").InnerText); + + string subject = details.SelectSingleNode("//subject").InnerText; + string body = details.SelectSingleNode("//body").InnerText; + + //Member m = (Member)args[0]; + // deli member + IMember dMember = (IMember)args[0]; + + string domain = details.SelectSingleNode("//domain").InnerText; + + body = string.Format(body, + dMember.Name, + dMember.Email, + args[1].ToString()); + + MailMessage mm = new MailMessage(); + mm.Subject = subject; + mm.Body = body; + + mm.To.Add(dMember.Email); + mm.From = from; + + c.Send(mm); + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications] New deli member message sent" + dMember.Name); + } + catch (Exception e) + { + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications]" + e.Message); + + } + + return true; + } + } +} \ No newline at end of file diff --git a/Marketplace/NotificationTypes/DeliNotifyVendor.cs b/Marketplace/NotificationTypes/DeliNotifyVendor.cs new file mode 100644 index 00000000..c672fc80 --- /dev/null +++ b/Marketplace/NotificationTypes/DeliNotifyVendor.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using NotificationsCore; +using Marketplace.Interfaces; +using Marketplace.Providers; +using System.Net.Mail; + +namespace Marketplace.NotificationTypes +{ + public class DeliNotifyVendor : Notification + { + public DeliNotifyVendor() + { + } + + public override bool SendNotification(System.Xml.XmlNode details, params object[] args) + { + + IListingProvider listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + ILicenseProvider licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + try + { + SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText); + c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText); + + + MailAddress from = new MailAddress( + details.SelectSingleNode("//from/email").InnerText, + details.SelectSingleNode("//from/name").InnerText); + + string subject = details.SelectSingleNode("//subject").InnerText; + string body = details.SelectSingleNode("//body").InnerText; + + // deli ordered item + IOrderItem dOrder = (IOrderItem)args[0]; + + // deli listing + IListingItem dListing = listingProvider.GetListing(dOrder.ListingItemId); + + // deli member + IMember dMember = (IMember)args[1]; + + string domain = details.SelectSingleNode("//domain").InnerText; + + body = string.Format(body, + dMember.Name, + dOrder.Id.ToString(), + dListing.Name, + licenseProvider.GetLicense(dOrder.LicenseId).LicenseType.ToString(), + dOrder.Quantity, + dMember.Name, + dMember.Email); + + MailMessage mm = new MailMessage(); + mm.Subject = subject; + mm.Body = body; + + mm.To.Add(dListing.Vendor.Member.Email); + mm.From = from; + + c.Send(mm); + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications] Deli order vendor notification message sent, order item id: " + dOrder.Id.ToString()); + } + catch (Exception e) + { + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications]" + e.Message); + + } + + return true; + } + } +} \ No newline at end of file diff --git a/Marketplace/NotificationTypes/DeliOrderComplete.cs b/Marketplace/NotificationTypes/DeliOrderComplete.cs new file mode 100644 index 00000000..3aa17e4c --- /dev/null +++ b/Marketplace/NotificationTypes/DeliOrderComplete.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using NotificationsCore; +using Marketplace.Interfaces; +using Marketplace.Providers; +using System.Net.Mail; + +namespace Marketplace.NotificationTypes +{ + public class DeliOrderComplete : Notification + { + public DeliOrderComplete() + { + } + + public override bool SendNotification(System.Xml.XmlNode details, params object[] args) + { + IOrderProvider OrderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + IMemberProvider MemberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + + + try + { + SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText); + c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText); + + MailAddress from = new MailAddress( + details.SelectSingleNode("//from/email").InnerText, + details.SelectSingleNode("//from/name").InnerText); + + string subject = details.SelectSingleNode("//subject").InnerText; + string body = details.SelectSingleNode("//body").InnerText; + + // deli order + IOrder dOrder = (IOrder)args[0]; + + // deli member + IMember dMember = (IMember)args[1]; + + string domain = details.SelectSingleNode("//domain").InnerText; + + body = string.Format(body, + dMember.Name, + dOrder.Id.ToString(), + dOrder.ProcessedTotal.ToString(), + dOrder.Currency.ToString(), + dOrder.PaymentDate.ToString(), + args[2].ToString()); + + MailMessage mm = new MailMessage(); + mm.Subject = subject; + mm.Body = body; + + mm.To.Add(dMember.Email); + mm.From = from; + + c.Send(mm); + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications] Deli order complete message sent, order id: " + dOrder.Id.ToString()); + } + catch (Exception e) + { + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications]" + e.Message); + + } + + return true; + } + } +} \ No newline at end of file diff --git a/Marketplace/NotificationTypes/DeliPayoutRequest.cs b/Marketplace/NotificationTypes/DeliPayoutRequest.cs new file mode 100644 index 00000000..2160fd31 --- /dev/null +++ b/Marketplace/NotificationTypes/DeliPayoutRequest.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using NotificationsCore; +using Marketplace.Interfaces; +using Marketplace.Providers; +using System.Net.Mail; + +namespace Marketplace.NotificationTypes +{ + public class DeliPayoutRequest : Notification + { + public DeliPayoutRequest() + { + } + + public override bool SendNotification(System.Xml.XmlNode details, params object[] args) + { + IPayoutProvider payoutProvider = (IPayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + IMemberProvider MemberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + + + try + { + SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText); + c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText); + + MailAddress from = new MailAddress( + details.SelectSingleNode("//from/email").InnerText, + details.SelectSingleNode("//from/name").InnerText); + + string subject = details.SelectSingleNode("//subject").InnerText; + string body = details.SelectSingleNode("//body").InnerText; + string notify = details.SelectSingleNode("//to").InnerText; + + // deli order + IPayout dPayout = (IPayout)args[0]; + + // deli member + IMember dMember = (IMember)MemberProvider.GetMemberById(dPayout.VendorId); + + string domain = details.SelectSingleNode("//domain").InnerText; + + body = string.Format(body, + dMember.Name, + GetPayoutValue(dPayout.OrderItems).ToString()); + + MailMessage mm = new MailMessage(); + mm.Subject = subject; + mm.Body = body; + + mm.To.Add(notify); + mm.From = from; + + c.Send(mm); + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications] Deli payout message sent, payout id: " + dPayout.Id.ToString()); + } + catch (Exception e) + { + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "[Notifications]" + e.Message + "++++++++++++++++++++++" + e.Source + "-------" + e.StackTrace); + + } + + return true; + } + + private double GetPayoutValue(IEnumerable items) + { + double val = 0.00; + foreach (var i in items) + { + val += i.PayoutAmount; + } + + return val; + } + } +} \ No newline at end of file diff --git a/Marketplace/NotificationTypes/Notification.config b/Marketplace/NotificationTypes/Notification.config new file mode 100644 index 00000000..e4fb3293 --- /dev/null +++ b/Marketplace/NotificationTypes/Notification.config @@ -0,0 +1,267 @@ + + + + + + + mx01.fab-it.dk + our.umbraco.org + + Our Umbraco + robot@umbraco.org + + + + + + + + + + Umbraco community: Vote for project reminder + We noticed you downloaded the project ‘{0}’ from Umbraco Community Projects and have not yet given the project a vote. +Voting for projects helps others find high-quality projects and helps project owners by letting them know which projects the community finds valuable. + +You can view the project here {1} + + +Thank You from the Umbraco Community! +-------------------------------------------------- +Don't want to get these notifications? Simply update your profile on our.umbraco.org + + + + + Umbraco community: Solution Reminder + We noticed that the topic ‘{0}’ you created in the Umbraco Community Forum does not have a post marked as a solution. +If a post helped answer your question or resolve your issue please mark it as a solution so others can quickly find it. You can view the topic and any posts here {1}. + + +Thank You from the Umbraco Community! +-------------------------------------------------- +Don't want to get these notifications? Simply update your profile on our.umbraco.org + + + + + Umbraco community: New topic in '{0}' forum + {2} just added a new topic to the '{0}' forum. + +-------------------------------------------------- + +{3} + +{4} + +-------------------------------------------------- + +You can view the new topic here: +{1} + + +Thank You from the Umbraco Community! +-------------------------------------------------- +You get this notification because you are subscribed to the '{0}' forum notifications. +You can unsubscribe from your profile on our.umbraco.org + + + + + Umbraco community: New comment in topic '{0}' + {2} just added a new comment to the '{0}' topic. + +-------------------------------------------------- + +{3} + +-------------------------------------------------- + +You can view the new comment here: +{1} + + +Thank You from the Umbraco Community! +-------------------------------------------------- +You get this notification because you are subscribed to the '{0}' topic notifications. +You can unsubscribe from your profile on our.umbraco.org + + + + + Welcome to the Umbraco Deli + + Hi {0} - + + During your purchase from the Umbraco Deli we created + a new member account for you, just to save you some + time. + + -------------------------------------------------- + + Your user name is: {1} + Your password is: {2} + + -------------------------------------------------- + + We suggest you protect your information by changing + your password after logging in at: + + http://our.umbraco.org/member/login + + -------------------------------------------------- + + Not only does your new member account provide you with + access to your purchased licenses, but it also is your key + to the Umbraco Community on http://our.umbraco.org/ ! + + We encourage you to log in to http://our.umbraco.org/member/login + and plug-in to our community. + + + Thank You from the Umbraco Deli! + -------------------------------------------------- + We sent this notification because we created an account for you. + You can unsubscribe from further communication from + your profile on our.umbraco.org + + + + + Your Umbraco Deli Order + + Hi {0} - + + Your Umbraco Deli purchase is complete! Your order details are below, + but you may want to get on it with it and just configure your + license here: http://our.umbraco.org/member/profile/my-licenses/ + + -------------------------------------------------- + + Deli Order Id: {1} + Payment Amount: {2} + Payment Currency: {3} + Payment Date: {4} + Transaction Id: {5} + + -------------------------------------------------- + + + Thank You from the Umbraco Deli! + + -------------------------------------------------- + We sent this notification because you completed an order with us. + You can unsubscribe from further communication from + your profile on our.umbraco.org + + + + + You have a new Umbraco Deli Order + + Hi {0} - + + An order was just placed on theUmbraco Deli for your project! + The details of the order details are below. + + -------------------------------------------------- + + Order Item Id: {1} + Deli project name: {2} + License Type: {3} x {4} + Ordered by: {5}, {6} + + -------------------------------------------------- + + Thank You from the Umbraco Deli! + + -------------------------------------------------- + We sent this notification because you are a Deli vendor. + You can unsubscribe from further communication from + your profile on our.umbraco.org + + + + + Welcome to the Umbraco Deli + + Hi {0} - + + During your purchase from the Umbraco Deli we created + a new member account for you, just to save you some + time. + + -------------------------------------------------- + + Your user name is: {1} + Your password is: {2} + + -------------------------------------------------- + + We suggest you protect your information by changing + your password after logging in at: + + http://our.umbraco.org/member/login + + -------------------------------------------------- + + Not only does your new member account provide you with + access to your purchased licenses, but it also is your key + to the Umbraco Community on http://our.umbraco.org/ ! + + We encourage you to log in to http://our.umbraco.org/member/login + and plug-in to our community. + + + Thank You from the Umbraco Deli! + -------------------------------------------------- + We sent this notification because we created an account for you. + You can unsubscribe from further communication from + your profile on our.umbraco.org + + + + + A new payout request has been received + gregory@umbraco.com + + Hi there - + + A Deli Vendor has requested a payout! Payout details are below: + http://our.umbraco.org/umbraco/ + + -------------------------------------------------- + + Vendor: {0} + Payout Amount: {1} + + -------------------------------------------------- + + + Thank You from the Umbraco Deli! + + -------------------------------------------------- + We sent this notification because your the BOSS! + + + + + + \ No newline at end of file diff --git a/Marketplace/ProjectFileUploadHandler.cs b/Marketplace/ProjectFileUploadHandler.cs new file mode 100644 index 00000000..41a1c646 --- /dev/null +++ b/Marketplace/ProjectFileUploadHandler.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using umbraco.cms.businesslogic.web; +using umbraco.cms.businesslogic; +using umbraco.cms.businesslogic.member; +using Marketplace.Interfaces; +using Marketplace.Providers; +using our; +using Marketplace.Providers.MediaFile; +using Marketplace.Umbraco.BusinessLogic; + +namespace Marketplace { + public class ProjectFileUploadHandler : IHttpHandler { + + #region IHttpHandler Members + + public bool IsReusable { + get { return true; } + } + + public void ProcessRequest(HttpContext context) { + + HttpPostedFile file = context.Request.Files["Filedata"]; + string userguid = context.Request.Form["USERGUID"]; + string projectguid = context.Request.Form["NODEGUID"]; + string fileType = context.Request.Form["FILETYPE"]; + string fileName = context.Request.Form["FILENAME"]; + string umbraoVersion = (context.Request.Form["UMBRACOVERSION"] != null) ? context.Request.Form["UMBRACOVERSION"] : "nan"; + string dotNetVersion = (context.Request.Form["DOTNETVERSION"] != null) ? context.Request.Form["DOTNETVERSION"] : "nan"; + string trustLevel = (context.Request.Form["TRUSTLEVEL"] != null) ? context.Request.Form["TRUSTLEVEL"] : "nan"; + + + + + List v = new List() { UmbracoVersion.DefaultVersion() }; + + if (!string.IsNullOrEmpty(umbraoVersion)) + { + v.Clear(); + v = GetVersionsFromString(umbraoVersion); + } + + + bool trust = false; + if(trustLevel == "Medium"){ + trust = true; + } + + + if (!string.IsNullOrEmpty(userguid) && !string.IsNullOrEmpty(projectguid) && !string.IsNullOrEmpty(fileType) && !string.IsNullOrEmpty(fileName)) { + + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var p = provider.GetListing(new Guid(projectguid)); + Member mem = new Member(new Guid(userguid)); + + if (p.Vendor != null && p.Vendor.Member.Id == mem.Id || Utills.IsProjectContributor(mem.Id, p.Id)) + { + + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + + var packageFileType = (FileType)Enum.Parse(typeof(FileType), (string)fileType , true); + + fileProvider.CreateFile(fileName, p.Version, mem.UniqueId, file, packageFileType, v, dotNetVersion, trust); + + } else { + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, 0, "wrong type or not a owner"); + } + + } + } + + public static List GetVersionsFromString(string p) + { + var verArray = p.Split(','); + var verList = new List(); + foreach (var ver in verArray) + { + verList.Add(UmbracoVersion.AvailableVersions()[ver]); + } + return verList; + } + + + #endregion + } +} diff --git a/Marketplace/Properties/AssemblyInfo.cs b/Marketplace/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..f176c11b --- /dev/null +++ b/Marketplace/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Marketplace")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Marketplace")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("b19fabd8-dd28-4981-9123-56d8467905a7")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Marketplace/Properties/Settings.Designer.cs b/Marketplace/Properties/Settings.Designer.cs new file mode 100644 index 00000000..8e919b52 --- /dev/null +++ b/Marketplace/Properties/Settings.Designer.cs @@ -0,0 +1,46 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34014 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("http://umbraco.com/umbraco/plugins/memberlookup/memberlookup.asmx")] + public string Marketplace_com_umbraco_MemberLookUp { + get { + return ((string)(this["Marketplace_com_umbraco_MemberLookUp"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("http://umbraco.com/webservices/orders.asmx")] + public string Marketplace_com_umbraco_orders_Orders { + get { + return ((string)(this["Marketplace_com_umbraco_orders_Orders"])); + } + } + } +} diff --git a/Marketplace/Properties/Settings.settings b/Marketplace/Properties/Settings.settings new file mode 100644 index 00000000..824486b6 --- /dev/null +++ b/Marketplace/Properties/Settings.settings @@ -0,0 +1,12 @@ + + + + + + http://umbraco.com/umbraco/plugins/memberlookup/memberlookup.asmx + + + http://umbraco.com/webservices/orders.asmx + + + \ No newline at end of file diff --git a/Marketplace/Razor/Deli-MyProjects.cshtml b/Marketplace/Razor/Deli-MyProjects.cshtml new file mode 100644 index 00000000..53c6d1e4 --- /dev/null +++ b/Marketplace/Razor/Deli-MyProjects.cshtml @@ -0,0 +1,95 @@ +@using Marketplace.Interfaces +@using Marketplace.Providers + +@{ + IMemberProvider memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + IMember member = memberProvider.GetCurrentMember(); + IListingProvider provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + IEnumerable projects = provider.GetListingsByVendor(member.Id,true,true); + + string editUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Edit)); + string forumUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Forum)); + string licenseUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Licenses)); + string teamUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Team)); +} + +

Your existing projects

+ +
    +@foreach (var project in projects) +{ +
  • +

    + @project.Name +

    + @if (!string.IsNullOrEmpty(project.DefaultScreenshot)) + { + @project.Name + } + else + { + @project.Name + } + + @project.CreateDate.ToString("D") + +
      +
    • Edit
      • +
    • Forums
      • + @if (project.ListingType == ListingType.commercial) + { +
    • Licenses
      • + } + + @if (project.OpenForCollab) + { +
    • Team
      • + } +
    +
    • + +} +

  • +Add new project +

    +Add new project +
    • +
+ + + + + +@{ + var contribProjects = provider.GetListingsForContributor(member.Id); +} + +@if (contribProjects.Count() > 0) +{ +

Project where you are contributor

+ +} + diff --git a/Marketplace/Razor/Deli-ProjectCategories.cshtml b/Marketplace/Razor/Deli-ProjectCategories.cshtml new file mode 100644 index 00000000..56b7e806 --- /dev/null +++ b/Marketplace/Razor/Deli-ProjectCategories.cshtml @@ -0,0 +1,22 @@ +@using Marketplace.Interfaces +@using Marketplace.Providers + +@{ + ICategoryProvider categoryProvider = (ICategoryProvider)MarketplaceProviderManager.Providers["CategoryProvider"]; + IEnumerable cats = categoryProvider.GetAllCategories(); + var selected = ""; +} +

Project Categories

+
    +@foreach (var cat in cats) +{ + +
  • + + + @cat.Name + +@* (@cat.ProjectCount)*@ +
    • +} +
diff --git a/Marketplace/Razor/Deli-TagCloud.cshtml b/Marketplace/Razor/Deli-TagCloud.cshtml new file mode 100644 index 00000000..7b6d5623 --- /dev/null +++ b/Marketplace/Razor/Deli-TagCloud.cshtml @@ -0,0 +1,33 @@ +@using Marketplace.Interfaces +@using Marketplace.Providers + +@{ + var tagsProvider = (IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]; + var tags = tagsProvider.GetAllTags(false).OrderBy(x => x.Count).Take(50).OrderBy(x => x.Text); + max = tags.Max(x => x.LiveCount); +} + +@functions{ + + public int max { get; set; } + public string weight(int liveCount) + { + double perc = ((double)liveCount / (double)max) * 100; + + if(perc >= 99)return "weight1"; + if(perc >= 70)return "weight2"; + if(perc >= 40)return "weight3"; + if(perc >= 20)return "weight4"; + return "weight5"; + + + } +} + + + +
+@foreach (var t in tags) { + @t.Text +} +
diff --git a/Marketplace/Razor/VersionCompatibilityReport.cs b/Marketplace/Razor/VersionCompatibilityReport.cs new file mode 100644 index 00000000..22aa2005 --- /dev/null +++ b/Marketplace/Razor/VersionCompatibilityReport.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Marketplace.uVersion; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.Razor +{ + public class VersionCompatibilityReport + { + private List uVersions; + private int fileId { get; set; } + private int packageId { get; set; } + private IListingProvider projectProvider; + private IListingItem project; + private IMediaFile file; + + + public VersionCompatibilityReport(int fid, int pid) + { + uVersions = Marketplace.uVersion.UVersion.GetAllVersions(); + fileId = fid; + packageId = packageId; + projectProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + project = projectProvider.GetListing(pid, false); + file = project.PackageFile.Where(x => x.Id == Int32.Parse(project.CurrentReleaseFile)).FirstOrDefault(); + } + + public List GetCompatibilityReport() + { + var compatList = new List(); + using (Marketplace.Data.MarketplaceDataContext ctx = new Marketplace.Data.MarketplaceDataContext()) + { + + foreach (var ver in uVersions) + { + var reports = ctx.DeliVersionCompatibilities.Where(x => x.version == ver.Name && x.projectId == project.Id); + + if (reports.Count() > 0) + { + float compats = reports.Where(x => x.isCompatible).Count(); + float numReps = reports.Count(); + var perc = Convert.ToInt32(((compats / numReps) * 100)); + + var smiley = "unhappy"; + + if (perc >= 95) + { + smiley = "joyous"; + } + else if (perc < 95 && perc >= 80) + { + smiley = "happy"; + } + else if (perc < 80 && perc >= 65) + { + smiley = "neutral"; + } + else if (perc < 65 && perc >= 50) + { + smiley = "unhappy"; + } + else + { + smiley = "superUnhappy"; + } + + + + compatList.Add(new verCompat() { perc = perc, smiley = smiley, version = ver.Name }); + } + else + { + compatList.Add(new verCompat() { perc = 0, smiley = "untested", version = ver.Name }); + } + + } + } + return compatList; + + } + } + + public class verCompat + { + public int perc { get; set; } + public string smiley { get; set; } + public string version { get; set; } + } +} \ No newline at end of file diff --git a/Marketplace/Razor/versionCompatibility.cshtml b/Marketplace/Razor/versionCompatibility.cshtml new file mode 100644 index 00000000..1382a192 --- /dev/null +++ b/Marketplace/Razor/versionCompatibility.cshtml @@ -0,0 +1,46 @@ +@using Marketplace.uVersion; +@{ + var versions = UVersion.GetAllVersions(); + var fileId = @Parameter.fileId; + var packageId = @Parameter.packageId; + + var memberProvider = (Marketplace.Interfaces.IMemberProvider)Marketplace.Providers.MarketplaceProviderManager.Providers["MemberProvider"]; + var mem = memberProvider.GetCurrentMember(); + + var projectProvider = (Marketplace.Interfaces.IListingProvider)Marketplace.Providers.MarketplaceProviderManager.Providers["ListingProvider"]; + var Project = projectProvider.GetListing(Int32.Parse(packageId)); + +} + +@if(umbraco.library.IsLoggedOn()) +{ + + if(Marketplace.library.HasDownloaded(mem.Id, Project.Id)) + { + + + + @foreach (var v in versions) + { + var alias = v.Name.Replace(".", ""); + + + + + + + } +
@v.Name
+ + @:or Cancel + } + else + { +

You need to download this package before you can report on it's compatibility

+ } + +} +else +{ +

You must login before you can report on package compatibility.

+} \ No newline at end of file diff --git a/Marketplace/Razor/versionCompatibilityReport.cshtml b/Marketplace/Razor/versionCompatibilityReport.cshtml new file mode 100644 index 00000000..e5ae2682 --- /dev/null +++ b/Marketplace/Razor/versionCompatibilityReport.cshtml @@ -0,0 +1,26 @@ +@using Marketplace.Razor; +@{ + int fileId = Int32.Parse(Parameter.fileId); + int packageId = Int32.Parse(Parameter.packageId); + + var verReport = new VersionCompatibilityReport(fileId, packageId); +} + +This project is compatible with the following versions as reported by community members who have downloaded this package:

+ +@{ + + foreach (var ver in verReport.GetCompatibilityReport()) + { + if(ver.smiley != "untested"){ + @ver.version (@ver.perc%) + } + else + { + @ver.version (untested) + } + } +} + +
+ \ No newline at end of file diff --git a/Marketplace/Rest.cs b/Marketplace/Rest.cs new file mode 100644 index 00000000..b7cc03c6 --- /dev/null +++ b/Marketplace/Rest.cs @@ -0,0 +1,167 @@ +using System; +using System.Web.Script.Serialization; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Data; +using System.Web.Security; +using Umbraco.Web.BaseRest; + +namespace Marketplace +{ + [RestExtension("deli")] + public class Rest + { + /// + /// Gets the popular listings. + /// + /// Type of the listing. + /// The skip. + /// The take. + /// + [RestExtensionMethod(ReturnXml = false)] + public static string GetPopularListings(string listingType, int skip, int take) + { + + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + IEnumerable Projects; + + switch (listingType) + { + case "free": + Projects = ProjectsProvider.GetListingsByPopularity(skip, take, true, false).Where(x => x.ListingType == Interfaces.ListingType.free).Take(take); + break; + + case "commercial": + Projects = ProjectsProvider.GetTopPaidListings(skip, take, true, false); + break; + + default: + Projects = ProjectsProvider.GetListingsByPopularity(skip, take, true, false); + break; + } + + + JavaScriptSerializer serializer = new JavaScriptSerializer(); + return serializer.Serialize(Projects.Select(x => new + { + Name = x.Name, + CategoryName = Marketplace.library.GetCategoryName((int)x.Id), + DefaultScreenShot = GetScreenShot(x.DefaultScreenshot), + Description = Marketplace.library.ShortenText(x.Description.ToString()), + NiceUrl = x.NiceUrl, + ListingType = x.ListingType.ToString(), + Karma = x.Karma, + Downloads = x.Downloads + + })); + } + + /// + /// Gets the newest listings. + /// + /// Type of the listing. + /// The skip. + /// The take. + /// + [RestExtensionMethod(ReturnXml = false)] + public static string GetNewestListings(string listingType, int skip, int take) + { + + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + IEnumerable Projects; + + switch (listingType) + { + case "free": + Projects = ProjectsProvider.GetListingsByLatest(skip, take, ListingType.free, true, false); + break; + + case "commercial": + Projects = ProjectsProvider.GetListingsByLatest(skip, take, ListingType.commercial, true, false); + break; + + default: + Projects = ProjectsProvider.GetListingsByLatest(skip, take, true, false); + break; + } + + + JavaScriptSerializer serializer = new JavaScriptSerializer(); + return serializer.Serialize(Projects.Select(x => new + { + Name = x.Name, + CategoryName = Marketplace.library.GetCategoryName((int)x.Id), + DefaultScreenShot = GetScreenShot(x.DefaultScreenshot), + Description = Marketplace.library.ShortenText(x.Description.ToString()), + NiceUrl = x.NiceUrl, + ListingType = x.ListingType.ToString(), + Karma = x.Karma, + Downloads = x.Downloads + + })); + } + + [RestExtensionMethod(ReturnXml = false)] + public static string CompatibilityReport(int projectId, int fileId, string compatArr) + { + using (var ctx = new MarketplaceDataContext()) + { + int _currentMember = HttpContext.Current.User.Identity.IsAuthenticated ? (int)Membership.GetUser().ProviderUserKey : 0; + var versionData = compatArr.Split(',').Select(x => new { version = x.Split('^')[0], compat = x.Split('^')[1] }); + + + // load all the existing member reports for this package by this member. This is to stop multiple insertions of reports for a single member + var memberReports = ctx.DeliVersionCompatibilities.Where(x => x.memberId == _currentMember && x.fileId == fileId && x.projectId == projectId).ToList(); + + + + foreach (var ver in versionData) + { + if (ver.compat == "1" || ver.compat == "0") + { + var compVer = new DeliVersionCompatibility() { fileId = fileId, memberId = _currentMember, isCompatible = ver.compat == "1" ? true : false, dateStamp = DateTime.Now, version = ver.version, projectId = projectId }; + + //try find an existing report + var existingReport = memberReports.Where(x => x.fileId == compVer.fileId && x.memberId == compVer.memberId && x.projectId == compVer.projectId && x.version == compVer.version).FirstOrDefault(); + if (existingReport != null) + { + existingReport.isCompatible = compVer.isCompatible; + existingReport.dateStamp = DateTime.Now; + } + else + { + // otherwise insert the new compat ver report + ctx.DeliVersionCompatibilities.InsertOnSubmit(compVer); + } + + } + + } + ctx.SubmitChanges(); + + //give them some Karma if they haven't reported on this before. + if (memberReports.Count() == 0) + { + uPowers.Library.Rest.Action("ProjectVersionVote", fileId); + } + } + return "got it thanks"; + } + + + + private static string GetScreenShot(string ss){ + if(!string.IsNullOrEmpty(ss)){ + return "/umbraco/imagegen.ashx?image="+ ss +"&pad=true&width=50&height=50;"; + } + else return "/css/img/package2.png"; + } + + } +} + diff --git a/Marketplace/Web References/com.umbraco.orders/BuyerProxy.datasource b/Marketplace/Web References/com.umbraco.orders/BuyerProxy.datasource new file mode 100644 index 00000000..fca61402 --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/BuyerProxy.datasource @@ -0,0 +1,10 @@ + + + + Marketplace.com.umbraco.orders.BuyerProxy, Web References.com.umbraco.orders.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco.orders/OrderProxy.datasource b/Marketplace/Web References/com.umbraco.orders/OrderProxy.datasource new file mode 100644 index 00000000..60658ce1 --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/OrderProxy.datasource @@ -0,0 +1,10 @@ + + + + Marketplace.com.umbraco.orders.OrderProxy, Web References.com.umbraco.orders.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco.orders/Reference.cs b/Marketplace/Web References/com.umbraco.orders/Reference.cs new file mode 100644 index 00000000..511883fa --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/Reference.cs @@ -0,0 +1,741 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34014 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.34014. +// +#pragma warning disable 1591 + +namespace Marketplace.com.umbraco.orders { + using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; + using System.Xml.Serialization; + using System.ComponentModel; + + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="OrdersSoap", Namespace="http://tempuri.org/")] + public partial class Orders : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback CreateOperationCompleted; + + private System.Threading.SendOrPostCallback GetFromEcommerceIDOperationCompleted; + + private System.Threading.SendOrPostCallback GetFromTransactionIDOperationCompleted; + + private System.Threading.SendOrPostCallback LinkProfilesOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// + public Orders() { + this.Url = global::Marketplace.Properties.Settings.Default.Marketplace_com_umbraco_orders_Orders; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// + public event CreateCompletedEventHandler CreateCompleted; + + /// + public event GetFromEcommerceIDCompletedEventHandler GetFromEcommerceIDCompleted; + + /// + public event GetFromTransactionIDCompletedEventHandler GetFromTransactionIDCompleted; + + /// + public event LinkProfilesCompletedEventHandler LinkProfilesCompleted; + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/Create", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public OrderProxy Create(OrderProxy order, bool testMode, string login, string password) { + object[] results = this.Invoke("Create", new object[] { + order, + testMode, + login, + password}); + return ((OrderProxy)(results[0])); + } + + /// + public void CreateAsync(OrderProxy order, bool testMode, string login, string password) { + this.CreateAsync(order, testMode, login, password, null); + } + + /// + public void CreateAsync(OrderProxy order, bool testMode, string login, string password, object userState) { + if ((this.CreateOperationCompleted == null)) { + this.CreateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateOperationCompleted); + } + this.InvokeAsync("Create", new object[] { + order, + testMode, + login, + password}, this.CreateOperationCompleted, userState); + } + + private void OnCreateOperationCompleted(object arg) { + if ((this.CreateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CreateCompleted(this, new CreateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetFromEcommerceID", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public OrderProxy GetFromEcommerceID(int EcommerceOrderID, string login, string password) { + object[] results = this.Invoke("GetFromEcommerceID", new object[] { + EcommerceOrderID, + login, + password}); + return ((OrderProxy)(results[0])); + } + + /// + public void GetFromEcommerceIDAsync(int EcommerceOrderID, string login, string password) { + this.GetFromEcommerceIDAsync(EcommerceOrderID, login, password, null); + } + + /// + public void GetFromEcommerceIDAsync(int EcommerceOrderID, string login, string password, object userState) { + if ((this.GetFromEcommerceIDOperationCompleted == null)) { + this.GetFromEcommerceIDOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFromEcommerceIDOperationCompleted); + } + this.InvokeAsync("GetFromEcommerceID", new object[] { + EcommerceOrderID, + login, + password}, this.GetFromEcommerceIDOperationCompleted, userState); + } + + private void OnGetFromEcommerceIDOperationCompleted(object arg) { + if ((this.GetFromEcommerceIDCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetFromEcommerceIDCompleted(this, new GetFromEcommerceIDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetFromTransactionID", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public OrderProxy GetFromTransactionID(string transaction, string login, string password) { + object[] results = this.Invoke("GetFromTransactionID", new object[] { + transaction, + login, + password}); + return ((OrderProxy)(results[0])); + } + + /// + public void GetFromTransactionIDAsync(string transaction, string login, string password) { + this.GetFromTransactionIDAsync(transaction, login, password, null); + } + + /// + public void GetFromTransactionIDAsync(string transaction, string login, string password, object userState) { + if ((this.GetFromTransactionIDOperationCompleted == null)) { + this.GetFromTransactionIDOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFromTransactionIDOperationCompleted); + } + this.InvokeAsync("GetFromTransactionID", new object[] { + transaction, + login, + password}, this.GetFromTransactionIDOperationCompleted, userState); + } + + private void OnGetFromTransactionIDOperationCompleted(object arg) { + if ((this.GetFromTransactionIDCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetFromTransactionIDCompleted(this, new GetFromTransactionIDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/LinkProfiles", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public BuyerProxy LinkProfiles(string profileEmail, string profilePassword, string login, string password) { + object[] results = this.Invoke("LinkProfiles", new object[] { + profileEmail, + profilePassword, + login, + password}); + return ((BuyerProxy)(results[0])); + } + + /// + public void LinkProfilesAsync(string profileEmail, string profilePassword, string login, string password) { + this.LinkProfilesAsync(profileEmail, profilePassword, login, password, null); + } + + /// + public void LinkProfilesAsync(string profileEmail, string profilePassword, string login, string password, object userState) { + if ((this.LinkProfilesOperationCompleted == null)) { + this.LinkProfilesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnLinkProfilesOperationCompleted); + } + this.InvokeAsync("LinkProfiles", new object[] { + profileEmail, + profilePassword, + login, + password}, this.LinkProfilesOperationCompleted, userState); + } + + private void OnLinkProfilesOperationCompleted(object arg) { + if ((this.LinkProfilesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.LinkProfilesCompleted(this, new LinkProfilesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class OrderProxy { + + private OrderLineProxy[] orderLinesField; + + private System.DateTime createdField; + + private BuyerProxy buyerField; + + private OrderStatus orderStatusField; + + private string invoicePathField; + + private int deliOrderIDField; + + private int ecommerceOrderIDField; + + private string purchaseOrderField; + + private string transactionIDField; + + /// + public OrderLineProxy[] OrderLines { + get { + return this.orderLinesField; + } + set { + this.orderLinesField = value; + } + } + + /// + public System.DateTime Created { + get { + return this.createdField; + } + set { + this.createdField = value; + } + } + + /// + public BuyerProxy Buyer { + get { + return this.buyerField; + } + set { + this.buyerField = value; + } + } + + /// + public OrderStatus OrderStatus { + get { + return this.orderStatusField; + } + set { + this.orderStatusField = value; + } + } + + /// + public string InvoicePath { + get { + return this.invoicePathField; + } + set { + this.invoicePathField = value; + } + } + + /// + public int DeliOrderID { + get { + return this.deliOrderIDField; + } + set { + this.deliOrderIDField = value; + } + } + + /// + public int EcommerceOrderID { + get { + return this.ecommerceOrderIDField; + } + set { + this.ecommerceOrderIDField = value; + } + } + + /// + public string PurchaseOrder { + get { + return this.purchaseOrderField; + } + set { + this.purchaseOrderField = value; + } + } + + /// + public string TransactionID { + get { + return this.transactionIDField; + } + set { + this.transactionIDField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class OrderLineProxy { + + private decimal amountField; + + private string descriptionField; + + private int quantityField; + + private System.Guid productIDField; + + private int vendorEconomicIDField; + + /// + public decimal Amount { + get { + return this.amountField; + } + set { + this.amountField = value; + } + } + + /// + public string description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public int Quantity { + get { + return this.quantityField; + } + set { + this.quantityField = value; + } + } + + /// + public System.Guid ProductID { + get { + return this.productIDField; + } + set { + this.productIDField = value; + } + } + + /// + public int VendorEconomicID { + get { + return this.vendorEconomicIDField; + } + set { + this.vendorEconomicIDField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class BuyerProxy { + + private string nameField; + + private string emailField; + + private string loginField; + + private string companyField; + + private string vATField; + + private bool vatInvalidField; + + private string addressField; + + private string countryField; + + private string phoneField; + + private string ipField; + + private int umbracoComMemberIDField; + + private System.Guid umbracoComMemberGuidField; + + private int ourMemberIdField; + + private System.Guid ourMemberGuidField; + + private string[] groupsField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Email { + get { + return this.emailField; + } + set { + this.emailField = value; + } + } + + /// + public string Login { + get { + return this.loginField; + } + set { + this.loginField = value; + } + } + + /// + public string Company { + get { + return this.companyField; + } + set { + this.companyField = value; + } + } + + /// + public string VAT { + get { + return this.vATField; + } + set { + this.vATField = value; + } + } + + /// + public bool VatInvalid { + get { + return this.vatInvalidField; + } + set { + this.vatInvalidField = value; + } + } + + /// + public string Address { + get { + return this.addressField; + } + set { + this.addressField = value; + } + } + + /// + public string Country { + get { + return this.countryField; + } + set { + this.countryField = value; + } + } + + /// + public string Phone { + get { + return this.phoneField; + } + set { + this.phoneField = value; + } + } + + /// + public string IP { + get { + return this.ipField; + } + set { + this.ipField = value; + } + } + + /// + public int umbracoComMemberID { + get { + return this.umbracoComMemberIDField; + } + set { + this.umbracoComMemberIDField = value; + } + } + + /// + public System.Guid umbracoComMemberGuid { + get { + return this.umbracoComMemberGuidField; + } + set { + this.umbracoComMemberGuidField = value; + } + } + + /// + public int ourMemberId { + get { + return this.ourMemberIdField; + } + set { + this.ourMemberIdField = value; + } + } + + /// + public System.Guid ourMemberGuid { + get { + return this.ourMemberGuidField; + } + set { + this.ourMemberGuidField = value; + } + } + + /// + public string[] Groups { + get { + return this.groupsField; + } + set { + this.groupsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public enum OrderStatus { + + /// + Accepted, + + /// + Refused, + + /// + Error, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + public delegate void CreateCompletedEventHandler(object sender, CreateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CreateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public OrderProxy Result { + get { + this.RaiseExceptionIfNecessary(); + return ((OrderProxy)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + public delegate void GetFromEcommerceIDCompletedEventHandler(object sender, GetFromEcommerceIDCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetFromEcommerceIDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetFromEcommerceIDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public OrderProxy Result { + get { + this.RaiseExceptionIfNecessary(); + return ((OrderProxy)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + public delegate void GetFromTransactionIDCompletedEventHandler(object sender, GetFromTransactionIDCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetFromTransactionIDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetFromTransactionIDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public OrderProxy Result { + get { + this.RaiseExceptionIfNecessary(); + return ((OrderProxy)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + public delegate void LinkProfilesCompletedEventHandler(object sender, LinkProfilesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class LinkProfilesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal LinkProfilesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public BuyerProxy Result { + get { + this.RaiseExceptionIfNecessary(); + return ((BuyerProxy)(this.results[0])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco.orders/Reference.map b/Marketplace/Web References/com.umbraco.orders/Reference.map new file mode 100644 index 00000000..4cc526ce --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/Reference.map @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco.orders/orders.disco b/Marketplace/Web References/com.umbraco.orders/orders.disco new file mode 100644 index 00000000..d3eadfb1 --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/orders.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco.orders/orders.wsdl b/Marketplace/Web References/com.umbraco.orders/orders.wsdl new file mode 100644 index 00000000..3265010d --- /dev/null +++ b/Marketplace/Web References/com.umbraco.orders/orders.wsdl @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco/MemberData.datasource b/Marketplace/Web References/com.umbraco/MemberData.datasource new file mode 100644 index 00000000..9707c40e --- /dev/null +++ b/Marketplace/Web References/com.umbraco/MemberData.datasource @@ -0,0 +1,10 @@ + + + + Marketplace.com.umbraco.MemberData, Web References.com.umbraco.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco/Reference.cs b/Marketplace/Web References/com.umbraco/Reference.cs new file mode 100644 index 00000000..a37e8a5c --- /dev/null +++ b/Marketplace/Web References/com.umbraco/Reference.cs @@ -0,0 +1,257 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34014 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.34014. +// +#pragma warning disable 1591 + +namespace Marketplace.com.umbraco { + using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; + using System.Xml.Serialization; + using System.ComponentModel; + + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="MemberLookUpSoap", Namespace="http://tempuri.org/")] + public partial class MemberLookUp : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback GetMemberDataOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// + public MemberLookUp() { + this.Url = global::Marketplace.Properties.Settings.Default.Marketplace_com_umbraco_MemberLookUp; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// + public event GetMemberDataCompletedEventHandler GetMemberDataCompleted; + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetMemberData", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public MemberData GetMemberData(string username, string password) { + object[] results = this.Invoke("GetMemberData", new object[] { + username, + password}); + return ((MemberData)(results[0])); + } + + /// + public void GetMemberDataAsync(string username, string password) { + this.GetMemberDataAsync(username, password, null); + } + + /// + public void GetMemberDataAsync(string username, string password, object userState) { + if ((this.GetMemberDataOperationCompleted == null)) { + this.GetMemberDataOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMemberDataOperationCompleted); + } + this.InvokeAsync("GetMemberData", new object[] { + username, + password}, this.GetMemberDataOperationCompleted, userState); + } + + private void OnGetMemberDataOperationCompleted(object arg) { + if ((this.GetMemberDataCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetMemberDataCompleted(this, new GetMemberDataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")] + public partial class MemberData { + + private int idField; + + private string[] memberGroupsField; + + private string companyField; + + private string addressField; + + private string countryField; + + private string phoneField; + + private string vATNumberField; + + private string invoicingEmailField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string[] MemberGroups { + get { + return this.memberGroupsField; + } + set { + this.memberGroupsField = value; + } + } + + /// + public string Company { + get { + return this.companyField; + } + set { + this.companyField = value; + } + } + + /// + public string Address { + get { + return this.addressField; + } + set { + this.addressField = value; + } + } + + /// + public string Country { + get { + return this.countryField; + } + set { + this.countryField = value; + } + } + + /// + public string Phone { + get { + return this.phoneField; + } + set { + this.phoneField = value; + } + } + + /// + public string VATNumber { + get { + return this.vATNumberField; + } + set { + this.vATNumberField = value; + } + } + + /// + public string InvoicingEmail { + get { + return this.invoicingEmailField; + } + set { + this.invoicingEmailField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + public delegate void GetMemberDataCompletedEventHandler(object sender, GetMemberDataCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetMemberDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetMemberDataCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public MemberData Result { + get { + this.RaiseExceptionIfNecessary(); + return ((MemberData)(this.results[0])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco/Reference.map b/Marketplace/Web References/com.umbraco/Reference.map new file mode 100644 index 00000000..32efed66 --- /dev/null +++ b/Marketplace/Web References/com.umbraco/Reference.map @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco/memberlookup.disco b/Marketplace/Web References/com.umbraco/memberlookup.disco new file mode 100644 index 00000000..7f8ace35 --- /dev/null +++ b/Marketplace/Web References/com.umbraco/memberlookup.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Marketplace/Web References/com.umbraco/memberlookup.wsdl b/Marketplace/Web References/com.umbraco/memberlookup.wsdl new file mode 100644 index 00000000..eaf866ca --- /dev/null +++ b/Marketplace/Web References/com.umbraco/memberlookup.wsdl @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web.Debug.config b/Marketplace/Web.Debug.config new file mode 100644 index 00000000..2c6dd51a --- /dev/null +++ b/Marketplace/Web.Debug.config @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web.Release.config b/Marketplace/Web.Release.config new file mode 100644 index 00000000..4122d79b --- /dev/null +++ b/Marketplace/Web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/Web.config b/Marketplace/Web.config new file mode 100644 index 00000000..9e2fcddf --- /dev/null +++ b/Marketplace/Web.config @@ -0,0 +1,312 @@ + + + +
+ +
+
+ + + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://umbraco.com/umbraco/plugins/memberlookup/memberlookup.asmx + + + http://umbraco.com/webservices/orders.asmx + + + + + http://regexlib.com/WebServices.asmx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/adhoc/setalllive.aspx b/Marketplace/adhoc/setalllive.aspx new file mode 100644 index 00000000..9dfb8301 --- /dev/null +++ b/Marketplace/adhoc/setalllive.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="setalllive.aspx.cs" Inherits="Marketplace.adhoc.setalllive" %> + + + + + + + + +
+
+ +
+
+ + diff --git a/Marketplace/adhoc/setalllive.aspx.cs b/Marketplace/adhoc/setalllive.aspx.cs new file mode 100644 index 00000000..c670919b --- /dev/null +++ b/Marketplace/adhoc/setalllive.aspx.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.web; + +namespace Marketplace.adhoc +{ + public partial class setalllive : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + + var projectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + var projects = projectsProvider.GetAllListings(true, true).ToList(); + var count = 0; + var liveCount = 0; + + var user = new umbraco.BusinessLogic.User(0); + foreach (var p in projects) + { + + if (!p.Live) + { + + count++; + Document d = new Document(p.Id); + d.getProperty("projectLive").Value = "1"; + d.Publish(user); + umbraco.library.UpdateDocumentCache(d.Id); + Response.Write(d.Text + "+++++++:" + d.getProperty("projectLive").Value + "
"); + } + + } + + Response.Write(count + " projects updated to be live of " + projects.Count() + "
"); + Response.Write(liveCount + " are already live"); + + } + } +} \ No newline at end of file diff --git a/Marketplace/adhoc/setalllive.aspx.designer.cs b/Marketplace/adhoc/setalllive.aspx.designer.cs new file mode 100644 index 00000000..711cfa6b --- /dev/null +++ b/Marketplace/adhoc/setalllive.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.adhoc +{ + + + public partial class setalllive + { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/Marketplace/library.cs b/Marketplace/library.cs new file mode 100644 index 00000000..23a065ac --- /dev/null +++ b/Marketplace/library.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco; +using our; +using System.Text.RegularExpressions; +using umbraco.NodeFactory; +using System.Globalization; +using Marketplace.Data; + +namespace Marketplace +{ + [XsltExtension("deli.library")] + public class library + { + + public static bool HasVendorAccess(int pageId) + { + var page = new umbraco.NodeFactory.Node(pageId); + + if (page.GetProperty("vendorOnly") != null) + { + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + var member = memberProvider.GetCurrentMember(); + + var vendorOnly = page.GetProperty("vendorOnly").Value == "1" ? true : false; + if (vendorOnly) + { + if (member.IsDeliVendor) + return true; + else + return false; + } + return true; + } + return true; + + } + + public static string ShortenText(string text) + { + text = Utills.StripHTML(text).Replace(" ", ""); + if (text.Length > 210) + { + + text = text.Substring(0, 210); + text = text.Substring(0, text.LastIndexOf(' ')); + } + + text = Regex.Replace(text, @"[^a-zA-Z0-9\s.?!&;]", ""); //strip all crap from the listing such as ======================================= !!!! + return text.Trim(); + } + + + + public static string GetTagsAsCSV(IEnumerable tagList) + { + var tags = string.Empty; + int counter = 0; + + foreach (var t in tagList) + { + tags += t.Text + ", "; + counter++; + + if (counter > 3) + break; + } + + if (tags.Length > 0) + { + tags = tags.Substring(0, tags.Length - 2); + } + return tags; + } + + public static string GetCategoryName(int projectId) + { + var node = new Node(projectId); + return node.Parent.Name; + + } + + + + + public static string GetDefaultScreenshot(string prop) + { + return !String.IsNullOrEmpty(prop) ? "/umbraco/imagegen.ashx?image=" + prop + "&pad=true&width=50&height=50;" : "/css/img/package2.png"; + } + + public static string GetManufacturerName(IVendor vendor) + { + if (!string.IsNullOrEmpty(vendor.VendorCompanyName)) + { + return vendor.VendorCompanyName; + } + else + { + return vendor.Member.Name; + } + + } + + public static string GetCountry(string code) + { + + + foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.SpecificCultures)) + { + + RegionInfo ri = new RegionInfo(ci.LCID); + if (ri.TwoLetterISORegionName.ToLowerInvariant() == code) + return ri.EnglishName; + } + + return ""; + + } + + + /// + /// Check to see if member has reported on compatibility for a package regardless of version of the package + /// + /// The members Id + /// The package Id + /// + public static bool HasDownloaded(int memberId, int packageId) + { + using (var ctx = new MarketplaceDataContext()) + { + var downs = ctx.projectDownloads.Where(x => x.memberId == memberId && x.projectId == packageId); + if (downs.Count() > 0) + return true; + return false; + + } + } + } +} \ No newline at end of file diff --git a/Marketplace/packages.config b/Marketplace/packages.config new file mode 100644 index 00000000..8a19db24 --- /dev/null +++ b/Marketplace/packages.config @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Marketplace/uVersion/config.cs b/Marketplace/uVersion/config.cs new file mode 100644 index 00000000..1685e5f3 --- /dev/null +++ b/Marketplace/uVersion/config.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Xml; +using System.IO; +using System.Web.Caching; +using umbraco.BusinessLogic; + +namespace Marketplace.uVersion +{ + public class config + { + + public static XmlDocument _Settings + { + get + { + XmlDocument us = (XmlDocument)HttpRuntime.Cache["uVersionSettingsFile"]; + if (us == null) + us = ensureSettingsDocument(); + return us; + } + } + + private static string _path = umbraco.GlobalSettings.FullpathToRoot + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar; + private static string _filename = "uVersion.config"; + private static XmlDocument ensureSettingsDocument() + { + object settingsFile = HttpRuntime.Cache["uVersionSettingsFile"]; + + // Check for language file in cache + if (settingsFile == null) + { + XmlDocument temp = new XmlDocument(); + XmlTextReader settingsReader = new XmlTextReader(_path + _filename); + try + { + temp.Load(settingsReader); + HttpRuntime.Cache.Insert("uVersionSettingsFile", temp, new CacheDependency(_path + _filename)); + } + catch (Exception e) + { + Log.Add(LogTypes.Error, new User(0), -1, "Error reading uVersion setting file: " + e.ToString()); + } + settingsReader.Close(); + return temp; + } + else + return (XmlDocument)settingsFile; + } + + private static void save() + { + _Settings.Save(_path + _filename); + } + + /// + /// Selects a xml node in the umbraco settings config file. + /// + /// The xpath query to the specific node. + /// If found, it returns the specific configuration xml node. + public static XmlNode GetKeyAsNode(string Key) + { + if (Key == null) + throw new ArgumentException("Key cannot be null"); + ensureSettingsDocument(); + if (_Settings == null || _Settings.DocumentElement == null) + return null; + return _Settings.DocumentElement.SelectSingleNode(Key); + } + + /// + /// Gets the value of configuration xml node with the specified key. + /// + /// The key. + /// + public static string GetKey(string Key) + { + ensureSettingsDocument(); + + XmlNode node = _Settings.DocumentElement.SelectSingleNode(Key); + if (node == null || node.FirstChild == null || node.FirstChild.Value == null) + return string.Empty; + return node.FirstChild.Value; + } + + + + } +} \ No newline at end of file diff --git a/Marketplace/uVersion/uVersion.cs b/Marketplace/uVersion/uVersion.cs new file mode 100644 index 00000000..3fb1fc83 --- /dev/null +++ b/Marketplace/uVersion/uVersion.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Xml; + +namespace Marketplace.uVersion +{ + public class UVersion + { + public string Name { get; set; } + public string Description { get; set; } + public bool Exists { get; set; } + + + public UVersion(string name) + { + XmlNode x = config.GetKeyAsNode("/configuration/versions/version [@voteName = '" + name + "']"); + if (x != null) { + Name = x.Attributes.GetNamedItem("voteName").Value; + Description = x.Attributes.GetNamedItem("voteDescription").Value; + + + + Exists = true; + } else + Exists = false; + } + + public static List GetAllVersions() { + XmlNode x = config.GetKeyAsNode("/configuration/versions"); + var l = new List(); + foreach (XmlNode cx in x.ChildNodes) { + if (cx.Attributes != null && cx.Attributes.GetNamedItem("vote") != null && cx.Attributes.GetNamedItem("vote").Value == "true") + if (cx.Attributes.GetNamedItem("voteName") != null) + l.Add(new UVersion(cx.Attributes.GetNamedItem("voteName").Value)); + } + + return l; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx new file mode 100644 index 00000000..b467c101 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx @@ -0,0 +1,152 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="OrderReview.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Admin.OrderReview" %> +

Deli Orders

+

Select Date Range + + 1 Day + 3 Days + 7 Days + 14 Days + 30 Days + 60 Days + 90 Days + 120 Days + +   + +

+ +<%-- + + + + + + + + + + + + + + + + + + + + + +--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"> + + + + +
Deli IdEconomid IdStatusCompanyVAT IdInvoice EmailCountryDateSub Total EURTax Total EURTotal EURCurrencyRefunded?Refund Date
+ + ">[+]  + <%# Eval("Id")%> + + <%# Eval("EconomicId")%> + + <%# Eval("Status")%> + + <%# Eval("Company")%> + + <%# Eval("VatID")%>
+ + + 		+ <%# Eval("InvoiceEmail")%> + + <%# Eval("Country")%> + + <%# Eval("Date")%> + + <%# Eval("SubTotal")%> + + <%# Eval("TaxTotal")%> + + <%# Eval("Total")%> + + <%# Eval("Currency")%> + + <%# Eval("Refunded")%> + + <%# Eval("RefundDate")%> +
+

Order details

+

These are the individual products ordered

+ + + + + + + + + + + + + + + + + + + + + + + +
VendorPackageLicenseQuantityValue
<%# Eval("Vendor")%><%# Eval("Package")%><%# Eval("LicenseTypeName")%><%# Eval("Quantity")%><%# Eval("Value")%>
+ + +
+ + + diff --git a/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.cs b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.cs new file mode 100644 index 00000000..1e14c175 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.cs @@ -0,0 +1,247 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Providers.Orders; +using Marketplace.Providers; +using Marketplace.Interfaces; +using Marketplace.Providers.OrderNote; +using Marketplace.Providers.Listing; +using System.Globalization; +using umbraco.BasePages; +using System.Web.UI.HtmlControls; +using umbraco; +using umbraco.cms.businesslogic.member; + +namespace Marketplace.usercontrols.Deli.Admin +{ + public partial class OrderReview : System.Web.UI.UserControl + { + + #region properties + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + public IOrder Order; + + private IDeliOrderItemProvider _itemProvider; + public IDeliOrderItemProvider ItemProvider + { + get + { + if (_itemProvider != null) + return _itemProvider; + else + { + _itemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + return _itemProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + private IMemberLicenseProvider _memberLicenseProvider; + public IMemberLicenseProvider MemberLicenseProvider + { + get + { + if (_memberLicenseProvider != null) + return _memberLicenseProvider; + else + { + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["memberLicenseProvider"]; + return _memberLicenseProvider; + } + } + } + + private OrderNoteProvider _orderNoteProvider; + public OrderNoteProvider OrderNoteProvider + { + get + { + if (_orderNoteProvider != null) + return _orderNoteProvider; + else + { + _orderNoteProvider = (OrderNoteProvider)MarketplaceProviderManager.Providers["OrderNoteProvider"]; + return _orderNoteProvider; + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + private ITaxProvider _taxProvider; + public ITaxProvider TaxProvider + { + get + { + if (_taxProvider != null) + return _taxProvider; + else + { + _taxProvider = (ITaxProvider)MarketplaceProviderManager.Providers["TaxProvider"]; + return _taxProvider; + } + } + } + + #endregion + + + private BasePage prnt; + + + + protected void Page_Load(object sender, EventArgs e) + { + prnt = (BasePage)this.Page; + HtmlHead head = (HtmlHead)base.Page.Header; + HtmlLink link = new HtmlLink(); + + link.Attributes.Add("href", GlobalSettings.Path + "/dashboard/deli/css/deliadmin.css?v2"); + link.Attributes.Add("type", "text/css"); + link.Attributes.Add("rel", "stylesheet"); + head.Controls.Add(link); + } + + protected void RowCommand(object s, CommandEventArgs e) + { + switch (e.CommandName) + { + case "ValidateVat": + var but = (Button)s; + var lit = (Literal)but.Parent.FindControl("IsValid"); + + if (!string.IsNullOrEmpty((string)e.CommandArgument)) + { + var valid = TaxProvider.SimpleVatValidate((string)e.CommandArgument); + lit.Text = valid ? "VALID" : + "INVALID"; + } + else + { + lit.Text = "INVALID"; + } + break; + default: + break; + } + + } + + + protected void GetOrdersButton_Click(object sender, EventArgs e) + { + OrderView.ItemDataBound += new RepeaterItemEventHandler(OrderList_ItemDataBound); + + DateTime endDate = DateTime.Now.AddDays(int.Parse(DateRangeDdl.SelectedValue) * (-1)); + var Orders = OrderProvider.GetOrdersByDate(endDate).Select(x => new + { + Id = x.Id, + EconomicId = x.OrderId, + Status = x.Status, + CssClass = x.Status == OrderStatus.Confirmed ? "confirmed" : "notConfirmed", + Company = x.CompanyName, + VatID = x.Member.CompanyVATNumber, + InvoiceEmail = x.CompanyInvoiceEmail, + Country = GetCountryFromCode(x.CompanyCountry), + Date = x.CreateDate, + TaxTotal = x.TaxTotal.ToString("c", new CultureInfo("fr-FR", false)), + SubTotal = x.SubTotal.ToString("c", new CultureInfo("fr-FR", false)), + Total = x.Total.ToString("c", new CultureInfo("fr-FR", false)), + Currency = x.Currency, + Refunded = x.IsRefunded, + RefundDate = x.RefundDate + }).OrderByDescending(x => x.Id); + + OrderView.DataSource = Orders; + OrderView.DataBind(); + } + + protected void OrderList_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + RepeaterItem ri = (RepeaterItem)e.Item; + if (ri.ItemType == ListItemType.Item || ri.ItemType == ListItemType.AlternatingItem) + { + Repeater itemRepeater = ((RepeaterItem)e.Item).FindControl("orderItemRepeater") as Repeater; + int rowId = Int32.Parse((((RepeaterItem)e.Item).FindControl("rowId") as HiddenField).Value); + + var orderItems = ItemProvider.GetOrderItems(rowId).Select(x => new + { + Quantity = x.Quantity, + Package = ListingProvider.GetListing(x.ListingItemId, true).Name, + Vendor = new Member(ListingProvider.GetListing(x.ListingItemId, true).VendorId).Text, + LicenseTypeName = LicenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Value = x.NetPrice.ToString("c", new CultureInfo("fr-FR", false)), + + }); + + itemRepeater.DataSource = orderItems; + itemRepeater.DataBind(); + } + + } + + + private string GetCountryFromCode(string code){ + + string country = ""; + foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.SpecificCultures)) + { + + RegionInfo ri = new RegionInfo(ci.LCID); + if(ri.TwoLetterISORegionName.ToLowerInvariant() == code.ToLowerInvariant()){ + country = ri.EnglishName; + break; + } + } + return country; + } + } +} + + diff --git a/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.designer.cs b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.designer.cs new file mode 100644 index 00000000..6bd6d074 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/OrderReview.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Admin { + + + public partial class OrderReview { + + /// + /// DateRangeDdl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList DateRangeDdl; + + /// + /// GetOrdersButton control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button GetOrdersButton; + + /// + /// OrderView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater OrderView; + } +} diff --git a/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx new file mode 100644 index 00000000..f30de6fd --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx @@ -0,0 +1,39 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProcessRefund.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Admin.ProcessRefund" %> + +

Process Refund

+

+Order Id: +  +

+

Order Review

+

+ +

+ +

Select an Order item to Refund (also revokes the member license)

+

+ + +

+ +

Order Notes

+

+ + + <%# Eval("OrderNote") %> - <%# Eval("OrderNoteDate").ToString() %> +
+ + +

+

+ +  +

+

+ Note:  This only processes the Deli refund, please also process via + PayPal and E-conomic Credit Note

+

+  

+ diff --git a/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.cs b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.cs new file mode 100644 index 00000000..ec73c892 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.cs @@ -0,0 +1,196 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Providers.Orders; +using Marketplace.Interfaces; +using Marketplace.Providers.Listing; +using Marketplace.Providers; +using Marketplace.Providers.OrderNote; +using System.Data; +using Marketplace.Providers.OrderItem; + +namespace Marketplace.usercontrols.Deli.Admin +{ + public partial class ProcessRefund : System.Web.UI.UserControl + { + + #region properties + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + public IOrder Order; + + private IDeliOrderItemProvider _itemProvider; + public IDeliOrderItemProvider ItemProvider + { + get + { + if (_itemProvider != null) + return _itemProvider; + else + { + _itemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + return _itemProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + private IMemberLicenseProvider _memberLicenseProvider; + public IMemberLicenseProvider MemberLicenseProvider + { + get + { + if (_memberLicenseProvider != null) + return _memberLicenseProvider; + else + { + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["memberLicenseProvider"]; + return _memberLicenseProvider; + } + } + } + + private OrderNoteProvider _orderNoteProvider; + public OrderNoteProvider OrderNoteProvider + { + get + { + if (_orderNoteProvider != null) + return _orderNoteProvider; + else + { + _orderNoteProvider = (OrderNoteProvider)MarketplaceProviderManager.Providers["OrderNoteProvider"]; + return _orderNoteProvider; + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + #endregion + + protected void GetOrderButton_Click(object sender, EventArgs e) + { + int oId = 0; + + if (int.TryParse(OrderId.Text, out oId)) + oId = int.Parse(OrderId.Text); + + if (oId > 0) + { + Order = OrderProvider.GetOrder(oId); + + OrderReviewDisplay.Text = Order.Member.Name + ", Paid on: " + Order.PaymentDate.ToString() + " Amount Paid: " + Order.ProcessedTotal.ToString() + " in Currency: " + Order.Currency.ToString() + ", Order Status: " + Order.Status.ToString(); + + DataTable dt = new DataTable(); + dt.Columns.Add("id"); + dt.Columns.Add("item"); + + foreach (IOrderItem i in Order.Items) + { + string itemText = ListingProvider.GetListing(i.ListingItemId).Name + + ", License Type: " + LicenseProvider.GetLicense(i.LicenseId).LicenseType.ToString() + + ", Quantity: " + i.Quantity.ToString() + + ", Net Price: " + i.NetPrice.ToString() + " EUR, each"; + + dt.Rows.Add(i.Id, itemText); + } + + OrderItems.DataSource = dt; + OrderItems.DataTextField = "item"; + OrderItems.DataValueField = "id"; + OrderItems.DataBind(); + + // order notes + IEnumerable Notes = OrderNoteProvider.GetOrderNotes(oId); + OrderNotesRepeater.DataSource = Notes; + OrderNotesRepeater.DataBind(); + + } + else + OrderReviewDisplay.Text = "No order with the Id: " + oId.ToString(); + + } + + protected void ProcessRefundButton_Click(object sender, EventArgs e) + { + int oId = 0; + if (int.TryParse(OrderId.Text, out oId)) + oId = int.Parse(OrderId.Text); + + if (oId > 0) + Order = OrderProvider.GetOrder(oId); + + // mark order as refunded + Order.Status = OrderStatus.Refunded; + Order.IsRefunded = true; + Order.RefundDate = DateTime.Now.ToUniversalTime(); + OrderProvider.SaveOrUpdate(Order); + + // mark item as refunded + IOrderItem item = ItemProvider.GetOrderItem(int.Parse(OrderItems.SelectedValue)); + item.IsRefunded = true; + item.RefundDate = DateTime.Now.ToUniversalTime(); + ItemProvider.SaveOrUpdate(item); + + // revoke member license + var licenses = MemberLicenseProvider.GetLicensesByOrderItemId(item.Id); + foreach (var license in licenses) + { + license.IsActive = false; + MemberLicenseProvider.SaveOrUpdate(license); + } + + // add order note + OrderNoteProvider.AddOrderNote((int)Order.Id, (int)Order.Member.Id, "Refund processed for item: " + item.Id.ToString()); + + RefundConfirmation.Text = "Refund processed and license revoked."; + } + + + } + } \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.designer.cs b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.designer.cs new file mode 100644 index 00000000..46a50eff --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/ProcessRefund.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Admin { + + + public partial class ProcessRefund { + + /// + /// OrderId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox OrderId; + + /// + /// GetOrderButton control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button GetOrderButton; + + /// + /// OrderReviewDisplay control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal OrderReviewDisplay; + + /// + /// OrderItems control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RadioButtonList OrderItems; + + /// + /// OrderNotesRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater OrderNotesRepeater; + + /// + /// ProcessRefundButton control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button ProcessRefundButton; + + /// + /// RefundConfirmation control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RefundConfirmation; + } +} diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx new file mode 100644 index 00000000..9f6bfe9c --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx @@ -0,0 +1,54 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorPayout.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Admin.VendorPayout" %> +

Vendor Payout

+ + + + + +

Period ending

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Vendor NameEconomid IdVendor RefNet PayoutPayout Date
+ + + + + <%#Eval("VendorRef").ToString() %> + + + + <%#Eval("PayoutDate").ToString()%> +
+ + +

+ + + + diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.cs b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.cs new file mode 100644 index 00000000..be6cc65e --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.cs @@ -0,0 +1,209 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Data; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.Security; + +using Marketplace.Providers.Orders; +using Marketplace.Interfaces; +using Marketplace.Providers.Listing; +using Marketplace.Providers; +using Marketplace.Providers.OrderNote; +using Marketplace.Providers.OrderItem; +using Marketplace.Providers.Vendor; +using Marketplace.Providers.Payout; +using umbraco.cms.businesslogic.member; + +namespace Marketplace.usercontrols.Deli.Admin +{ + public partial class VendorPayout : System.Web.UI.UserControl + { + #region properties + + public IEnumerable PayoutList; + public IEnumerable Payouts; + + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + private IDeliOrderItemProvider _itemProvider; + public IDeliOrderItemProvider ItemProvider + { + get + { + if (_itemProvider != null) + return _itemProvider; + else + { + _itemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + return _itemProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + private IMemberLicenseProvider _memberLicenseProvider; + public IMemberLicenseProvider MemberLicenseProvider + { + get + { + if (_memberLicenseProvider != null) + return _memberLicenseProvider; + else + { + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["memberLicenseProvider"]; + return _memberLicenseProvider; + } + } + } + + private OrderNoteProvider _orderNoteProvider; + public OrderNoteProvider OrderNoteProvider + { + get + { + if (_orderNoteProvider != null) + return _orderNoteProvider; + else + { + _orderNoteProvider = (OrderNoteProvider)MarketplaceProviderManager.Providers["OrderNoteProvider"]; + return _orderNoteProvider; + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + private MemberVendorProvider _vendorProvider; + public MemberVendorProvider VendorProvider + { + get + { + if (_vendorProvider != null) + return _vendorProvider; + else + { + _vendorProvider = (MemberVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + return _vendorProvider; + } + } + } + + private PayoutProvider _payoutProvider; + public PayoutProvider PayoutProvider + { + get + { + if (_payoutProvider != null) + return _payoutProvider; + else + { + _payoutProvider = (PayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + return _payoutProvider; + } + } + } + + #endregion + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + PayoutReport.ItemDataBound += new RepeaterItemEventHandler(PayoutReport_ItemDataBound); + } + + void PayoutReport_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + // The data for this item in the repeatercontrol + dynamic item = e.Item.DataItem as dynamic; + + if (e.Item.ItemType.ToString() != "Header" && e.Item.ItemType.ToString() != "Footer") + { + Literal VendorName = (Literal)e.Item.FindControl("VendorName"); + Literal EconomicId = (Literal)e.Item.FindControl("EconomicId"); + Literal NetPayout = (Literal)e.Item.FindControl("NetPayout"); + double payoutAmount = 0; + + VendorName.Text = VendorProvider.GetVendorById(item.VendorId).VendorCompanyName; + EconomicId.Text = VendorProvider.GetVendorById(item.VendorId).EconomicId.ToString(); + foreach (IOrderItem i in item.OrderItems) + { + payoutAmount += (i.NetPrice * .75); + } + + NetPayout.Text = payoutAmount.ToString(); + + } + } + + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void GetPayoutButton_Click(object sender, EventArgs e) + { + // get last day of previous month + var last = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1).AddDays(-1); + + Payouts = PayoutProvider.GetPayouts(null, true); + PayoutReport.DataSource = Payouts; + PayoutReport.DataBind(); + + EndDate.Text = last.ToLongDateString(); + + // show details + PayoutPlaceholder.Visible = true; + + } + + protected void MarkAsPaidButton_Click(object sender, EventArgs e) + { + //PayoutProvider.MarkItemsPaid(int.Parse(PayoutId.Text)); + } + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.designer.cs b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.designer.cs new file mode 100644 index 00000000..deb8e3fd --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayout.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Admin { + + + public partial class VendorPayout { + + /// + /// GetPayoutButton control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button GetPayoutButton; + + /// + /// PayoutPlaceholder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PayoutPlaceholder; + + /// + /// EndDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal EndDate; + + /// + /// PayoutReport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater PayoutReport; + + /// + /// MarkAsPaid control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MarkAsPaid; + } +} diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx new file mode 100644 index 00000000..4def7ac4 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx @@ -0,0 +1,121 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorPayoutReport.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Admin.VendorPayoutReport" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +

Payout Report

+

The following list shows all payouts and their status

+ + + + + + + + + + + + + + + + + + + + + + + + + +"> + + + + +
Vendor NameEconomid IdVendor RefDateStatusValue
+ +">[+]  +<%# ((IVendor)Eval("Vendor")).Member.Name%> + +<%# ((IVendor)Eval("Vendor")).EconomicId%> + +<%# Eval("Reference")%> + +<%# Eval("PayoutDate")%> + +<%# Eval("Status")%> + +<%# Eval("PayoutAmount")%> +
+

Payout details

+

Company Name: <%# ((IVendor)Eval("Vendor")).VendorCompanyName %>

+

Billing Email: <%# ((IVendor)Eval("Vendor")).BillingContactEmail %>

+

VAT: <%# ((IVendor)Eval("Vendor")).VATNumber%>

+

Tax ID: <%# ((IVendor)Eval("Vendor")).TaxId%>

+

Paypal: <%# ((IVendor)Eval("Vendor")).PayPalAccount%>

+

IBAN: <%# ((IVendor)Eval("Vendor")).IBAN%>

+

SWIFT: <%# ((IVendor)Eval("Vendor")).SWIFT%>

+

BSB: <%# ((IVendor)Eval("Vendor")).BSB%>

+

Account Number: <%# ((IVendor)Eval("Vendor")).AccountNumber %>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageLicensePurchaserCountryVAT #Order DatePayout Value*
<%# Eval("Package")%><%# Eval("LicenseTypeName")%>"><%# ((IMember)Eval("Member")).Name%><%# ((IMember)Eval("Member")).CompanyCountry%><%# ((IMember)Eval("Member")).CompanyVATNumber%><%# Eval("OrderDate")%><%# Eval("PayoutAmount")%>
+ + + +
+

Process this Payment Request

+

Once you have processed this payment request please click the following button.

+ +
+ +
+ + + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.cs b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.cs new file mode 100644 index 00000000..182d3a7d --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using System.Configuration; +using umbraco; +using System.Web.UI.HtmlControls; +using umbraco.BasePages; + +namespace Marketplace.usercontrols.Deli.Admin +{ + public partial class VendorPayoutReport : System.Web.UI.UserControl + { + + private IDeliOrderItemProvider _orderItemProvider; + private IOrderProvider _orderProvider; + private IMemberProvider _memberProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private ILicenseProvider _licenseProvider; + private IPayoutProvider _payoutProvider; + private BasePage prnt; + + + + protected void Page_Load(object sender, EventArgs e) + { + prnt = (BasePage)this.Page; + HtmlHead head = (HtmlHead)base.Page.Header; + HtmlLink link = new HtmlLink(); + + link.Attributes.Add("href", GlobalSettings.Path + "/dashboard/deli/css/deliadmin.css?v2"); + link.Attributes.Add("type", "text/css"); + link.Attributes.Add("rel", "stylesheet"); + head.Controls.Add(link); + } + + + protected void LoadReport(object sender, EventArgs e) + { + BindListing(true); + } + + protected void LoadProcessedReport(object sender, EventArgs e) + { + BindListing(false); + } + + private void BindListing(bool pending) + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + _payoutProvider = (IPayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + + + PayoutHistoryList.ItemDataBound += new RepeaterItemEventHandler(PayoutHistoryList_ItemDataBound); + + var payouts = _payoutProvider.GetPayouts(null, true, pending).OrderByDescending(x => x.PayoutDate).Select(x => new + { + Id = x.Id, + Vendor = _vendorProvider.GetVendorById(x.VendorId), + PayoutDate = String.Format("{0:D}",x.PayoutDate), + Reference = x.VendorRef, + PayoutAmount = GetPayoutValue(x.OrderItems), + Status = (x.Processed)?"Processed":"Pending" + }); + + PayoutHistoryList.DataSource = payouts; + PayoutHistoryList.DataBind(); + } + + protected void PayoutHistoryList_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + RepeaterItem ri = (RepeaterItem)e.Item; + if (ri.ItemType == ListItemType.Item || ri.ItemType == ListItemType.AlternatingItem) + { + Repeater itemRepeater = ((RepeaterItem)e.Item).FindControl("payoutItemRepeater") as Repeater; + int rowId = Int32.Parse((((RepeaterItem)e.Item).FindControl("rowId") as HiddenField).Value); + + var payout = _payoutProvider.GetPayout(rowId); + + // bind the table to any order that has not been paid out and does not have a payout id + var items = payout.OrderItems + .Select(x => new + { + Id = x.Id, + Package = _listingProvider.GetListing(x.ListingItemId, true).Name, + LicenseTypeName = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Member = _orderProvider.GetOrder(x.OrderId).Member, + PayoutAmount = x.PayoutAmount, + OrderDate = string.Format("{0:D}", x.CreateDate) + }); + + itemRepeater.DataSource = items; + itemRepeater.DataBind(); + } + + } + + protected void processPayoutRow(Object sender, RepeaterCommandEventArgs e) + { + + switch (e.CommandName) + { + case "Payout": + var payoutId = Int32.Parse(e.CommandArgument.ToString()); + + _payoutProvider = (IPayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + _payoutProvider.MarkItemsPaid(payoutId); + + break; + default: + break; + } + + BindListing(true); + + } + + + private double GetPayoutValue(IEnumerable items) + { + double val = 0.00; + foreach (var i in items) + { + val += i.PayoutAmount; + } + + return val; + } + + + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.designer.cs b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.designer.cs new file mode 100644 index 00000000..25053946 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Admin/VendorPayoutReport.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Admin { + + + public partial class VendorPayoutReport { + + /// + /// PayoutHistoryList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater PayoutHistoryList; + } +} diff --git a/Marketplace/usercontrols/Deli/Cart/Cart.ascx b/Marketplace/usercontrols/Deli/Cart/Cart.ascx new file mode 100644 index 00000000..af5d74ea --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/Cart.ascx @@ -0,0 +1,72 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Cart.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Cart.Cart" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductLicense TypePriceQuantitySub-Total
<%#Eval("Name") %><%#Eval("License") %> + + +
Total:
+ + + +
+ + +
+   + +
+
+ + + +
+

Your cart is currently empty

+
+ + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/Cart.ascx.cs b/Marketplace/usercontrols/Deli/Cart/Cart.ascx.cs new file mode 100644 index 00000000..c4169154 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/Cart.ascx.cs @@ -0,0 +1,186 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Accounting; +using Marketplace.Helpers; + +namespace Marketplace.usercontrols.Deli.Cart +{ + public partial class Cart : System.Web.UI.UserControl + { + + #region properties + private ICartProvider _cartProvider; + public ICartProvider CartProvider + { + get + { + if (_cartProvider != null) + { + return _cartProvider; + } + else + { + _cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + return _cartProvider; + } + } + } + + + private ICart _cart; + public ICart ShoppingCart + { + get + { + if (_cart != null) + { + return _cart; + } + else + { + _cart = CartProvider.GetCurrentCart(); + return _cart; + } + } + set + { + _cart = value; + } + } + + private Currency _currency = Currency.EUR; + #endregion + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + CartItems.ItemDataBound += new RepeaterItemEventHandler(CartItems_ItemDataBound); + CartItems.ItemCommand +=new RepeaterCommandEventHandler(CartItems_ItemCommand); + } + + protected void Page_PreRender(object sender, EventArgs e) + { + + if (ShoppingCart != null && ShoppingCart.CartItems.Count > 0) + { + LoadCart(); + + } + else + { + CartHolder.Visible = false; + CartEmptyHolder.Visible = true; + } + + } + + private void LoadCart() + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + // use cart currency + _currency = ShoppingCart.Currency; + + //to enusre the cart rounds and adds properly we convert to localised price when its doing the subtotal step. + var cartItems = CartProvider.GetCartItems().Select(x => new { + Id = x.LicenseId, + Name = x.ListingItem.Name, + License = licenseProvider.GetLicense(x.LicenseId).LicenseType.LicenseTypeAsString(), + Price = _cartProvider.GetLocalizedPrice(x.NetPrice), + Quantity = x.Quantity, + SubTotal = x.Quantity * _cartProvider.GetLocalizedPrice(x.NetPrice) + + }); + + CartItems.DataSource = cartItems; + CartItems.DataBind(); + + + CartTotal.Text = DeliCurrency.NiceMoney((decimal)_cartProvider.GetLocalizedCartGrossValue(), DeliCurrency.FromSymbol(_currency.ToString())); + + } + + protected void QuantityOnChange(object sender, EventArgs e) + { + string licenseId = ((HiddenField)((TextBox)sender).Parent.FindControl("LicenseId")).Value; + TextBox qtyBox = (TextBox)sender; + int qty = 0; + if (!string.IsNullOrEmpty(qtyBox.Text)) + { + qty = int.Parse(qtyBox.Text); + } + + var ci = CartProvider.GetCartItems().Where(x => x.LicenseId == Int32.Parse(licenseId)).FirstOrDefault(); + if (ci != null) + { + CartProvider.ChangeItemQuantity(ci, qty); + } + + + } + + void CartItems_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + // The data for this item in the repeatercontrol + dynamic item = e.Item.DataItem as dynamic; + + if (e.Item.ItemType.ToString() != "Header" && e.Item.ItemType.ToString() != "Footer") + { + Button btnDel = (Button)e.Item.FindControl("Del"); + + // Assign ids of items to the buttons + btnDel.CommandName = "delItem"; + btnDel.CommandArgument = item.Id.ToString(); + + // set the price and subtotal amounts + Literal price = (Literal)e.Item.FindControl("price"); + Literal subtotal = (Literal)e.Item.FindControl("subtotal"); + + price.Text = DeliCurrency.NiceMoney((decimal)item.Price, DeliCurrency.FromSymbol(_currency.ToString())); + + //no need to localize the price for the subtotal as this is done during the datasource creation + subtotal.Text = DeliCurrency.NiceMoney((decimal)item.SubTotal,DeliCurrency.FromSymbol(_currency.ToString())); + + } + } + + void CartItems_ItemCommand(object source, RepeaterCommandEventArgs e) + { + string licenseId = e.CommandArgument.ToString(); + + switch (e.CommandName) + { + case "delItem": + { + var ci = CartProvider.GetCartItems().Where(x => x.LicenseId == Int32.Parse((string)e.CommandArgument)).FirstOrDefault(); + if (ci != null) + { + CartProvider.RemoveItem(ci); + } + break; + } + } + } + + protected void CartNavNext_Click(object s, EventArgs e) + { + Response.Redirect("cart-details"); + } + + protected void CartNavPrevious_Click(object s, EventArgs e) + { + if (!string.IsNullOrEmpty(Request["returnUrl"])) + Response.Redirect(Request["returnUrl"]); + else + Response.Redirect("/projects"); + + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/Cart.ascx.designer.cs b/Marketplace/usercontrols/Deli/Cart/Cart.ascx.designer.cs new file mode 100644 index 00000000..00d87193 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/Cart.ascx.designer.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Cart { + + + public partial class Cart { + + /// + /// CartHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CartHolder; + + /// + /// CartItems control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater CartItems; + + /// + /// CartTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal CartTotal; + + /// + /// CartNavPrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton CartNavPrevious; + + /// + /// CartNavNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button CartNavNext; + + /// + /// CartEmptyHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CartEmptyHolder; + } +} diff --git a/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx new file mode 100644 index 00000000..63de7454 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx @@ -0,0 +1,136 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="CartDetails.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Cart.CartDetails" %> +<%@ Register Assembly="Marketplace" TagPrefix="Deli" Namespace="Marketplace.Controls" %> +<%@ Register Src="~/usercontrols/our.umbraco.org/Login_novalidationscript.ascx" TagName="Login" TagPrefix="our" %> + + + +
+

Continue without logging in

+

You can complete your purchase now, we'll create an account for you and email you a temporary password when you're done.

+

Or if you are an existing member login here

+

Your profile probably already has most of the information we need to process your purchase. Login to retrieve your details.

+
+
+

Can't remember your password? You can retrieve a new one by clicking here

+
+
+ + + + + + + + + +
+
+User Information +

+ Name + +

+

+Email + +

+

+Confirm Email + +

+ +
+
+ +Company Details and Invoicing +

+Company Name + +

+

+Address + +

+

+Country + +

+

+Phone + +

+

+VAT-Number + +

+

+Invoice Email + +

+ + + + +
+   + +
+ +
+
+ + + + + + diff --git a/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.cs b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.cs new file mode 100644 index 00000000..8e28bc28 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.cs @@ -0,0 +1,300 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using umbraco.cms.businesslogic.member; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Orders; +using Marketplace.Providers.Members; +using Marketplace.Providers.OrderItem; +using System.Web.Security; +using NotificationsCore; +using NotificationsWeb; +using umbraco.NodeFactory; + +namespace Marketplace.usercontrols.Deli.Cart +{ + public partial class CartDetails : System.Web.UI.UserControl + { + private ICartProvider _cartProvider; + public ICartProvider CartProvider + { + get + { + if (_cartProvider != null) + { + return _cartProvider; + } + else + { + _cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + return _cartProvider; + } + } + } + + private ICart _cart; + public ICart ShoppingCart + { + get + { + if (_cart != null) + { + return _cart; + } + else + { + _cart = CartProvider.GetCurrentCart(); + return _cart; + } + } + set + { + _cart = value; + } + } + + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + private IMember _member; + public IMember Member + { + get + { + if (_member != null) + return _member; + else + { + _member = MemberProvider.GetCurrentMember(); + return _member; + } + } + } + + public int RetrievePassword { get; set; } + public int SignUp { get; set; } + + protected string RetrievePasswordPage { get; set; } + protected string SignUpPage { get; set; } + + protected void Page_Load(object sender, EventArgs e) + { + if(ShoppingCart.CartItems.Count > 0) + { + if (!IsPostBack && Member != null) + { + //check to see if member was created during cart process and move them to review step automatically + if (!string.IsNullOrEmpty(Request["ss"])) + { + + //now that the user is authenticated set their cart currency based on their details + SetCurrency(); + + CartProvider.InvalidateVat(); + // send to order review + Response.Redirect("cart-review"); + } + + //otherwise show the form + SetupDetails(); + } + } + else + { + Response.Redirect("cart"); + } + + //check if the user is authenticated, otherwise present login option or continue as 'guest' + // can we just use... if(Member == null) for this + if (!HttpContext.Current.User.Identity.IsAuthenticated) + { + RetrievePasswordPage = umbraco.library.NiceUrl(RetrievePassword); + SignUpPage = umbraco.library.NiceUrl(SignUp); + MemberLogin.NextPage = Node.GetCurrent().Id; + NotLoggedIn.Visible = true; + } + + } + + + + protected void SetupDetails() + { + UserName.Text = Member.Name; + UserEmail.Text = Member.Email; + CompanyVat.Text = Member.CompanyVATNumber; + CompanyName.Text = Member.Company; + CompanyCountry.SelectedValue = Member.CompanyCountry; + CompanyAddress.Text = Member.CompanyAddress; + CompanyInvoiceEmail.Text = Member.CompanyInvoiceEmail; + } + + protected void CreateMember() + { + string Group = "standard"; + + if (UserEmail.Text != null) + { + IMember m = MemberProvider.GetMemberByEmail(UserEmail.Text); + if (m == null) + { + + m = new DeliMember(); + + m.Name = UserName.Text; + m.Email = UserEmail.Text; + // set using generate password + m.Password = Membership.GeneratePassword(8, 0); + + + //billing info + m.CompanyAddress = CompanyAddress.Text; + m.CompanyCountry = CompanyCountry.SelectedValue; + + if (CompanyInvoiceEmail.Text.Length != 0) + m.CompanyInvoiceEmail = CompanyInvoiceEmail.Text; + else + m.CompanyInvoiceEmail = UserEmail.Text; + + m.CompanyVATNumber = CompanyVat.Text; + + //Standard values + m.ReputationTotal = 20; + m.ReputationCurrent = 20; + m.ForumPosts = 0; + + m.IsVerified = true; + m.TermsOfServiceAcceptanceDate = DateTime.Now.ToUniversalTime(); + m.CreatedByDeli = true; + + //add the group + m.Groups = new string[] { Group }; + + MemberProvider.SaveOrUpdate(m); + + // send welcome mail - have to do it here so we have access to the password + InstantNotification not = new InstantNotification(); + not.Invoke(Config.ConfigurationFile, Config.AssemblyDir, "DeliNewMember", m, m.Password); + + // redirect to force Auth cookie to establish + Response.Redirect(Request.RawUrl + "?ss=" + Guid.NewGuid().ToString()); + + } + } + } + + private void SetCurrency() + { + if (Member.CompanyCountry.ToLower() != null) + { + + switch (Member.CompanyCountry) + { + case "dk": + CartProvider.SetCurrency(Currency.DKK); + break; + + case "us": + case "ca": + CartProvider.SetCurrency(Currency.USD); + break; + + default: + CartProvider.SetCurrency(Currency.EUR); + break; + } + } + } + + protected void CartNavNext_Click(object s, EventArgs e) + { + try + { + // create new member if not logged in + if (Member == null) + { + CreateMember(); + } + // persist details to member + Member.Company = CompanyName.Text; + Member.CompanyVATNumber = CompanyVat.Text; + Member.CompanyCountry = CompanyCountry.SelectedValue; + Member.CompanyAddress = CompanyAddress.Text; + + if (CompanyInvoiceEmail.Text.Length != 0) + Member.CompanyInvoiceEmail = CompanyInvoiceEmail.Text; + else + Member.CompanyInvoiceEmail = UserEmail.Text; + + /* + * if the member changes the billing country during the order we need to update their profile billing details and change + * currency where applicable + */ + SetCurrency(); + + MemberProvider.SaveOrUpdate(Member); + + //invalidate the Vat Number to force recheck; + CartProvider.InvalidateVat(); + + // send to order review + Response.Redirect("cart-review"); + + } + catch (Exception ex) + { + // put up error and apologize + DeliMessage.Text = "Oops! Sorry, little help here:
" + ex.Message + "
" + ex.InnerException + "
" + ex.StackTrace + "
"; + } + } + + protected void CartNavPrevious_Click(object s, EventArgs e) + { + try + { + // persist details to member + Member.Company = CompanyName.Text; + Member.CompanyVATNumber = CompanyVat.Text; + + //invalidate the Vat Number to force recheck; + CartProvider.InvalidateVat(); + + Member.CompanyCountry = CompanyCountry.SelectedValue; + Member.CompanyAddress = CompanyAddress.Text; + + if (CompanyInvoiceEmail.Text.Length != 0) + Member.CompanyInvoiceEmail = CompanyInvoiceEmail.Text; + else + Member.CompanyInvoiceEmail = UserEmail.Text; + + MemberProvider.SaveOrUpdate(Member); + + // send to order review + Response.Redirect("cart"); + + } + catch (Exception ex) + { + // put up error and apologize + DeliMessage.Text = "Oops! Sorry, little help here:
" + ex.Message + "
" + ex.InnerException + "
" + ex.StackTrace + "
"; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.designer.cs b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.designer.cs new file mode 100644 index 00000000..5b534ca0 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartDetails.ascx.designer.cs @@ -0,0 +1,150 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Cart { + + + public partial class CartDetails { + + /// + /// NotLoggedIn control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NotLoggedIn; + + /// + /// MemberLogin control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.usercontrols.ourUmbraco.Login_novalidationscript MemberLogin; + + /// + /// DetailsForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DetailsForm; + + /// + /// UserName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox UserName; + + /// + /// UserEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox UserEmail; + + /// + /// UserConfirmEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox UserConfirmEmail; + + /// + /// CompanyName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CompanyName; + + /// + /// CompanyAddress control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CompanyAddress; + + /// + /// CompanyCountry control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.Controls.CountryDropDownList CompanyCountry; + + /// + /// CompanyPhone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CompanyPhone; + + /// + /// CompanyVat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CompanyVat; + + /// + /// CompanyInvoiceEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CompanyInvoiceEmail; + + /// + /// CartNavPrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton CartNavPrevious; + + /// + /// CartNavNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button CartNavNext; + + /// + /// DeliMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal DeliMessage; + } +} diff --git a/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx new file mode 100644 index 00000000..dbf7b5f7 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx @@ -0,0 +1,10 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="CartProgress.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Cart.CartProgress" %> +
+
    + + +
  • "><%# Eval("StepName") %>
    • +     +     +
+
\ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.cs b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.cs new file mode 100644 index 00000000..75c23462 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace Marketplace.usercontrols.Deli.Cart +{ + public partial class CartProgress : System.Web.UI.UserControl + { + public int CurrentStepIndex { get; set; } + + private string[] stepArray; + + protected void Page_Load(object sender, EventArgs e) + { + stepArray = new string[] { "Your Cart", "Your Details", "Review Your Order", "Checkout", "Order Complete" }; + var steps = stepArray.Select(x => new + { + StepName = x, + StepClass = GetStepClass(x) + }); + + ProgressIndicator.DataSource = steps; + ProgressIndicator.DataBind(); + } + + private object GetStepClass(string x) + { + var index = stepArray.ToList().IndexOf(x); + var cssClass = ""; + if (index == 0) + { + cssClass += "first "; + } + if (index < CurrentStepIndex) + { + cssClass += "complete"; + } + if (index == CurrentStepIndex) + { + cssClass += "current"; + } + return cssClass; + } + } + +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.designer.cs b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.designer.cs new file mode 100644 index 00000000..81aecf80 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartProgress.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Cart { + + + public partial class CartProgress { + + /// + /// ProgressIndicator control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProgressIndicator; + } +} diff --git a/Marketplace/usercontrols/Deli/Cart/CartReview.ascx b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx new file mode 100644 index 00000000..209d9339 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx @@ -0,0 +1,86 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="CartReview.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Cart.CartReview" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductLicense TypePriceQuantitySubTotal
<%#Eval("Name") %><%#Eval("License") %> + +
Tax:
Total:
+ + +
+

VAT Code not specified or is invalid or cannot be validated at this time

+

From what you have told us you live in a country that is subject to European VAT, but from what we can tell you either have not specifed a VAT code or the one you have given us is invalid.

+

If you dont have a VAT code or you can't put your hands on it right now, dont worry you can still continue with your purchase but we had to add VAT to your order.

+

If you would like to go back and give us a VAT code .

+
+ + + +
+Your Information + + +

+

Company:

+

+ +

VAT Details:

+

+ +

Invoice Email:

+

+ + +
+   + +
+
+ + + +
+

Your cart is currently empty

+
+ + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.cs b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.cs new file mode 100644 index 00000000..01f5da68 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.cs @@ -0,0 +1,241 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Helpers; +using Marketplace.Providers.Orders; +using Marketplace.Providers.Accounting; +using Marketplace.Controls; +using System.Globalization; + +namespace Marketplace.usercontrols.Deli.Cart +{ + public partial class CartReview : System.Web.UI.UserControl + { + private ICartProvider _cartProvider; + public ICartProvider CartProvider + { + get + { + if (_cartProvider != null) + { + return _cartProvider; + } + else + { + _cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + return _cartProvider; + } + } + } + + private ICart _cart; + public ICart ShoppingCart + { + get + { + if (_cart != null) + { + return _cart; + } + else + { + _cart = CartProvider.GetCurrentCart(); + return _cart; + } + } + set + { + _cart = value; + } + } + + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + private IMember _member; + public IMember Member + { + get + { + if (_member != null) + return _member; + else + { + _member = MemberProvider.GetCurrentMember(); + return _member; + } + } + } + + public Currency _currency = Currency.EUR; + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + CartItems.ItemDataBound += new RepeaterItemEventHandler(CartItems_ItemDataBound); + } + + void CartItems_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + // The data for this item in the repeatercontrol + dynamic item = e.Item.DataItem as dynamic; + + if (e.Item.ItemType.ToString() != "Header" && e.Item.ItemType.ToString() != "Footer") + { + // set the price and subtotal amounts + Literal price = (Literal)e.Item.FindControl("price"); + Literal subtotal = (Literal)e.Item.FindControl("subtotal"); + + price.Text = DeliCurrency.NiceMoney((decimal)item.Price, DeliCurrency.FromSymbol(_currency.ToString())); + subtotal.Text = DeliCurrency.NiceMoney((decimal)item.SubTotal, DeliCurrency.FromSymbol(_currency.ToString())); + + } + } + + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + if (ShoppingCart != null && ShoppingCart.CartItems.Count > 0) + { + LoadOrderInfo(); + LoadCart(); + + } + else + { + Response.Redirect("cart"); + } + } + + private void LoadOrderInfo() + { + if (Member != null) + { + var countryName = GetCountry(Member.CompanyCountry); + OrderMembername.Text = Member.Name; + OrderCompany.Text = Member.Company + "
" + Member.CompanyAddress + "
" + countryName; + OrderInvoiceEmail.Text = Member.CompanyInvoiceEmail; + OrderVATCode.Text = String.IsNullOrEmpty(Member.CompanyVATNumber) ? "NONE SPECIFIED" : Member.CompanyVATNumber; + } + else + { + Response.Redirect("cart"); + } + } + + private string GetCountry(string code) + { + + + foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.SpecificCultures)) + { + + RegionInfo ri = new RegionInfo(ci.LCID); + if (ri.TwoLetterISORegionName.ToLowerInvariant() == code) + return ri.EnglishName; + } + + return ""; + + } + + private void LoadCart() + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + _currency = ShoppingCart.Currency; + + var cartItems = CartProvider.GetCartItems().Select(x => new + { + Id = x.LicenseId, + Name = x.ListingItem.Name, + License = licenseProvider.GetLicense(x.LicenseId).LicenseType.LicenseTypeAsString(), + Price = GetLocalisedPrice(x.NetPrice), + Quantity = x.Quantity, + SubTotal = x.Quantity * GetLocalisedPrice(x.NetPrice) + + }); + + CartItems.DataSource = cartItems; + CartItems.DataBind(); + + // tax check and calcs + double cartValue = 0; + double taxValue = 0; + + var vatValid = CartProvider.IsVatValid(); + var vatCountry = CartProvider.IsVatCountry(); + + + taxValue = CartProvider.GetLocalizedTaxTotal(); + + cartValue = CartProvider.GetLocalizedCartNetValue(); + + + + CartTotal.Text = DeliCurrency.NiceMoney((decimal)cartValue, DeliCurrency.FromSymbol(_currency.ToString())); + + + // check to see if there is a tax value and if its a valid vat country + // it will always enter this if it is denmark. + if (taxValue > 0 && vatCountry) + { + //it will validate the vat for denmark also to display it. + if (!vatValid && Member.CompanyCountry.ToLower() != "dk") + { + VatBadMessage.Visible = true; + OrderVATCode.Text += " (NOT VALID)"; + } + + TaxRow.Visible = true; + TaxTotal.Text = DeliCurrency.NiceMoney((decimal)taxValue, DeliCurrency.FromSymbol(_currency.ToString())); + } + else + { + if (!vatCountry) + { + VATDetails.Visible = false; + } + + TaxRow.Visible = false; + } + + } + + private double GetLocalisedPrice(double p) + { + // do converison if not EUR + if (_currency != Currency.EUR) + return (double)DeliCurrency.ConvertFromEuro((decimal)p, DeliCurrency.FromSymbol(_currency.ToString())); + else + return p; + } + + protected void CartNavNext_Click(object s, EventArgs e) + { + Response.Redirect("cart-payment"); + } + protected void CartNavPrevious_Click(object s, EventArgs e) + { + Response.Redirect("cart"); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.designer.cs b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.designer.cs new file mode 100644 index 00000000..4de51258 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/CartReview.ascx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Cart { + + + public partial class CartReview { + + /// + /// CartHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CartHolder; + + /// + /// CartItems control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater CartItems; + + /// + /// TaxRow control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder TaxRow; + + /// + /// TaxTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal TaxTotal; + + /// + /// CartTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal CartTotal; + + /// + /// VatBadMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder VatBadMessage; + + /// + /// OrderMembername control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal OrderMembername; + + /// + /// OrderCompany control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal OrderCompany; + + /// + /// VATDetails control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder VATDetails; + + /// + /// OrderVATCode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal OrderVATCode; + + /// + /// OrderInvoiceEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal OrderInvoiceEmail; + + /// + /// CartNavPrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton CartNavPrevious; + + /// + /// CartNavNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button CartNavNext; + + /// + /// CartEmptyHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CartEmptyHolder; + } +} diff --git a/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx new file mode 100644 index 00000000..74a0f2cc --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MicroCart.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Cart.MicroCart" %> + +View Cart ()    + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.cs b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.cs new file mode 100644 index 00000000..f966dc67 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Accounting; + +namespace Marketplace.usercontrols.Deli.Cart +{ + public partial class MicroCart : System.Web.UI.UserControl + { + private int _numberOfItems = 0; + private double _cartTotal = 0; + private ICart cart; + private Currency _currency = Currency.EUR; + + + + protected void Page_PreRender(object sender, EventArgs e) + { + + var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + cart = cartProvider.GetCurrentCart(); + + _currency = cart.Currency; + + _numberOfItems = cartProvider.GetCartItemCount(); + + + this.Visible = true; + _cartTotal = cartProvider.GetLocalizedCartGrossValue(); + + + NumItems.Text = (_numberOfItems == 1) ? _numberOfItems + " Item" : _numberOfItems + " Items"; + CartTotal.Text = DeliCurrency.NiceMoney((decimal)_cartTotal, DeliCurrency.FromSymbol(_currency.ToString())); + + if (_numberOfItems > 0) + { + microCartHolder.Visible = true; + } + else + { + microCartHolder.Visible = false; + + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.designer.cs b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.designer.cs new file mode 100644 index 00000000..96ac8554 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Cart/MicroCart.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Cart { + + + public partial class MicroCart { + + /// + /// microCartHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder microCartHolder; + + /// + /// NumItems control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal NumItems; + + /// + /// CartTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal CartTotal; + } +} diff --git a/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx new file mode 100644 index 00000000..5fd1d0a1 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx @@ -0,0 +1,39 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorCustomers.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Customers.VendorCustomers" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +

Your Customers

+

The following is a list of customers who purchased your products.

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageLicensePurchaserEmailCountryOrder Date
<%# (Container.ItemIndex + 1) %><%# Eval("Package") %><%# Eval("LicenseTypeName") %><%# ((IMember)Eval("Member")).Name %><%# ((IMember)Eval("Member")).Email %><%# ((IMember)Eval("Member")).CompanyCountry %><%# Eval("OrderDate") %>
+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.cs b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.cs new file mode 100644 index 00000000..44c2b1e0 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using NotificationsCore; +using System.Data; + +namespace Marketplace.usercontrols.Deli.Customers +{ + public partial class VendorCustomers : System.Web.UI.UserControl + { + + + private IDeliOrderItemProvider _orderItemProvider; + private IOrderProvider _orderProvider; + private IMemberProvider _memberProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private ILicenseProvider _licenseProvider; + private IVendor vendor; + + + protected void Page_Load(object sender, EventArgs e) + { + + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + IMember mem = _memberProvider.GetCurrentMember(); + vendor = _vendorProvider.GetVendorByGuid(mem.UniqueId); + + if (!IsPostBack) + { + BindOrderItems(); + } + } + + protected void BindOrderItems() + { + + + // bind the table to any order that has not been paid out and does not have a payout id + var items = _orderItemProvider.GetOrderItemsByVendor(vendor.Member.Id) + .Select(x => new + { + Id = x.Id, + Package = _listingProvider.GetListing(x.ListingItemId,true).Name, + LicenseTypeName = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Member = _orderProvider.GetOrder(x.OrderId).Member, + OrderDate = string.Format("{0:D}",x.CreateDate) + }); + + CustomerList.DataSource = items; + CustomerList.DataBind(); + + } + + + protected void ExportToCSV(object s, EventArgs e) + { + + HttpResponse response = HttpContext.Current.Response; + + response.Clear(); + response.ClearHeaders(); + response.Buffer = true; + response.ContentType = "application/vnd.ms-excel"; + response.AddHeader("Content-Disposition", "inline;filename=customers.csv"); + response.Charset = ""; + EnableViewState = false; + + // Create the CSV file to which grid data will be exported. + // First we will write the headers. + + + DataTable dt = new DataTable("Subscriptions"); + + + dt.Columns.Add("Package", Type.GetType("System.String")); + dt.Columns.Add("LicenseTypeName", Type.GetType("System.String")); + dt.Columns.Add("Member", Type.GetType("System.String")); + dt.Columns.Add("Email", Type.GetType("System.String")); + dt.Columns.Add("Country", Type.GetType("System.String")); + dt.Columns.Add("OrderDate", Type.GetType("System.String")); + + + // bind the table to any order that has not been paid out and does not have a payout id + var items = _orderItemProvider.GetOrderItemsByVendor(vendor.Member.Id); + + foreach (var x in items) + { + var member = _orderProvider.GetOrder(x.OrderId).Member; + + DataRow dr = dt.NewRow(); + + dr["Package"] = _listingProvider.GetListing(x.ListingItemId, true).Name; + dr["LicenseTypeName"] = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(); + dr["Member"] = member.Name; + dr["Email"] = member.Email; + dr["Country"] = member.CompanyCountry; + dr["OrderDate"] = x.CreateDate.ToString(); + + dt.Rows.Add(dr); + } + + int iColCount = dt.Columns.Count; + for (int i = 0; i < iColCount; i++) + { + response.Output.Write(dt.Columns[i]); + if (i < iColCount - 1) + { + response.Output.Write(","); + } + } + Response.Output.Write("\n"); + // Now write all the rows. + foreach (DataRow dr in dt.Rows) + { + for (int i = 0; i < iColCount; i++) + { + if (!Convert.IsDBNull(dr[i])) + { + if (dr[i].ToString().Contains(",")) + { + response.Output.Write("\"" + dr[i].ToString().Replace("\n", "").Replace("\r", "") + "\""); + } + else + { + response.Output.Write(dr[i].ToString().Replace("\n", "").Replace("\r", "")); + } + } + if (i < iColCount - 1) + { + response.Output.Write(","); + } + } + response.Output.Write("\n"); + } + response.Output.Close(); + response.End(); + } + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.designer.cs b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.designer.cs new file mode 100644 index 00000000..0666f678 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Customers/VendorCustomers.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Customers { + + + public partial class VendorCustomers { + + /// + /// CustomerList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater CustomerList; + } +} diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx new file mode 100644 index 00000000..567ecb68 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx @@ -0,0 +1,100 @@ +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="VendorBIOverview.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Dashboard.VendorBIOverview" %> + + + +

Products YTD Overview

+
+
+
+
Revenue
+
+ +
+
+
Refunded
+
+
+
+
+

Revenue

+
+
+ +
+

Purchases

+
+
+ + +
+

PageViews

+
+
+ +
+

Downloads

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductPage ViewsDownloadsPurchasesRevenue
"><%# Eval("Name") %><%# Eval("PageViews") %><%# Eval("Downloads") %><%# Eval("Purchases") %>
Totals
+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.cs b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.cs new file mode 100644 index 00000000..ad85c85b --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.cs @@ -0,0 +1,246 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Accounting; + +namespace Marketplace.usercontrols.Deli.Dashboard +{ + public enum ChartType + { + Revenue, + Downloads, + Purchases, + PageViews + } + + public partial class VendorBIOverview : System.Web.UI.UserControl + { + + public int DetailView { get; set; } + private IDeliOrderItemProvider _orderProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private IMemberProvider _memberProvider; + + public string RevenueScript { get; set; } + public string DownloadsScript { get; set; } + public string PageViewsScript { get; set; } + public string PurchasesScript { get; set; } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + rp_productRepeater.ItemDataBound += new RepeaterItemEventHandler(rp_productRepeater_ItemDataBound); + } + + void rp_productRepeater_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + dynamic item = e.Item.DataItem as dynamic; + + if (e.Item.ItemType.ToString() != "Header" && e.Item.ItemType.ToString() != "Footer") + { + Literal revenue = (Literal)e.Item.FindControl("DetailItemRevenue"); + revenue.Text = DeliCurrency.NiceMoney((decimal)item.Revenue, DeliCurrency.FromSymbol("EUR")); + } + } + + protected void Page_Load(object sender, EventArgs e) + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + + BindProducts(); + } + + protected void BindProducts() + { + + var vendor = _vendorProvider.GetVendorById(_memberProvider.GetCurrentMember().Id); + + var projects = _listingProvider.GetListingsByVendor(vendor.Member.Id, false, true) + .Where(x => x.ListingType == ListingType.commercial) + .Select(x => new BIYTDOrderInfo() + { + Name = x.Name, + DetailView = umbraco.library.NiceUrl(DetailView) + "?id=" + x.Id.ToString(), + PageViews = x.ProjectViews, + Downloads = x.Downloads, + OrderItems = _orderProvider.GetOrderItemsByListingId(x.Id, true, true) + }).ToList(); + + + BuildChart(vendor, projects, ChartType.Revenue); + BuildChart(vendor, projects, ChartType.Downloads); + BuildChart(vendor, projects, ChartType.PageViews); + BuildChart(vendor, projects, ChartType.Purchases); + + + rp_productRepeater.DataSource = projects; + rp_productRepeater.DataBind(); + + DownloadsTotal.Text = projects.Sum(x => x.Downloads).ToString(); + PageViewTotal.Text = projects.Sum(x => x.PageViews).ToString(); + PurchasesTotal.Text = projects.Sum(x => x.Purchases).ToString(); + RevenueTotal.Text = DeliCurrency.NiceMoney((decimal)projects.Sum(x => x.Revenue), DeliCurrency.FromSymbol("EUR")); + + RevenueOverview.Text = RevenueTotal.Text; + RefundsOverview.Text = DeliCurrency.NiceMoney((decimal)projects.Sum(x => x.Refunds), DeliCurrency.FromSymbol("EUR")); + } + + private void BuildChart(IVendor vendor, IEnumerable projects, ChartType chartDataType) + { + var projectsList = projects.ToList(); + var count = projects.Count(); + + + var addColTemplate = ""; + var dataTemplate = ""; + var countTemplate = ""; + + switch (chartDataType) + { + case ChartType.Revenue: + addColTemplate = "revData.addColumn('{0}', '{1}');"; + dataTemplate = "revData.setValue({0},{1},{2});"; + countTemplate = string.Format("revData.addRows({0});", count); + RevenueScript += string.Format(addColTemplate, "string", "Product"); + RevenueScript += string.Format(addColTemplate, "number", "Revenue"); + RevenueScript += countTemplate; + break; + case ChartType.Downloads: + addColTemplate = "downData.addColumn('{0}', '{1}');"; + dataTemplate = "downData.setValue({0},{1},{2});"; + countTemplate = string.Format("downData.addRows({0});", count); + DownloadsScript += string.Format(addColTemplate, "string", "Product"); + DownloadsScript += string.Format(addColTemplate, "number", "No. of Downloads"); + DownloadsScript += countTemplate; + break; + case ChartType.Purchases: + addColTemplate = "purchasesData.addColumn('{0}', '{1}');"; + dataTemplate = "purchasesData.setValue({0},{1},{2});"; + countTemplate = string.Format("purchasesData.addRows({0});", count); + PurchasesScript += string.Format(addColTemplate, "string", "Product"); + PurchasesScript += string.Format(addColTemplate, "number", "No. of Purchases"); + PurchasesScript += countTemplate; + break; + case ChartType.PageViews: + addColTemplate = "pageViewData.addColumn('{0}', '{1}');"; + dataTemplate = "pageViewData.setValue({0},{1},{2});"; + countTemplate = string.Format("pageViewData.addRows({0});", count); + PageViewsScript += string.Format(addColTemplate, "string", "Product"); + PageViewsScript += string.Format(addColTemplate, "number", "No. of Page Views"); + PageViewsScript += countTemplate; + break; + default: + break; + } + + for(var i=0; i < projectsList.Count();i++) + { + + switch (chartDataType) + { + case ChartType.Revenue: + RevenueScript += string.Format(dataTemplate, i, 0, "'" + projectsList[i].Name + "'"); + RevenueScript += string.Format(dataTemplate, i, 1, projectsList[i].Revenue); + break; + case ChartType.Downloads: + DownloadsScript += string.Format(dataTemplate, i, 0, "'" + projectsList[i].Name + "'"); + DownloadsScript += string.Format(dataTemplate, i, 1, projectsList[i].Downloads); + break; + case ChartType.Purchases: + PurchasesScript += string.Format(dataTemplate, i, 0, "'" + projectsList[i].Name + "'"); + PurchasesScript += string.Format(dataTemplate, i, 1, projectsList[i].Purchases); + break; + case ChartType.PageViews: + PageViewsScript += string.Format(dataTemplate, i, 0, "'" + projectsList[i].Name + "'"); + PageViewsScript += string.Format(dataTemplate, i, 1, projectsList[i].PageViews); + break; + default: + break; + } + } + } + + private IEnumerable GetOrderItems(int id) + { + return _orderProvider.GetOrderItemsByListingId(id, true, true); + + } + + } + + public class BIYTDOrderInfo + { + public string Name { get; set; } + public string DetailView { get; set; } + public int PageViews { get; set; } + public int Downloads { get; set; } + public double Revenue + { + get + { + return GetProductRevenue(OrderItems); + } + } + public int Purchases + { + get + { + return GetProductPurchases(OrderItems); + } + } + public double Refunds + { + get + { + return GetProductRefunds(OrderItems); + } + } + public IEnumerable OrderItems { get; set; } + + + private double GetProductRevenue(IEnumerable x) + { + var orderItems = x.Where(y => !y.IsRefunded); + var total = 0.00; + foreach (var i in orderItems) + { + total += (i.NetPrice * i.Quantity); + } + return total; + + } + + private double GetProductRefunds(IEnumerable x) + { + var orderItems = x.Where(y => y.IsRefunded); + var total = 0.00; + foreach (var i in orderItems) + { + total += (i.NetPrice * i.Quantity); + } + + return total; + + } + + private int GetProductPurchases(IEnumerable x) + { + var orderItems = x.Where(y => !y.IsRefunded); + var count = 0; + foreach (var i in orderItems) + { + count += i.Quantity; + } + return count; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.designer.cs b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.designer.cs new file mode 100644 index 00000000..941d5be5 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorBIOverview.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Dashboard { + + + public partial class VendorBIOverview { + + /// + /// RevenueOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RevenueOverview; + + /// + /// RefundsOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RefundsOverview; + + /// + /// rp_productRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater rp_productRepeater; + + /// + /// PageViewTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal PageViewTotal; + + /// + /// DownloadsTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal DownloadsTotal; + + /// + /// PurchasesTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal PurchasesTotal; + + /// + /// RevenueTotal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RevenueTotal; + } +} diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx new file mode 100644 index 00000000..3043eeaa --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx @@ -0,0 +1,104 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorProjectBI.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Dashboard.VendorProjectBI" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +

Stats for

+
+
+
+
Revenue
+
+ +
+
+
Refunded
+
+
+ +

Usage

+
+
+

Page Views Last 7 Days

+
+
+ +
+
+ +
+
+
Page Views
+
+ +
+
+
Downloads
+
+ +
+
+
Purchased
+
+ + +
+

Licenses

+
+ + +
+
+
<%# (Eval("LicensesSold") as IEnumerable).Count().ToString()%>
Sold
+
<%# (Eval("LicensesSold") as IEnumerable).Where(x => x.IsActive).Count().ToString()%>
Configured
+
+
<%# Eval("TypeSold")%>
+
+
+ + +
+ +

Orders

+ + + + + + + + + + + + + + + + +"> + + + + + + + + + + +
Order Id.License TypeMemberDateQuantityRefundedOrder Value
<%# ((IOrder)Eval("Order")).OrderId%><%# Eval("LicenseSold")%><%# ((IOrder)Eval("Order")).Member.Name %><%# ((IOrder)Eval("Order")).CreateDate.ToString("D")%><%# Eval("Quantity")%><%# Eval("Refunded")%>
+ + + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.cs b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.cs new file mode 100644 index 00000000..1add6ea8 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.cs @@ -0,0 +1,237 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Data; +using Marketplace.Providers.Accounting; +using System.Diagnostics; + +namespace Marketplace.usercontrols.Deli.Dashboard +{ + public partial class VendorProjectBI : System.Web.UI.UserControl + { + + private int _projectId; + public int ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + private List _orderItems; + public List OrderItems + { + get + { + if (_orderItems == null) + _orderItems = _orderItemProvider.GetOrderItemsByListingId(_projectId, true, true).ToList(); + return _orderItems; + } + } + + public string PageViewsScript { get; set; } + + private ILicenseProvider _licenseProvider; + private IMemberLicenseProvider _memberLicenseProvider; + private IDeliOrderItemProvider _orderItemProvider; + private IOrderProvider _orderProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private IMemberProvider _memberProvider; + private IListingItem _project; + + protected void Page_Load(object sender, EventArgs e) + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + _orderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + _project = _listingProvider.GetListing(ProjectId); + LoadProjectBI(); + } + + protected void LoadProjectBI() + { + ProjectName.Text = _project.Name; + RevenueOverview.Text = DeliCurrency.NiceMoney((decimal)GetProductRevenue(ProjectId), DeliCurrency.FromSymbol("EUR")); + RefundOverview.Text = DeliCurrency.NiceMoney((decimal)GetProductRefunds(ProjectId), DeliCurrency.FromSymbol("EUR")); + DownloadsOverview.Text = _project.Downloads.ToString(); + PurchasesOverview.Text = GetProductPurchases(ProjectId).ToString(); + PageViewOverview.Text = _project.ProjectViews.ToString(); + + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + BindLicenseStats(); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + + // Format and display the TimeSpan value. + string elapsedTime = String.Format("{0:00}:{1:00}:{2:00}.{3:00}", + ts.Hours, ts.Minutes, ts.Seconds, + ts.Milliseconds / 10); + Debug.WriteLine("BindLicense Stats RunTime:- " + elapsedTime); + + stopWatch.Start(); + BindOrdersTable(); + stopWatch.Stop(); + ts = stopWatch.Elapsed; + elapsedTime = String.Format("{0:00}:{1:00}:{2:00}.{3:00}", + ts.Hours, ts.Minutes, ts.Seconds, + ts.Milliseconds / 10); + Debug.WriteLine("BindOrdersTable RunTime:- " + elapsedTime); + + BuildChartPageView(DateTime.Now.AddDays(-7), DateTime.Now); + + } + + protected void repeater_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + dynamic item = e.Item.DataItem as dynamic; + + if (e.Item.ItemType.ToString() != "Header" && e.Item.ItemType.ToString() != "Footer") + { + Literal revenue = (Literal)e.Item.FindControl("DetailItemRevenue"); + revenue.Text = DeliCurrency.NiceMoney((decimal)item.Revenue, DeliCurrency.FromSymbol("EUR")); + } + } + + + protected void BindLicenseStats() + { + var licenses = _licenseProvider.GetProjectLicenses(_project.ProjectGuid).Select(x => new LicenseStatObj() + { + TypeSold = x.LicenseType.ToString(), + LicensesSold = GetSold(x.Id), + Revenue = GetRevenue(x.Id) + }); + + LicensesSold.DataSource = licenses; + LicensesSold.DataBind(); + } + + private double GetRevenue(int p) + { + return OrderItems.Where(x =>!x.IsRefunded) + .Where(x => x.LicenseId == p) + .Sum(x => x.NetPrice); + } + + private void BindOrdersTable() + { + var orderItems = OrderItems.Select(x => new + { + OrderId = x.OrderId, + Order = _orderProvider.GetOrder(x.OrderId,true), + LicenseSold = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Quantity = x.Quantity, + Refunded = x.IsRefunded, + Revenue = x.NetPrice, + CssClass = x.IsRefunded ? "refund" : "" + }).OrderByDescending(x => x.Order.PaymentDate).ToList(); + + OrdersRepeater.DataSource = orderItems; + OrdersRepeater.DataBind(); + } + + + private IEnumerable GetSold(int licenseId) + { + return _memberLicenseProvider.GetLicensesByLicenseTypeId(licenseId); + } + + + private double GetProductRevenue(int p) + { + var orderItems = OrderItems.Where(x=>!x.IsRefunded); + var total = 0.00; + foreach (var i in orderItems) + { + total += (i.NetPrice * i.Quantity); + } + return total; + + } + + private double GetProductRefunds(int p) + { + var orderItems = OrderItems.Where(x => x.IsRefunded); + var total = 0.00; + foreach (var i in orderItems) + { + total += (i.NetPrice * i.Quantity); + } + + return total; + + } + + private int GetProductPurchases(int p) + { + var orderItems = OrderItems.Where(x => !x.IsRefunded); + var count = 0; + foreach (var i in orderItems) + { + count += i.Quantity; + } + return count; + } + + private void BuildChartPageView(DateTime startDate, DateTime endDate) + { + + var ctx = new MarketplaceDataContext(); + var pageViews = ctx.DeliProjectViews.Where(x => x.ProjectId == _projectId && x.CreateDate >= startDate && x.CreateDate <= endDate).OrderBy(x => x.CreateDate).ToList(); + var timeSpan = (endDate - startDate).TotalDays; + + + var addColTemplate = ""; + var dataTemplate = ""; + var countTemplate = ""; + + + addColTemplate = "data.addColumn('{0}', '{1}');"; + dataTemplate = "data.setValue({0},{1},{2});"; + countTemplate = string.Format("data.addRows({0});", timeSpan); + PageViewsScript += string.Format(addColTemplate, "string", "Date"); + PageViewsScript += string.Format(addColTemplate, "number", "Page Views"); + PageViewsScript += countTemplate; + + for (var i = 0; i < timeSpan; i++) + { + var thisDate = (startDate.AddDays(i+1)); + PageViewsScript += string.Format(dataTemplate, i, 0, "'" + thisDate.ToString("d") + "'"); + var valForDate = pageViews.Where(x => x.CreateDate.ToShortDateString() == thisDate.ToShortDateString()).Count(); + PageViewsScript += string.Format(dataTemplate, i, 1, valForDate); + } + + } + + + } + + public class LicenseStatObj + { + public string TypeSold { get; set; } + public IEnumerable LicensesSold { get; set; } + public double Revenue { get; set; } + } + +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.designer.cs b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.designer.cs new file mode 100644 index 00000000..2bc90280 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Dashboard/VendorProjectBI.ascx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Dashboard { + + + public partial class VendorProjectBI { + + /// + /// ProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectName; + + /// + /// RevenueOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RevenueOverview; + + /// + /// RefundOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal RefundOverview; + + /// + /// PageViewOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal PageViewOverview; + + /// + /// DownloadsOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal DownloadsOverview; + + /// + /// PurchasesOverview control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal PurchasesOverview; + + /// + /// LicensesSold control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater LicensesSold; + + /// + /// OrdersRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater OrdersRepeater; + } +} diff --git a/Marketplace/usercontrols/Deli/FeaturedProject.ascx b/Marketplace/usercontrols/Deli/FeaturedProject.ascx new file mode 100644 index 00000000..657b7b88 --- /dev/null +++ b/Marketplace/usercontrols/Deli/FeaturedProject.ascx @@ -0,0 +1,51 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FeaturedProject.ascx.cs" Inherits="Marketplace.usercontrols.Deli.FeaturedProject" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +<%@ Import Namespace="Marketplace.Providers.Helpers" %> + + + ">Featured Pakcage Titie + + +
+ + &release=1" class="download">Download + +

Or ">find out more

+ +
+ + +
+ +
+ " class="packageIcon" style="background:url(<%# Marketplace.library.GetDefaultScreenshot((string)Eval("DefaultScreenShot")) %>) no-repeat top left;">Package + +

"> + <%# Eval("Name") %> +

+ +
<%# Marketplace.library.GetCategoryName((int)Eval("Id")) %>
+ + +
<%# Eval("ListingType")%>
+
+ +
+ +

"><%# Marketplace.library.ShortenText(Eval("Description").ToString())%>

+ +
+ +
+
+ <%# Eval("Karma") %> + Karma +
+
+ <%# Eval("Downloads") %> + Downloads +
+
+
+ + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/FeaturedProject.ascx.cs b/Marketplace/usercontrols/Deli/FeaturedProject.ascx.cs new file mode 100644 index 00000000..c48ffad4 --- /dev/null +++ b/Marketplace/usercontrols/Deli/FeaturedProject.ascx.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli +{ + public partial class FeaturedProject : System.Web.UI.UserControl + { + public int projectId { get; set; } + public string FeatureImage { get; set; } + protected void Page_Load(object sender, EventArgs e) + { + if (projectId != 0) + { + var projectList = new List(); + + + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = provider.GetListing(projectId); + projectList.Add(project); + + ProjectList.DataSource = projectList; + ProjectList.DataBind(); + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/FeaturedProject.ascx.designer.cs b/Marketplace/usercontrols/Deli/FeaturedProject.ascx.designer.cs new file mode 100644 index 00000000..b680e438 --- /dev/null +++ b/Marketplace/usercontrols/Deli/FeaturedProject.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class FeaturedProject { + + /// + /// ProjectList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProjectList; + } +} diff --git a/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx new file mode 100644 index 00000000..31b04e48 --- /dev/null +++ b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HQStaffPickProjects.ascx.cs" Inherits="Marketplace.usercontrols.Deli.HQStaffPickProjects" %> + +
    +
  • "><%# Eval("Name") %>
    +<%--<%# Marketplace.library.GetManufacturerName(((Marketplace.Interfaces.IVendor)Eval("Vendor"))) %>--%>
    • +     +
+ \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.cs b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.cs new file mode 100644 index 00000000..18239927 --- /dev/null +++ b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli +{ + public partial class HQStaffPickProjects : System.Web.UI.UserControl + { + public string PickedProjects { get; set; } + protected void Page_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(PickedProjects)) + { + var idArray = PickedProjects.Split(','); + var listProject = new List(); + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + foreach (var id in idArray) + { + try + { + var listing = provider.GetListing(Int32.Parse(id),true); + listProject.Add(listing); + + } + catch + { + // do nothing the item doesnt exist; + } + } + + + Listing.DataSource = listProject; + Listing.DataBind(); + + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.designer.cs b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.designer.cs new file mode 100644 index 00000000..273f94cf --- /dev/null +++ b/Marketplace/usercontrols/Deli/HQStaffPickProjects.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class HQStaffPickProjects { + + /// + /// Listing control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater Listing; + } +} diff --git a/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx new file mode 100644 index 00000000..cf86d3c4 --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx @@ -0,0 +1,149 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MyLicenses.ascx.cs" Inherits="Marketplace.usercontrols.Deli.License.Member.MyLicenses" %> +

+Manage your licenses +

+ + +
+

+
+ + + + +
+
+ Configure for for Member: + + +

+ + +

+

+ + +

+

+ + +

+(Hint: use the root of your domain. "mydomain.com" instead of "www.mydomain.com" as this will allow the license to be used on all subdomains also) + + +

This license requires no configuration as it is an Unlimited License

+ +
+
+ + +
+ + + + + +

+ + + +

+ +

+ Found with term +

+ + + + + + + + + + + + + + + + + + + + + + + + +
ProductLicense TypeConfigured ForLicense File
+ <%#((Marketplace.Interfaces.IListingItem)Eval("Product")).Name %> +
<%#((Marketplace.Interfaces.IListingItem)Eval("Product")).Vendor.VendorCompanyName %> + 		+ <%# Eval("LicType") %> + + Dev: <%# Eval("DevConfig") %>
+ Staging: <%# Eval("StagingConfig") %>
+ Production: <%# Eval("ProductionConfig")%> + +
+ + + diff --git a/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.cs b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.cs new file mode 100644 index 00000000..ff61f59c --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.cs @@ -0,0 +1,263 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using Marketplace.Providers.Helpers; +using our; +using Marketplace.Providers.MemberLicense; +using System.Text.RegularExpressions; + +namespace Marketplace.usercontrols.Deli.License.Member +{ + public partial class MyLicenses : System.Web.UI.UserControl + { + + public int SupportFormLocation { get; set; } + + protected string supportFormUrl; + private IMemberProvider _memberProvider; + private IMemberLicenseProvider _memberLicenseProvider; + private ILicenseProvider _licenseProvider; + private IListingProvider _listingProvider; + private IMember _m; + + + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + + RP_Licenses.ItemDataBound += new RepeaterItemEventHandler(OnLicenseBound); + RP_Licenses.ItemCommand += new RepeaterCommandEventHandler(OnLicenseCommand); + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + _memberLicenseProvider= (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + _m = _memberProvider.GetCurrentMember(); + + //setup the location of the support form + supportFormUrl = umbraco.library.NiceUrl(SupportFormLocation); + + + } + + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + + + + + if (!IsPostBack) + { + BindLicenses(string.Empty); + } + + + } + + private void BindLicenses(string term) + { + var licenses = (!string.IsNullOrEmpty(term)) + ? _memberLicenseProvider.GetAllLicensesContaining(_m.Id, term) + : _memberLicenseProvider.GetAllLicensesByMember(_m.Id); + + + var memberLicenses = licenses.Select(x => new + { + Id = x.Id, + Product = GetProduct(x.LicenseId), + LicType = _licenseProvider.GetLicense(x.LicenseId).LicenseType.LicenseTypeAsString(), + DevConfig= x.DevConfig, + StagingConfig = x.StagingConfig, + ProductionConfig = x.ProductionConfig, + Lic = x + }); + + RP_Licenses.DataSource = memberLicenses; + RP_Licenses.DataBind(); + } + + + private IListingItem GetProduct(int p) + { + var product = _listingProvider.GetListing(_licenseProvider.GetLicense(p).ProjectGuid, false); + return product; + } + + protected void OnLicenseBound(object sender, RepeaterItemEventArgs e) + { + if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem) + { + dynamic row = e.Item.DataItem as dynamic; + var lic = row.Lic; + Button _action = (Button)e.Item.FindControl("BT_Action"); + LinkButton _download = (LinkButton)e.Item.FindControl("LNK_Download"); + + _download.CommandArgument = lic.Id.ToString(); + _download.CommandName = "Download"; + + + //set up the configure and download buttons + _action.CommandArgument = lic.Id.ToString(); + + if (lic.DateGenerated != null) + { + _action.Visible = false; + } + else + { + _action.CommandName = "Configure"; + _action.Text = "Configure"; + _action.CommandArgument = lic.Id.ToString(); + _download.Visible = false; + } + + } + } + + protected void OnLicenseCommand(object sender, RepeaterCommandEventArgs e) + { + //load the license + string licenseId = e.CommandArgument.ToString(); + + var lic = _memberLicenseProvider.GetLicenseById(Int32.Parse(licenseId)); + var licType = _licenseProvider.GetLicense(lic.LicenseId); + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + switch (e.CommandName) + { + + + case "Configure": + Create_LicenseError.Visible = false; + ConfigurationForm.Visible = true; + + + ConfigurationLicenseType.Text = licType.LicenseType.ToString() + " License "; + ConfigurationMemberName.Text = lic.Member.Name; + ConfigurationProjectName.Text = GetProduct(lic.LicenseId).Name; + + if (licType.LicenseType != LicenseType.Unlimited) + { + Configure_DevConfig.Text = lic.DevConfig; + Configure_StagingConfig.Text = lic.StagingConfig; + Configure_ProductionConfig.Text = lic.ProductionConfig; + + //set the validation class for the fields to validate correct setup. + switch (licType.LicenseType) + { + case LicenseType.Domain: + Configure_DevConfig.CssClass += " onlyDomainName"; + Configure_StagingConfig.CssClass += " onlyDomainName"; + Configure_ProductionConfig.CssClass += " onlyDomainName"; + break; + case LicenseType.IP: + Configure_DevConfig.CssClass += " onlyIpAddress"; + Configure_StagingConfig.CssClass += " onlyIpAddress"; + Configure_ProductionConfig.CssClass += " onlyIpAddress"; + break; + case LicenseType.Unlimited: + break; + case LicenseType.SourceCode: + break; + default: + break; + } + + DomainIpConfig.Visible = true; + UnlimitedConfig.Visible = false; + } + else + { + + DomainIpConfig.Visible = false; + UnlimitedConfig.Visible = true; + } + Configure_Id.Value = licenseId; + break; + + + case "Download": + ConfigurationForm.Visible = false; + Create_LicenseError.Visible = false; + var project = _listingProvider.GetListing(_licenseProvider.GetLicense(lic.LicenseId).ProjectGuid); + var filename = Regex.Replace(project.Vendor.VendorCompanyName, @"[\W]", ""); + filename += Regex.Replace(project.Name, @"[\W]", ""); + HttpContext context = HttpContext.Current; + context.Response.Clear(); + context.Response.Write(lic.GeneratedLicense); + context.Response.ContentType = "application/octet-steam"; + context.Response.AppendHeader("Content-Disposition", "attachment; filename=" + filename + ".lic"); + context.Response.End(); + break; + + default: + break; + } + } + + + protected void UpdateLicense_Click(object server, EventArgs e) + { + Create_LicenseError.Visible = false; + + if (Configure_DevConfig.Text.Contains("*") || Configure_StagingConfig.Text.Contains("*") || Configure_ProductionConfig.Text.Contains("*")) + { + LicenseErrorMessage.Text = " Wildcards are not allowed in domains, they are automatically added; e.g. *.mydomain.com. Please remove any '*' characters are retry"; + Create_LicenseError.Visible = true; + } + else + { + + var licenseId = Int32.Parse(Configure_Id.Value); + var license = _memberLicenseProvider.GetLicenseById(licenseId); + + var licenseType = _licenseProvider.GetLicense(license.LicenseId); + + if (licenseType.LicenseType != LicenseType.Unlimited) + { + license.DevConfig = Configure_DevConfig.Text; + license.StagingConfig = Configure_StagingConfig.Text; + license.ProductionConfig = Configure_ProductionConfig.Text; + } + else + { + license.DevConfig = "Unlimited"; + license.StagingConfig = "Unlimited"; + license.ProductionConfig = "Unlimited"; + } + license.IsActive = true; + + _memberLicenseProvider.SaveOrUpdate(license); + _memberLicenseProvider.GenerateLicenseFile(license); + + if (string.IsNullOrEmpty(license.GeneratedLicense)) + { + LicenseErrorMessage.Text = license.GeneratedLicense + " Please contact the license vendor for assistance"; + Create_LicenseError.Visible = true; + } + else + { + Response.Redirect(Request.Url.OriginalString); + } + } + } + + protected void Find_LicenseSubmit_Click(object sender, EventArgs e) + { + var term = Find_LicenseTerm.Text; + Find_Filter.Text = Find_LicenseTerm.Text; + FilteringByMessage.Visible = true; + Create_LicenseError.Visible = false; + ConfigurationForm.Visible = false; + BindLicenses(term); + Find_RecordsFound.Text = RP_Licenses.Items.Count.ToString(); + + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.designer.cs b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.designer.cs new file mode 100644 index 00000000..a1c06e86 --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Member/MyLicenses.ascx.designer.cs @@ -0,0 +1,213 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.License.Member { + + + public partial class MyLicenses { + + /// + /// Create_LicenseError control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder Create_LicenseError; + + /// + /// LicenseErrorMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal LicenseErrorMessage; + + /// + /// ConfigurationForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ConfigurationForm; + + /// + /// ConfigurationLicenseType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationLicenseType; + + /// + /// ConfigurationProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationProjectName; + + /// + /// ConfigurationMemberName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationMemberName; + + /// + /// Configure_Id control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField Configure_Id; + + /// + /// DomainIpConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DomainIpConfig; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Configure_DevConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_DevConfig; + + /// + /// Label2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Configure_StagingConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_StagingConfig; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Configure_ProductionConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_ProductionConfig; + + /// + /// UnlimitedConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder UnlimitedConfig; + + /// + /// bt_Configure control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_Configure; + + /// + /// Find_LicenseTerm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Find_LicenseTerm; + + /// + /// Find_LicenseSubmit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Find_LicenseSubmit; + + /// + /// FilteringByMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder FilteringByMessage; + + /// + /// Find_RecordsFound control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal Find_RecordsFound; + + /// + /// Find_Filter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal Find_Filter; + + /// + /// RP_Licenses control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater RP_Licenses; + } +} diff --git a/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx new file mode 100644 index 00000000..f1ef856d --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx @@ -0,0 +1,205 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectLicenses.ascx.cs" Inherits="Marketplace.usercontrols.Deli.License.Vendor.ProjectLicenses" %> +

+Manage Licenses for +

+ + + +
+

+
+ + + + +
+
+ Configure for for Member: + + +

+ + +

+

+ + +

+

+ + +

+ (Hint: use the root of your domain. "mydomain.com" instead of "www.mydomain.com" as this will allow the license to be used on all subdomains also) + + +

This is an unlimited license and does not require any further configuration.

+ + +
+
+ + +
+ + + + + + + + + +
+
+ Create License +

+ + + +

+ +

+ + +

Sorry this user cannot be found.

+

+ + +

+ + +

+

+ + +

+

+ + +

+ +(Hint: use the root of your domain. "mydomain.com" instead of "www.mydomain.com" as this will allow the license to be used on all subdomains also) + + +

You have selected the unlimited license type. This license type does not require any further configuration.

+ +
+ +
+
+
+ + + + + + + + + + +

+ + + +

+ +

+ Found with term +

+ + + + + + + + + + + + + + + + + + + + + + + + +
License TypeConfigured ForMemberLicense File
+ <%# Eval("LicType") %> + + Dev: <%# Eval("DevConfig") %>
+ Staging: <%# Eval("StagingConfig") %>
+ Production: <%# Eval("ProductionConfig")%> + + 		+ <%# Eval("MemberName") %> +
+ + + diff --git a/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.cs b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.cs new file mode 100644 index 00000000..2553b283 --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.cs @@ -0,0 +1,381 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using Marketplace.Providers.Helpers; +using our; +using Marketplace.Providers.MemberLicense; +using System.Text.RegularExpressions; + +namespace Marketplace.usercontrols.Deli.License.Vendor +{ + public partial class ProjectLicenses : System.Web.UI.UserControl + { + private Guid _projectGuid; + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + + RP_Licenses.ItemDataBound += new RepeaterItemEventHandler(OnLicenseBound); + RP_Licenses.ItemCommand += new RepeaterCommandEventHandler(OnLicenseCommand); + + } + + protected override void OnPreRender(EventArgs e) + { + base.OnPreRender(e); + if (umbraco.library.IsLoggedOn() && ProjectId != null) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + IMember mem = memberProvider.GetCurrentMember(); + IListingItem project = provider.GetListing((int)ProjectId); + + ProjectName.Text = project.Name; + _projectGuid = project.ProjectGuid; + + if ((project.Vendor.Member.Id == mem.Id) || + Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + { + if (!IsPostBack) + { + BindLicenses(string.Empty); + BindDropdowns(); + } + } + else + { + //this project does not belong to this member so kick them back to the project list in their profile. + Response.Redirect("~/member/profile/projects/"); + } + } + } + + private void BindLicenses(string term) + { + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var licenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + + var licenses = (!string.IsNullOrEmpty(term)) + ?licenseProvider.GetAllLicensesContaining(term, (int)ProjectId) + :licenseProvider.GetAllLicensesByProject(_projectGuid); + + var memberLicenses = licenses.Select(x => new + { + Id = x.Id, + LicType = licenseTypeProvider.GetLicense(x.LicenseId).LicenseType.LicenseTypeAsString(), + DevConfig= x.DevConfig, + StagingConfig = x.StagingConfig, + ProductionConfig = x.ProductionConfig, + MemberName = x.Member.Name + " (" + x.Member.Email + ")", + Lic = x + }); + + RP_Licenses.DataSource = memberLicenses; + RP_Licenses.DataBind(); + } + + protected void OnLicenseBound(object sender, RepeaterItemEventArgs e) + { + if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem) + { + dynamic row = e.Item.DataItem as dynamic; + var lic = row.Lic; + Button _action = (Button)e.Item.FindControl("BT_Action"); + Button _enable = (Button)e.Item.FindControl("BT_EnableDisable"); + LinkButton _download = (LinkButton)e.Item.FindControl("LNK_Download"); + + _download.CommandArgument = lic.Id.ToString(); + _download.CommandName = "Download"; + + //setup the enable disable button + _enable.CommandArgument = lic.Id.ToString(); + _enable.CommandName = "EnableDisable"; + _enable.Text = lic.IsActive ? "Disable" : "Enable"; + + + //set up the configure and download buttons + _action.CommandArgument = lic.Id.ToString(); + + if (lic.DateGenerated != null) + { + _action.CommandName = "Configure"; + _action.CommandArgument = lic.Id.ToString(); + _action.Text = "Configure"; + } + else + { + _action.CommandName = "Configure"; + _action.Text = "Configure"; + _action.CommandArgument = lic.Id.ToString(); + _download.Visible = false; + } + + } + } + + protected void OnLicenseCommand(object sender, RepeaterCommandEventArgs e) + { + //load the license + string licenseId = e.CommandArgument.ToString(); + var licenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + var lic = licenseProvider.GetLicenseById(Int32.Parse(licenseId)); + + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + switch (e.CommandName) + { + + + case "Configure": + + + + //get its type to set the headings + var licenseType = licenseTypeProvider.GetLicense(lic.LicenseId); + var licType = licenseType.LicenseType.LicenseTypeAsString(); + + Create_LicenseError.Visible = false; + CreateNewForm.Visible = false; + ConfigurationForm.Visible = true; + CreateNew.Visible = true; + + + ConfigurationLicenseType.Text = licType + " License "; + ConfigurationMemberName.Text = lic.Member.Name; + ConfigurationProjectName.Text = ProjectName.Text; + + if (licenseType.LicenseType != LicenseType.Unlimited) + { + Configure_DevConfig.Text = lic.DevConfig; + Configure_StagingConfig.Text = lic.StagingConfig; + Configure_ProductionConfig.Text = lic.ProductionConfig; + DomainIpConfig.Visible = true; + UnlimitedConfig.Visible = false; + } + else + { + DomainIpConfig.Visible = false; + UnlimitedConfig.Visible = true; + } + Configure_Id.Value = licenseId; + break; + + case "EnableDisable": + + ConfigurationForm.Visible = false; + Create_LicenseError.Visible = false; + CreateNewForm.Visible = false; + CreateNew.Visible = true; + + lic.IsActive = lic.IsActive ? false : true; + licenseProvider.SaveOrUpdate(lic); + break; + + case "Download": + + ConfigurationForm.Visible = false; + Create_LicenseError.Visible = false; + CreateNewForm.Visible = false; + CreateNew.Visible = true; + + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = provider.GetListing(licenseTypeProvider.GetLicense(lic.LicenseId).ProjectGuid); + var filename = Regex.Replace(project.Vendor.VendorCompanyName, @"[\W]", ""); + filename += Regex.Replace(project.Name, @"[\W]", ""); + HttpContext context = HttpContext.Current; + context.Response.Clear(); + context.Response.Write(lic.GeneratedLicense); + context.Response.ContentType = "application/octet-steam"; + context.Response.AppendHeader("Content-Disposition", "attachment; filename=" + filename + ".lic"); + context.Response.End(); + break; + + default: + break; + } + } + + + private void BindDropdowns() + { + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + var licTypes = licenseTypeProvider.GetProjectLicenses(_projectGuid).Select(x => new + { + Text = x.LicenseType.LicenseTypeAsString(), + Value = x.Id + }); + + Create_LicenseType.DataTextField = "Text"; + Create_LicenseType.DataValueField = "Value"; + Create_LicenseType.DataSource = licTypes; + Create_LicenseType.DataBind(); + + + } + + protected void CreateNew_Click(object sender, EventArgs e) + { + CreateNew.Visible = false; + CreateNewForm.Visible = true; + ConfigurationForm.Visible = false; + if (Create_LicenseType.SelectedItem.Text.ToLower() == "unlimited" || Create_LicenseType.SelectedItem.Text.ToLower() == "sourcecode") + { + CreateUnlimitedConfig.Visible = true; + CreateDomainIpConfig.Visible = false; + } + else + { + CreateUnlimitedConfig.Visible = false; + CreateDomainIpConfig.Visible = true; + } + } + + + protected void UpdateLicense_Click(object server, EventArgs e) + { + Create_LicenseError.Visible = false; + CreateNew.Visible = true; + + var licenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + var licenseId = Int32.Parse(Configure_Id.Value); + var license = licenseProvider.GetLicenseById(licenseId); + + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var licenseType = licenseTypeProvider.GetLicense(license.LicenseId); + + if (licenseType.LicenseType != LicenseType.Unlimited) + { + license.DevConfig = Configure_DevConfig.Text; + license.StagingConfig = Configure_StagingConfig.Text; + license.ProductionConfig = Configure_ProductionConfig.Text; + } + else + { + license.DevConfig = "Unlimited"; + license.StagingConfig = "Unlimited"; + license.ProductionConfig = "Unlimited"; + } + license.IsActive = true; + + licenseProvider.SaveOrUpdate(license); + licenseProvider.GenerateLicenseFile(license); + + if (string.IsNullOrEmpty(license.GeneratedLicense)) + { + LicenseErrorMessage.Text = license.GeneratedLicense + " Please contact support for assistance"; + Create_LicenseError.Visible = true; + } + else + { + Response.Redirect(Request.Url.OriginalString); + } + } + + protected void CreateTypeChanged(object sender, EventArgs e) + { + var ddl = sender as DropDownList; + if (ddl.SelectedItem.Text.ToLower() == "unlimited" || ddl.SelectedItem.Text.ToLower() == "sourcecode") + { + CreateUnlimitedConfig.Visible = true; + CreateDomainIpConfig.Visible = false; + } + else + { + CreateUnlimitedConfig.Visible = false; + CreateDomainIpConfig.Visible = true; + } + } + + protected void CreateLicense_Click(object server, EventArgs e) + { + Create_LicenseError.Visible = false; + + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + var licenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + var licenseTypeProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + + var license = new MemberLicense(); + + //bit nasty but I cant think of a better way to catch an invalid member. + try { + var member = memberProvider.GetMemberByEmail(Create_MemberEmail.Text); + license.Member = member; + license.LicenseId = Convert.ToInt32(Create_LicenseType.SelectedValue); + license.ListingItemId = (int)ProjectId; + + var licenseType = licenseTypeProvider.GetLicense(license.LicenseId); + + if (licenseType.LicenseType != LicenseType.Unlimited) + { + license.DevConfig = Create_DevConfig.Text; + license.StagingConfig = Create_StagingConfig.Text; + license.ProductionConfig = Create_ProductionConfig.Text; + } + else + { + license.DevConfig = "Unlimited"; + license.StagingConfig = "Unlimited"; + license.ProductionConfig = "Unlimited"; + } + license.CreateDate = DateTime.Now.ToUniversalTime(); + license.IsActive = true; + + licenseProvider.SaveOrUpdate(license); + licenseProvider.GenerateLicenseFile(license); + if (string.IsNullOrEmpty(license.GeneratedLicense)) + { + LicenseErrorMessage.Text = license.GeneratedLicense + " Please contact support for assistance"; + Create_LicenseError.Visible = true; + } + else + { + Create_LicenseError.Visible = false; + Create_InvalidMember.Visible = false; + Response.Redirect(Request.Url.OriginalString); + } + } + catch + { + Create_InvalidMember.Visible = true; + } + } + + protected void Find_LicenseSubmit_Click(object sender, EventArgs e) + { + var term = Find_LicenseTerm.Text; + Find_Filter.Text = Find_LicenseTerm.Text; + FilteringByMessage.Visible = true; + Create_LicenseError.Visible = false; + CreateNew.Visible = true; + ConfigurationForm.Visible = false; + CreateNewForm.Visible = false; + BindLicenses(term); + Find_RecordsFound.Text = RP_Licenses.Items.Count.ToString(); + + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.designer.cs b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.designer.cs new file mode 100644 index 00000000..41d282fe --- /dev/null +++ b/Marketplace/usercontrols/Deli/License/Vendor/ProjectLicenses.ascx.designer.cs @@ -0,0 +1,366 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.License.Vendor { + + + public partial class ProjectLicenses { + + /// + /// ProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectName; + + /// + /// CreateNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button CreateNew; + + /// + /// Create_LicenseError control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder Create_LicenseError; + + /// + /// LicenseErrorMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal LicenseErrorMessage; + + /// + /// ConfigurationForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ConfigurationForm; + + /// + /// ConfigurationLicenseType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationLicenseType; + + /// + /// ConfigurationProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationProjectName; + + /// + /// ConfigurationMemberName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ConfigurationMemberName; + + /// + /// Configure_Id control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField Configure_Id; + + /// + /// DomainIpConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DomainIpConfig; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Configure_DevConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_DevConfig; + + /// + /// Label2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Configure_StagingConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_StagingConfig; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Configure_ProductionConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Configure_ProductionConfig; + + /// + /// UnlimitedConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder UnlimitedConfig; + + /// + /// bt_Configure control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_Configure; + + /// + /// CreateNewForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CreateNewForm; + + /// + /// Label4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// Create_LicenseType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList Create_LicenseType; + + /// + /// Label5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// Create_MemberEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Create_MemberEmail; + + /// + /// Create_InvalidMember control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder Create_InvalidMember; + + /// + /// CreateDomainIpConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CreateDomainIpConfig; + + /// + /// Label6 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label6; + + /// + /// Create_DevConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Create_DevConfig; + + /// + /// Label7 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label7; + + /// + /// Create_StagingConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Create_StagingConfig; + + /// + /// Label8 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label8; + + /// + /// Create_ProductionConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Create_ProductionConfig; + + /// + /// CreateUnlimitedConfig control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CreateUnlimitedConfig; + + /// + /// bt_Create control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_Create; + + /// + /// Find_LicenseTerm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Find_LicenseTerm; + + /// + /// Find_LicenseSubmit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Find_LicenseSubmit; + + /// + /// FilteringByMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder FilteringByMessage; + + /// + /// Find_RecordsFound control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal Find_RecordsFound; + + /// + /// Find_Filter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal Find_Filter; + + /// + /// RP_Licenses control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater RP_Licenses; + } +} diff --git a/Marketplace/usercontrols/Deli/ListPagination.ascx b/Marketplace/usercontrols/Deli/ListPagination.ascx new file mode 100644 index 00000000..7c54d646 --- /dev/null +++ b/Marketplace/usercontrols/Deli/ListPagination.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ListPagination.ascx.cs" Inherits="Marketplace.usercontrols.Deli.ListPagination" %> diff --git a/Marketplace/usercontrols/Deli/ListPagination.ascx.cs b/Marketplace/usercontrols/Deli/ListPagination.ascx.cs new file mode 100644 index 00000000..18836b8f --- /dev/null +++ b/Marketplace/usercontrols/Deli/ListPagination.ascx.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace Marketplace.usercontrols.Deli +{ + public partial class ListPagination : System.Web.UI.UserControl + { + public int NumberOfPages { get; set; } + public int WindowSize { get; set; } + + protected void Page_PreRender(object sender, EventArgs e) + { + if (NumberOfPages > 0) + { + if (WindowSize == 0) + { + WindowSize = 5; + } + //list to hold the generated links + List linklist = new List(); + //get currentpage + int? currentPageNumber = 1; + if (!string.IsNullOrEmpty(Request.QueryString["page"])) + currentPageNumber = Int32.Parse(Request.QueryString["page"]); + + //Create the new href retaining the current querystrings + string url = Request.Url.ToString(); + if (!url.Contains("page")) + { + if (url.Contains('?')) url += "&page="; + else url += "?page="; + } + else + url = url.Replace("page=" + currentPageNumber, "page="); + + + if (String.IsNullOrEmpty(Request["ViewAll"])) + { + //Create the numerical links to be added to the place holder + int start = 1; + int end = NumberOfPages; + + //int midPage = (int)currentPageNumber; + //midPage = Math.Max(midPage, (WindowSize / 2) + (WindowSize % 2 == 0 ? 0 : 1)); + //// make sure the middle of the view is not too close to the start. + //midPage = Math.Min(midPage, NumberOfPages - (WindowSize / 2)); + //// make sure the middle of the view is not too close to the end. + //end = midPage + (WindowSize / 2); + //midPage += ((WindowSize % 2 == 0) ? 1 : 0); // this has to be incremented before calculating the From. + //start = midPage - (WindowSize / 2); + + //start = Math.Max(start, 1); + + if (currentPageNumber > 1) + { + HyperLink prevLink = new HyperLink(); + prevLink.Text = " < Previous "; + prevLink.NavigateUrl = url.Replace("page=", "page=" + (currentPageNumber - 1)); + linklist.Add(prevLink); + } + + + + + //HyperLink startlink = CreateLink(url, 1, "first"); + //linklist.Add(startlink); + + + + for (int? i = start; i <= end; i++) + { + HyperLink PageLink = CreateLink(url, i); + linklist.Add(PageLink); + + + } + + //HyperLink endlink = CreateLink(url, NumberOfPages, "last"); + //linklist.Add(endlink); + + + + //check for next + if (currentPageNumber < NumberOfPages) + { + HyperLink nextLink = new HyperLink(); + nextLink.Text = " Next > "; + nextLink.NavigateUrl = url.Replace("page=", "page=" + (currentPageNumber + 1)); + linklist.Add(nextLink); + } + + Controls.Add(new Literal() { Text = "
    " }); + + foreach (HyperLink hl in linklist) + { + Controls.Add(new Literal() { Text = "
  • " }); + Controls.Add(hl); + Controls.Add(new Literal() { Text = "
    • " }); + } + Controls.Add(new Literal() { Text = "
" }); + } + else + { + Controls.Add(new Literal() { Text = "
    " }); + Controls.Add(new Literal() { Text = "
  • " }); + Controls.Add(new HyperLink() { Text = "Paged Results", NavigateUrl = url.Replace("&page=", "").Replace("ViewAll=true", "page=1") }); + Controls.Add(new Literal() { Text = "
    • " }); + Controls.Add(new Literal() { Text = "
" }); + } + } + } + + private HyperLink CreateLink(string url, int? i, string text ="") + { + HyperLink PageLink = new HyperLink(); + if (!string.IsNullOrEmpty(text)) + PageLink.Text = " " + text + " "; + else + PageLink.Text = " " + i + " "; + + PageLink.NavigateUrl = url.Replace("page=", "page=" + i.ToString()); + + //Check to see if link is current + if (!string.IsNullOrEmpty(Request.QueryString["page"])) + { + if (Int32.Parse(Request.QueryString["page"]) == i) + { + PageLink.Attributes.Add("class", "selected"); + } + } + else if (i == 1) + { + PageLink.Attributes.Add("class", "selected"); + } + return PageLink; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/ListPagination.ascx.designer.cs b/Marketplace/usercontrols/Deli/ListPagination.ascx.designer.cs new file mode 100644 index 00000000..071ff174 --- /dev/null +++ b/Marketplace/usercontrols/Deli/ListPagination.ascx.designer.cs @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class ListPagination { + } +} diff --git a/Marketplace/usercontrols/Deli/NewestProjects.ascx b/Marketplace/usercontrols/Deli/NewestProjects.ascx new file mode 100644 index 00000000..7218e5aa --- /dev/null +++ b/Marketplace/usercontrols/Deli/NewestProjects.ascx @@ -0,0 +1,79 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="NewestProjects.ascx.cs" Inherits="Marketplace.usercontrols.Deli.NewestProjects" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +<%@ Import Namespace="Marketplace.Providers.Helpers" %> +<%@ Register Src="~/usercontrols/Deli/ListPagination.ascx" TagPrefix="deli" TagName="paging" %> + + +
+ +
+

Latest Projects

 + + + + + " class="viewAll">All new +
loading newest projects
+ + + +

Showing <%= PageStartListingNumber %> - <%=PageEndListingNumber %> of <%=TotalListings %> Projects

+ + + + + + +
+ +
+ + + +
+

There are no listings that meet your filter criteria

+
+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/NewestProjects.ascx.cs b/Marketplace/usercontrols/Deli/NewestProjects.ascx.cs new file mode 100644 index 00000000..ffcf544e --- /dev/null +++ b/Marketplace/usercontrols/Deli/NewestProjects.ascx.cs @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli +{ + public partial class NewestProjects : UserControl + { + public int TotalListings { get; set; } + public int PageStartListingNumber { get; set; } + public int PageEndListingNumber { get; set; } + + private string _listingType = ""; + public string ListingType + { + get { return _listingType; } + set { _listingType = value; } + } + + private int _maxPageSize = 20; + public int MaxPageSize + { + get { return _maxPageSize; } + set { _maxPageSize = value; } + } + + private int _pageNumber; + public int PageNumber + { + get + { + if (_pageNumber > 0) + return _pageNumber - 1; + + return _pageNumber; + } + set + { + _pageNumber = value; + } + } + + public bool paged { get; set; } + + protected void Page_PreRender(object sender, EventArgs e) + { + Bind_Data(); + } + + protected void Bind_Data() + { + var projectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + var skip = PageNumber * _maxPageSize; + var take = _maxPageSize; + + IEnumerable projects; + + if (paged == false) + { + switch (_listingType) + { + case "free": + projects = projectsProvider.GetListingsByLatest(0, take, Interfaces.ListingType.free, true); + break; + + case "commercial": + projects = projectsProvider.GetListingsByLatest(0, take, Interfaces.ListingType.commercial, true); + break; + + default: + projects = projectsProvider.GetListingsByLatest(0, take, true); + break; + } + + ListingOpen.Visible = false; + ListingClose.Visible = false; + ProjectCounter.Visible = false; + paging.Visible = false; + } + else + { + int count; + + switch (_listingType) + { + case "free": + projects = projectsProvider.GetListingsByLatest(skip, take, Interfaces.ListingType.free, true); + count = projectsProvider.Count(Interfaces.ListingType.free); + break; + + case "commercial": + projects = projectsProvider.GetListingsByLatest(skip, take, Interfaces.ListingType.commercial, true); + count = projectsProvider.Count(Interfaces.ListingType.commercial); + break; + + default: + projects = projectsProvider.GetListingsByLatest(skip, take, true); + count = projectsProvider.Count(); + break; + } + + if (count > _maxPageSize) + { + paging.Visible = true; + + var numPages = (count / (decimal)_maxPageSize); + var intNumPages = Convert.ToInt32(numPages); + + if (numPages % 1 > 0 && numPages % 1 <= (decimal)0.5) + { + intNumPages += 1; + } + + paging.NumberOfPages = intNumPages; + } + + var projectCount = projects.Count(); + + if (projectCount > 0) + { + ProjectCounter.Visible = true; + TotalListings = count; + PageStartListingNumber = skip + 1; + PageEndListingNumber = skip + projectCount; + } + else + { + ProjectCounter.Visible = false; + Listing.Visible = false; + NoListings.Visible = true; + } + + ListingOpen.Visible = true; + ListingClose.Visible = true; + WidgetTitle.Visible = false; + WidgetFeatures.Visible = false; + } + + Listing.DataSource = projects; + Listing.DataBind(); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/NewestProjects.ascx.designer.cs b/Marketplace/usercontrols/Deli/NewestProjects.ascx.designer.cs new file mode 100644 index 00000000..58409b66 --- /dev/null +++ b/Marketplace/usercontrols/Deli/NewestProjects.ascx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class NewestProjects { + + /// + /// ListingOpen control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ListingOpen; + + /// + /// WidgetTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder WidgetTitle; + + /// + /// WidgetFeatures control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder WidgetFeatures; + + /// + /// ProjectCounter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ProjectCounter; + + /// + /// Listing control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater Listing; + + /// + /// ListingClose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ListingClose; + + /// + /// NoListings control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NoListings; + + /// + /// paging control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.usercontrols.Deli.ListPagination paging; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Editor.ascx b/Marketplace/usercontrols/Deli/Package/Editor.ascx new file mode 100644 index 00000000..ab9a8c5c --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Editor.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Editor.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Editor" %> + + + +
    + +
    • +     +
+ + + + + diff --git a/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs b/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs new file mode 100644 index 00000000..438f1ce7 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs @@ -0,0 +1,168 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using umbraco.IO; +using Marketplace.BusinessLogic.ListingCreator; +using Marketplace.BusinessLogic.ListingCreator.StepDefinitions; +using Marketplace.Providers; +using Marketplace.Interfaces; +using umbraco.cms.businesslogic.member; +using our; + +namespace Marketplace.usercontrols.Deli.Package +{ + public partial class Editor : System.Web.UI.UserControl + { + private string _currentStep = ""; + private static IVendor _vendor; + private static IListingItem _project; + public string _currentStepClass = "current"; + + private int? _projectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + return Int32.Parse(Request["id"]); + } + return null; + } + } + + + protected void Page_Load(object sender, System.EventArgs e) + { + StepNavigation.DataSource = ListingSteps().Values; + StepNavigation.DataBind(); + } + + + private void loadContent(ListingCreatorStep currentStep) + { + StepPlaceHolder.Controls.Clear(); + var controlToLoad = new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl(currentStep.UserControl)); + + if (currentStep.Alias == "details") + ((Marketplace.usercontrols.Deli.Package.Steps.Details)controlToLoad).IsDeliVendor = _vendor.Member.IsDeliVendor; + + StepPlaceHolder.Controls.Add(controlToLoad); + Step.Value = currentStep.Alias; + _currentStep = currentStep.Alias; + } + + int stepCounter = 0; + + + protected void bindStep(object sender, RepeaterItemEventArgs e) + { + + if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) + { + ListingCreatorStep i = (ListingCreatorStep)e.Item.DataItem; + + if (!i.HideFromNavigation) + { + Literal _class = (Literal)e.Item.FindControl("lt_class"); + Literal _name = (Literal)e.Item.FindControl("lt_name"); + + if (i.Alias == _currentStep) + _class.Text = _currentStepClass; + + + stepCounter++; + _name.Text = i.Name; + + + //setup links to move back and forward through steps + if (_projectId != null) + { + _name.Text = string.Format("{0}", _name.Text); + } + } + else + e.Item.Visible = false; + } + } + + + public void GotoNextStep(string currentStep, int projectId) + { + ListingSteps().Get(currentStep).Completed = true; + ListingCreatorStep _s = ListingSteps().GotoNextStep(currentStep); + Response.Redirect("edit?editorStep=" + _s.Alias + "&id=" + projectId); + } + + public void GoToPreviousStep(string currentStep, int projectId) + { + ListingCreatorStep _s = ListingSteps().GotoPreviousStep(currentStep); + Response.Redirect("edit?editorStep=" + _s.Alias + "&id=" + projectId); + } + + + #region Web Form Designer generated code + override protected void OnInit(EventArgs e) + { + InitializeComponent(); + base.OnInit(e); + + + + _vendor = ((IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]).GetVendorById(Member.GetCurrentMember().Id); + + if (_projectId != null) + { + _project = ((IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]).GetListing((int)_projectId); + + + //check security to make sure the project belongs to the vendor + if (!((_project.Vendor.Member.Id == _vendor.Member.Id) || Utills.IsProjectContributor(_vendor.Member.Id, (int)_projectId))) + { + //this project does not belong to this member so kick them back to the project list in their profile. + Response.Redirect("~/member/profile/projects/"); + } + } + + _currentStep = umbraco.helper.Request("editorStep"); + + ListingCreatorStep _s; + + if (string.IsNullOrEmpty(_currentStep)) + _s = ListingSteps()["details"]; + else + _s = ListingSteps()[_currentStep]; + + loadContent(_s); + } + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + + } + #endregion + + + + private static ListingCreatorStepCollection ListingSteps() + { + ListingCreatorStepCollection lcs = new ListingCreatorStepCollection(); + lcs.Add(new Details(), _vendor.Member.IsDeliVendor); + lcs.Add(new Files(), _vendor.Member.IsDeliVendor); + lcs.Add(new Screenshots(), _vendor.Member.IsDeliVendor); + + //only add the licensing step is the project is commercial + if (_project != null) + lcs.Add(new Licenses(), (_project.ListingType == ListingType.commercial && _vendor.Member.IsDeliVendor)); + + lcs.Add(new Complete(), _vendor.Member.IsDeliVendor); + return lcs; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs new file mode 100644 index 00000000..cadbd376 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package { + + + public partial class Editor { + + /// + /// StepNavigation control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater StepNavigation; + + /// + /// Step control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + public global::System.Web.UI.HtmlControls.HtmlInputHidden Step; + + /// + /// StepPlaceHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder StepPlaceHolder; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx new file mode 100644 index 00000000..8655149d --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx @@ -0,0 +1,22 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Complete.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Complete" %> + + +

Complete and Send Live

+ +
+ +
+ + +
+ Make "" public +

By checking the following box your project will become public as long as you have met all of the terms & conditions of listing. If there are any problems displayed above please recitify and try again.

+

+ +

+
+ +
+   + +
\ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs new file mode 100644 index 00000000..db528ede --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.BusinessLogic; +using Marketplace.Helpers; + +namespace Marketplace.usercontrols.Deli.Package.Steps +{ + public partial class Complete : System.Web.UI.UserControl + { + public string NotificationClass; + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + IListingItem project = provider.GetListing((int)ProjectId); + var eligible = Listing.CheckEligibility(project); + NotificationMessage.Text = eligible.Message; + NotificationClass = (eligible.IsEligible) ? "eligible" : "notEligible"; + + ProjectName.Text = project.Name; + + Live.Checked = project.Live; + + + if (!eligible.IsEligible) + { + MoveNext.Enabled = false; + } + } + + + } + + protected void Complete_Click(object sender, EventArgs e) + { + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = ProjectsProvider.GetListing((int)ProjectId); + project.Live = Live.Checked; + ProjectsProvider.SaveOrUpdate(project); + Response.Redirect(project.NiceUrl); + } + + protected void MoveLast(object sender, EventArgs e) + { + //move to the license / screenshot step + ProjectCreatorHelper.MoveToPreviousStep(this, (int)ProjectId); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs new file mode 100644 index 00000000..c8e01c36 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package.Steps { + + + public partial class Complete { + + /// + /// eligibilityNotice control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder eligibilityNotice; + + /// + /// NotificationMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal NotificationMessage; + + /// + /// ProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectName; + + /// + /// Live control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox Live; + + /// + /// MovePrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton MovePrevious; + + /// + /// MoveNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MoveNext; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx new file mode 100644 index 00000000..ebf65837 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx @@ -0,0 +1,148 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Details.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Details" %> + +

Project Details

+
+
+ Project Information +

+ Title + +

+

+ Development Status + + ex: "Beta", "Experimental" etc +

+ +

+ Free or Commercial + + + + + Are you intending to sell this or give it away free? +

+ +

+ Current Version + +

+

+ Project is stable + + Can this safely be installed in a production enviroment?
+

+
+
+ Project Category +

+ + This will help users find your package +

+ +
+
+ Project Description +

Be clear and to the point about what your project does. Provide simple examples of how to use your project. DO NOT ask for Karma Votes. If you mention Karma in your description we will instantly mark your project as SPAM.

+

+ +

Project Description

+ +

+
+
+ Project Tags +

+ +

+
+ +
+ License Information +

+ License Name + +

+

+ License Url + +

+
+
+ Resources +

+ Project Url + + If you have a project website somewhere else, (like codeplex.com) link to it here. +

+

+ Demonstration Url + + url to where a demonstration or demostration video / description can be found +

+

+ Source Code Url + + url to where the source code is stored, (ie: codeplex.com, github.com etc) +

+

+ Bug tracking Url + + url where users can go to get support and log bugs. (ie: codeplex.com discussion, github.com bug tracking etc) +

+
+
+ Analytics and tracking +

To best understand how your Project is performing, we suggest that you sign up to Google Analytics and track your project. All you need to do is enter your tracking code. We will pass you custom tracking events such as views, downloads etc

+

+ Google Analytics Code + +

+
+
+ Collaboration +

Are you looking for help making this package great? Why not open it up for collaboration?

+

+ +

+
+ + +
+ The legal part +

+ + Read the Terms for Commercial projects here +

+
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs new file mode 100644 index 00000000..299d45aa --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs @@ -0,0 +1,223 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Providers.Helpers; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.ListingItem; +using Marketplace.BusinessLogic.ListingCreator; +using umbraco.cms.businesslogic.member; +using Marketplace.BusinessLogic; +using Marketplace.Helpers; +using umbraco.NodeFactory; +using System.Text.RegularExpressions; + +namespace Marketplace.usercontrols.Deli.Package.Steps +{ + public partial class Details : System.Web.UI.UserControl + { + + public bool IsDeliVendor { get; set; } + + private bool _editMode + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + return true; + } + return false; + } + } + + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + protected override void OnInit(EventArgs e) + { + ((umbraco.UmbracoDefault)this.Page).ValidateRequest = false; + } + + protected void Page_Load(object sender, EventArgs e) + { + umbraco.library.RegisterJavaScriptFile("tinyMce", "/scripts/tiny_mce/tiny_mce_src.js"); + if (!IsPostBack) + { + SetupTags(); + BindCategories(); + + //if the user is a registered deli vendor show them the commercial options + CommercialOption.Visible = IsDeliVendor; + + + if (_editMode) + { + MoveNext.Text = "Save"; + LoadProject(); + } + else + { + MoveNext.Text = "Next"; + } + + + } + + + } + + private void SetupTags() + { + string taglist = string.Empty; + var tagProvider = ((IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]); + var tags = tagProvider.GetAllTags(); + foreach(var t in tags) + { + taglist += "\"" + t.Text + "\","; + } + + ScriptManager.RegisterStartupScript( + this, + this.GetType(), + "inittagsuggest", + " $(document).ready(function() { $('#projecttagger').autocomplete([" + taglist + "],{max: 8,scroll: true,scrollHeight: 300}); enableTagger();});", + true); + } + + + private void BindCategories() + { + var Categories = ((ICategoryProvider)MarketplaceProviderManager.Providers["CategoryProvider"]).GetAllCategories().Where(x => !x.HQOnly); + Category.DataSource = Categories; + Category.DataValueField = "Id"; + Category.DataTextField = "Name"; + Category.DataBind(); + } + + protected void LoadProject() + { + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = ProjectsProvider.GetListing((int)ProjectId); + + Title.Text = project.Name; + Description.Text = project.Description; + CurrentVersion.Text = project.CurrentVersion; + DevStatus.Text = project.DevelopmentStatus; + Stable.Checked = project.Stable; + CommercialOrFree.SelectedValue = project.ListingType.ListingTypeAsString(); + LicenseName.Text = project.LicenseName; + LicenseUrl.Text = project.LicenseUrl; + ProjectUrl.Text = project.ProjectUrl; + SourceCodeUrl.Text = project.SourceCodeUrl; + DemoUrl.Text = project.DemonstrationUrl; + Category.SelectedValue = project.CategoryId.ToString(); + SupportUrl.Text = project.SupportUrl; + GaCode.Text = project.GACode; + Collab.Checked = project.OpenForCollab; + Terms.Checked = project.TermsAgreementDate != new DateTime(); + + + + var tagProvider = ((IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]); + var projecttags = tagProvider.GetTagsByProjectId((int)ProjectId); + + if (projecttags.Count() > 0) + { + string stags = string.Empty; + foreach (var tag in projecttags) + { + stags += tag.Text + ","; + } + + stags = stags.Substring(0, stags.Length - 1); + + ScriptManager.RegisterStartupScript( + this, + this.GetType(), + "inittags", + " $(document).ready(function() {$('#projecttagger').addTag('" + stags + "');});", + true); + } + + + + } + + + protected void SaveStep(object sender, EventArgs e) + { + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = (_editMode) ? ProjectsProvider.GetListing((int)ProjectId) : new ListingItem(null,null,null); + + project.Name = Title.Text; + project.Description = Description.Text; + project.CurrentVersion = CurrentVersion.Text; + project.DevelopmentStatus = DevStatus.Text; + project.Stable = Stable.Checked; + project.LicenseName = LicenseName.Text; + project.LicenseUrl = LicenseUrl.Text; + project.ProjectUrl = ProjectUrl.Text; + project.SourceCodeUrl = SourceCodeUrl.Text; + project.DemonstrationUrl = DemoUrl.Text; + project.CategoryId = Int32.Parse(Category.SelectedValue); + project.SupportUrl = SupportUrl.Text; + + if (!_editMode) + { + project.Vendor = ((IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]).GetVendorById(Member.GetCurrentMember().Id); + } + + project.OpenForCollab = Collab.Checked; + project.GACode = GaCode.Text; + project.ProjectGuid = (project.ProjectGuid == Guid.Empty)?Guid.NewGuid():project.ProjectGuid; //this is used as the Unique project ID. + project.ListingType = (CommercialOption.Visible) ? (ListingType)Enum.Parse(typeof(ListingType), (string)CommercialOrFree.SelectedValue, true) : ListingType.free; + + project.TermsAgreementDate = DateTime.Now.ToUniversalTime(); + + ProjectsProvider.SaveOrUpdate(project); + ProjectId = project.Id; + + if (Request["projecttags[]"] != null) + { + var tagProvider = ((IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]); + tagProvider.SetTags(project.Id, Request["projecttags[]"].ToString()); + project.Tags = tagProvider.GetTagsByProjectId(project.Id); + ProjectsProvider.SaveOrUpdate(project); + } + + //move to the file upload step + ProjectCreatorHelper.MoveToNextStep(this, (int)ProjectId); + + + } + + protected string[] GetSelected(ListBox lb) + { + var strArr = ""; + foreach(ListItem li in lb.Items){ + if(li.Selected) strArr+=li.Value + ","; + } + + return strArr.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs new file mode 100644 index 00000000..fcb3f1cf --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs @@ -0,0 +1,186 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package.Steps { + + + public partial class Details { + + /// + /// Title control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Title; + + /// + /// DevStatus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox DevStatus; + + /// + /// CommercialOption control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CommercialOption; + + /// + /// CommercialOrFree control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList CommercialOrFree; + + /// + /// CurrentVersion control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox CurrentVersion; + + /// + /// Stable control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox Stable; + + /// + /// Category control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList Category; + + /// + /// Description control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Description; + + /// + /// LicenseName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox LicenseName; + + /// + /// LicenseUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox LicenseUrl; + + /// + /// ProjectUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox ProjectUrl; + + /// + /// DemoUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox DemoUrl; + + /// + /// SourceCodeUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox SourceCodeUrl; + + /// + /// SupportUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox SupportUrl; + + /// + /// GaCode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox GaCode; + + /// + /// Collab control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox Collab; + + /// + /// LegalDisplay control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder LegalDisplay; + + /// + /// Terms control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox Terms; + + /// + /// MoveNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MoveNext; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx new file mode 100644 index 00000000..da91000e --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx @@ -0,0 +1,237 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Files.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Files" %> +

Files

+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Current project files +

+ + + + + + + + + + + + + + + + + + +
FileTypeCompatible Version.NET VersionTrust LevelUploadedDefault ReleaseArchiveDelete
+

+
+ + + + + +
+ Upload file + +
+ +
+ +

+ + +

+
+ (10 MB max) +
+ +
+ +
+ + +
+

+ + +

+ + + +

+ +

+ +

+ +
+ +

+ +

+ + +
+

+ +

+ + +
+

+ +

+ +

+ +
+
+  + +
+
+
+ + + + +
+ \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs new file mode 100644 index 00000000..69bcd500 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs @@ -0,0 +1,315 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using our; +using Marketplace.BusinessLogic; +using Marketplace.Umbraco.BusinessLogic; +using Marketplace.Providers.Helpers; +using Marketplace.Helpers; +using Marketplace.Providers.MediaFile; + +namespace Marketplace.usercontrols.Deli.Package.Steps +{ + public partial class Files : System.Web.UI.UserControl + { + + public string MemberGuid = ""; + public string ProjectGuid = ""; + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + private string _defaultFile + { + get; + set; + } + + + //called after upload. + private void RebindFiles() + { + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var files = fileProvider.GetMediaFilesByProjectId((int)ProjectId).Where(x => x.FileType != FileType.screenshot); + if (string.IsNullOrEmpty(_defaultFile)) + { + var defaultFile = files.OrderByDescending(x => x.CreateDate).FirstOrDefault(); + + if (defaultFile != null) + { + MarkFileAsCurrent(defaultFile.Id.ToString()); + } + } + + + rp_packagefiles.DataSource = files; + rp_packagefiles.Visible = (files.Count() > 0); + rp_packagefiles.DataBind(); + } + + + protected void DeleteFile(object sender, CommandEventArgs e) + { + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var f = fileProvider.GetFileById(int.Parse(e.CommandArgument.ToString())); + + var mem = Member.GetCurrentMember(); + + if (f.CreatedBy == mem.Id || Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + + //if the file is the default file we need to clear it out of the system to stop it showing as the default download + if (f.Id.ToString() == _defaultFile) + { + _defaultFile = string.Empty; + var listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = listingProvider.GetListing((int)ProjectId); + project.CurrentReleaseFile = _defaultFile; + listingProvider.SaveOrUpdate(project); + + } + fileProvider.Remove(f); + + RebindFiles(); + } + + protected void ArchiveFile(object sender, CommandEventArgs e) + { + + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var f = fileProvider.GetFileById(int.Parse(e.CommandArgument.ToString())); + + if (e.CommandName == "Unarchive") + { + f.Archived = false; + } + else + { + f.Archived = true; + } + + fileProvider.SaveOrUpdate(f); + RebindFiles(); + } + + protected void OnFileBound(object sender, RepeaterItemEventArgs e) + { + if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem) + { + IMediaFile f = (IMediaFile)e.Item.DataItem; + Literal _name = (Literal)e.Item.FindControl("lt_name"); + Literal _date = (Literal)e.Item.FindControl("lt_date"); + Button _delete = (Button)e.Item.FindControl("bt_delete"); + Literal _type = (Literal)e.Item.FindControl("lt_type"); + Literal _version = (Literal)e.Item.FindControl("lt_version"); + Literal _dotNetVersion = (Literal)e.Item.FindControl("lt_dotNetVersion"); + Literal _trustLevel = (Literal)e.Item.FindControl("lt_trustlevel"); + Literal _currentRelease = (Literal)e.Item.FindControl("lt_currentRelease"); + + Button _defaultPackageFile = (Button)e.Item.FindControl("bt_default"); + if (f.FileType == FileType.package) + { + if (f.Id.ToString() == _defaultFile) + { + _defaultPackageFile.Visible = false; + _currentRelease.Visible = true; + _currentRelease.Text = "Current"; + } + else + { + _defaultPackageFile.Text = "Make Current"; + _defaultPackageFile.CommandArgument = f.Id.ToString(); + _currentRelease.Visible = false; + } + } + else + { + _defaultPackageFile.Visible = false; + _currentRelease.Visible = false; + + } + + + Button _archive = (Button)e.Item.FindControl("bt_archive"); + _archive.CommandArgument = f.Id.ToString(); + + + if (f.Archived) + { + _archive.Text = "Unarchive"; + _archive.CommandName = "Unarchive"; + } + else + { + _archive.Text = "Archive"; + _archive.CommandName = "Archive"; + } + + if (f.FileType == FileType.screenshot) + { + _archive.Visible = false; + } + + if (f.UmbVersion != null) + _version.Text = f.UmbVersion.ToVersionString(); + + if (f.DotNetVersion != null) + _dotNetVersion.Text = f.DotNetVersion; + + _trustLevel.Text = (f.SupportsMediumTrust)?"Medium":"Full"; + + + switch (f.FileType) + { + case FileType.screenshot: + _type.Text = "Screenshot"; + break; + case FileType.package: + _type.Text = "Package"; + break; + case FileType.hotfix: + _type.Text = "Hot Fix"; + break; + case FileType.docs: + _type.Text = "Document"; + break; + case FileType.source: + _type.Text = "Source"; + break; + default: + break; + } + + _name.Text = "" + f.Name + ""; + _date.Text = f.CreateDate.ToShortDateString() + " - " + f.CreateDate.ToShortTimeString(); + _delete.CommandArgument = f.Id.ToString(); + + } + } + + protected void SetDefaultPackage(object sender, CommandEventArgs e) + { + var releaseFile = e.CommandArgument.ToString(); + MarkFileAsCurrent(releaseFile); + RebindFiles(); + } + + private void MarkFileAsCurrent(string releaseFile) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + IListingItem project = provider.GetListing((int)ProjectId); + project.CurrentReleaseFile = releaseFile; + provider.SaveOrUpdate(project); + _defaultFile = project.CurrentReleaseFile; + } + + protected void Page_Load(object sender, EventArgs e) + { + + + if (umbraco.library.IsLoggedOn() && ProjectId != null) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + Member mem = Member.GetCurrentMember(); + IListingItem project = provider.GetListing((int)ProjectId); + _defaultFile = project.CurrentReleaseFile; + + + + + if ((project.Vendor.Member.Id == mem.Id) || + Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + { + holder.Visible = true; + RebindFiles(); + + umbraco.library.RegisterJavaScriptFile("swfUpload", "/scripts/swfupload/SWFUpload.js"); + umbraco.library.RegisterJavaScriptFile("swfUpload_cb", "/scripts/swfupload/callbacks.js"); + umbraco.library.RegisterJavaScriptFile("swfUpload_progress", "/scripts/swfupload/fileprogress.js"); + + MemberGuid = mem.UniqueId.ToString(); + ProjectGuid = project.ProjectGuid.ToString(); + + string defaultVersion = UmbracoVersion.DefaultVersion().Version; + string umboptions = ""; + + foreach (UmbracoVersion uv in UmbracoVersion.AvailableVersions().Values) + { + string selected = "checked='true'"; + if (uv.Version != defaultVersion) + selected = ""; + umboptions += string.Format(" {1}
", uv.Version, uv.Name, selected); + } + + lt_versions.Text = umboptions; + + + string[] dotnetversions = {"2.0","3.5","4.0"}; + string dotnetoptions = string.Empty; + + foreach (var opt in dotnetversions) + { + string selected = "selected='true'"; + if (opt != "4.0") + selected = ""; + dotnetoptions += string.Format("", opt, opt, selected); + + } + + lt_dotnetversions.Text = dotnetoptions; + + + string[] trustlevels = { "Full", "Medium" }; + string trustoptions = string.Empty; + + foreach (var opt in trustlevels) + { + string selected = "selected='true'"; + if (opt != "Full") + selected = ""; + trustoptions += string.Format("", opt, opt, selected); + + } + + lt_trustlevels.Text = trustoptions; + + + + } + + + } + + } + + protected void SaveStep(object sender, EventArgs e) + { + //move to the file upload step + ProjectCreatorHelper.MoveToNextStep(this,(int)ProjectId); + } + protected void MoveLast(object sender, EventArgs e) + { + //move to the details step + ProjectCreatorHelper.MoveToPreviousStep(this, (int)ProjectId); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs new file mode 100644 index 00000000..93ac7b64 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package.Steps { + + + public partial class Files { + + /// + /// holder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder holder; + + /// + /// rp_packagefiles control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater rp_packagefiles; + + /// + /// lt_versions control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lt_versions; + + /// + /// lt_dotnetversions control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lt_dotnetversions; + + /// + /// lt_trustlevels control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lt_trustlevels; + + /// + /// MovePrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton MovePrevious; + + /// + /// MoveNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MoveNext; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx new file mode 100644 index 00000000..fbf445fd --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx @@ -0,0 +1,138 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Licenses.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Licenses" %> +

Licenses

+ +
+ + +
+ Edit License Type +

+ + + +

+ +

+ + +

+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
License TypePrice 
+ + + + +   + + +
+ + + NOTE: Only licenses types that have not been purchased by users can be deleted. If a license has been purchased you may disable it. + +
+ Create License Type +

+ + + + + + + + +

+ +

+ + +

+ +

+ +

+ +
+

Your Vendor Key

+ + Generate your project key. This will generate a unique key for your project. This step can only be done once so click wisely. + + + Download your Vendor Key for your project. This License Key file is used in your code when you implement Deli Licensing in your project. + +

Your Packages Unique Deli Id

+

+
+
+   + +
+
+ +
+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs new file mode 100644 index 00000000..435f751a --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs @@ -0,0 +1,267 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using our; +using Marketplace.Providers.License; +using Marketplace.Providers.Helpers; +using Marketplace.Helpers; +using Marketplace.Providers.Accounting; +using System.Text.RegularExpressions; + +namespace Marketplace.usercontrols.Deli.Package.Steps +{ + public partial class Licenses : System.Web.UI.UserControl + { + private Guid _projectGuid; + + + private bool _editMode + { + get + { + if (!string.IsNullOrEmpty(Request["projectId"])) + { + return true; + } + return false; + } + } + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + + private void ReBindLicenses() + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var licenses = licenseProvider.GetProjectLicenses(_projectGuid); + rp_licenses.DataSource = licenses; + rp_licenses.Visible = (licenses.Count() > 0); + rp_licenses.DataBind(); + } + + protected void EditLicense(object sender, CommandEventArgs e) + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var license = licenseProvider.GetLicense(int.Parse(e.CommandArgument.ToString())); + EditForm.Visible = true; + CreateForm.Visible = false; + EditLicenseType.Text = license.LicenseType.ToString(); + EditLicensePrice.Text = license.Price.ToString(); + UpdateLicense.CommandArgument = license.Id.ToString(); + } + + protected void UpdateLicense_Click(object sender, EventArgs e) + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var updateButton = sender as Button; + var licenseId = Int32.Parse(updateButton.CommandArgument); + + var license = licenseProvider.GetLicense(licenseId); + + license.Price = Double.Parse(EditLicensePrice.Text); + licenseProvider.SaveOrUpdate(license); + EditForm.Visible = false; + CreateForm.Visible = true; + + ReBindLicenses(); + + } + + + protected void DeleteLicense(object sender, CommandEventArgs e) + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var license = licenseProvider.GetLicense(int.Parse(e.CommandArgument.ToString())); + + var memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + if (memberLicenseProvider.GetLicensesByLicenseTypeId(license.Id).Count() == 0) + { + licenseProvider.Remove(license); + } + + //var mem = Member.GetCurrentMember(); + //if (license.CreatedBy == mem.Id || Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + + + + ReBindLicenses(); + } + + protected void DisableEnableLicense(object sender, CommandEventArgs e) + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var license = licenseProvider.GetLicense(int.Parse(e.CommandArgument.ToString())); + + license.IsActive = (license.IsActive) ? false : true; + + licenseProvider.SaveOrUpdate(license); + + ReBindLicenses(); + } + + protected void OnLicenseBound(object sender, RepeaterItemEventArgs e) + { + if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem) + { + + ILicense lic = (ILicense)e.Item.DataItem; + Button _delete = (Button)e.Item.FindControl("bt_delete"); + Button _edit = (Button)e.Item.FindControl("bt_edit"); + Button _disable = (Button)e.Item.FindControl("bt_disableEnable"); + Literal _type = (Literal)e.Item.FindControl("lt_type"); + Literal _price = (Literal)e.Item.FindControl("lt_price"); + + switch (lic.LicenseType) + { + case LicenseType.Domain: + _type.Text = "Domain"; + break; + case LicenseType.IP: + _type.Text = "IP"; + break; + case LicenseType.Unlimited: + _type.Text = "Unlimited"; + break; + case LicenseType.SourceCode: + _type.Text = "Source Code"; + break; + default: + break; + } + + _price.Text = DeliCurrency.NiceMoney((decimal)lic.Price, DeliCurrency.FromSymbol("EUR")); + + _delete.CommandArgument = lic.Id.ToString(); + _disable.CommandArgument = lic.Id.ToString(); + _edit.CommandArgument = lic.Id.ToString(); + + if (lic.IsActive) + { + _disable.Text = "Disable"; + } + else + { + _disable.Text = "Enable"; + } + + var memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["MemberLicenseProvider"]; + if (memberLicenseProvider.GetLicensesByLicenseTypeId(lic.Id).Count() == 0) + { + _delete.Visible = true; + } + + } + } + + + + protected void SaveLicense_Click(object sender, EventArgs e) + { + var lic = new Marketplace.Providers.License.License(); + lic.LicenseType = (LicenseType)Enum.Parse(typeof(LicenseType), (string)licenseTypes.SelectedValue, true); + lic.Price = double.Parse(price.Text); + lic.ProjectGuid = _projectGuid; + + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + licenseProvider.SaveOrUpdate(lic); + + ReBindLicenses(); + + } + + + protected void Page_Load(object sender, EventArgs e) + { + if (umbraco.library.IsLoggedOn() && ProjectId != null) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + Member mem = Member.GetCurrentMember(); + IListingItem project = provider.GetListing((int)ProjectId); + + DownloadKeyPlaceHolder.Visible = !string.IsNullOrEmpty(project.LicenseKey); + GenKeyPlaceHolder.Visible = string.IsNullOrEmpty(project.LicenseKey); + + _projectGuid = project.ProjectGuid; + + if ((project.Vendor.Member.Id == mem.Id) || + Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + { + holder.Visible = true; + ReBindLicenses(); + uniqueId.Text = _projectGuid.ToString(); + } + } + } + + protected void GenKey_Click(object sender, EventArgs e) + { + GenKeyPlaceHolder.Visible = false; + DownloadKeyPlaceHolder.Visible = true; + + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = provider.GetListing(_projectGuid); + + var licenseGenerator = new Marketplace.Providers.MemberLicense.MemberLicenseGenerator(); + var projectName = Regex.Replace(project.Vendor.VendorCompanyName, @"[\W]", "") + + Regex.Replace(project.Name, @"[\W]", ""); + project.LicenseKey = licenseGenerator.GenerateXMLKey(projectName.ToLower(), project.ProjectGuid.ToString()); + provider.SaveOrUpdate(project); + } + + protected void DownloadKey_Click(object sender, EventArgs e) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var project = provider.GetListing(_projectGuid); + + if (!string.IsNullOrEmpty(project.LicenseKey)) + { + var licenseGenerator = new Marketplace.Providers.MemberLicense.MemberLicenseGenerator(); + var licenseKey = licenseGenerator.GenerateVendorKey(project.LicenseKey); + + // the license key file name + var projectName = Regex.Replace(project.Vendor.VendorCompanyName, @"[\W]", "") + + Regex.Replace(project.Name, @"[\W]", ""); + + HttpContext context = HttpContext.Current; + context.Response.Clear(); + context.Response.Write(licenseKey); + context.Response.ContentType = "text/xml"; + context.Response.AppendHeader("Content-Disposition", "attachment; filename=" + projectName.ToLower() + ".ils"); + context.Response.End(); + } + } + + protected void SaveStep(object sender, EventArgs e) + { + //move to the license step + ProjectCreatorHelper.MoveToNextStep(this, (int)ProjectId); + } + + protected void MoveLast(object sender, EventArgs e) + { + //move to the screenshots step + ProjectCreatorHelper.MoveToPreviousStep(this, (int)ProjectId); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs new file mode 100644 index 00000000..41f492fe --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package.Steps { + + + public partial class Licenses { + + /// + /// holder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder holder; + + /// + /// EditForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder EditForm; + + /// + /// EditLicenseType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox EditLicenseType; + + /// + /// EditLicensePrice control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox EditLicensePrice; + + /// + /// UpdateLicense control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button UpdateLicense; + + /// + /// rp_licenses control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater rp_licenses; + + /// + /// CreateForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CreateForm; + + /// + /// licenseTypes control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList licenseTypes; + + /// + /// price control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox price; + + /// + /// btn_SaveLicense control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btn_SaveLicense; + + /// + /// GenKeyPlaceHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder GenKeyPlaceHolder; + + /// + /// GenKey control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton GenKey; + + /// + /// DownloadKeyPlaceHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DownloadKeyPlaceHolder; + + /// + /// DownloadKey control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton DownloadKey; + + /// + /// uniqueId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal uniqueId; + + /// + /// MovePrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton MovePrevious; + + /// + /// MoveNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MoveNext; + } +} diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx new file mode 100644 index 00000000..8febd29d --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx @@ -0,0 +1,150 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Screenshots.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Screenshots" %> +

Screenshots

+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+Current Screenshots +

+ + + + + + + + + + + + + +
ImageUploadedDefaultDelete
+

+
+ + + + + +
+ Upload file + +
+ +
+ +

+ + +

+
+ (10 MB max) +
+ +
+ +
+ + +
+

+ +

+ +

+ +
+
+
+ + +
+   + +
+
+ \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs new file mode 100644 index 00000000..94fba52d --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs @@ -0,0 +1,197 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using our; +using Marketplace.Umbraco.BusinessLogic; +using Marketplace.Providers.Helpers; +using Marketplace.Helpers; + +namespace Marketplace.usercontrols.Deli.Package.Steps +{ + public partial class Screenshots : System.Web.UI.UserControl + { + + public string MemberGuid = ""; + public string ProjectGuid = ""; + + + private int? _projectId; + public int? ProjectId + { + get + { + if (!string.IsNullOrEmpty(Request["id"])) + { + _projectId = Int32.Parse(Request["id"]); + } + return _projectId; + } + set + { + _projectId = value; + } + } + + private string _defaultFile + { + get; + set; + } + + private void RebindFiles() + { + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var files = fileProvider.GetMediaFilesByProjectId((int)ProjectId).Where(x=>x.FileType == FileType.screenshot); + + if (string.IsNullOrEmpty(_defaultFile)) + { + var defaultFile = files.OrderByDescending(x => x.CreateDate).FirstOrDefault(); + + if (defaultFile != null) + { + MarkFileAsCurrent(defaultFile.Path); + } + } + + rp_screenshots.DataSource = files; + rp_screenshots.Visible = (files.Count() > 0); + rp_screenshots.DataBind(); + } + + + protected void DeleteFile(object sender, CommandEventArgs e) + { + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var f = fileProvider.GetFileById(int.Parse(e.CommandArgument.ToString())); + _defaultFile = string.Empty; + + //update the project + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + IListingItem project = provider.GetListing((int)ProjectId); + project.DefaultScreenshot = _defaultFile; + provider.SaveOrUpdate(project); + + + + var mem = Member.GetCurrentMember(); + + if (f.CreatedBy == mem.Id || Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + fileProvider.Remove(f); + + RebindFiles(); + } + + protected void ArchiveFile(object sender, CommandEventArgs e) + { + + var fileProvider = (IMediaProvider)MarketplaceProviderManager.Providers["MediaProvider"]; + var f = fileProvider.GetFileById(int.Parse(e.CommandArgument.ToString())); + + if (e.CommandName == "Unarchive") + { + f.Archived = false; + } + else + { + f.Archived = true; + } + + fileProvider.SaveOrUpdate(f); + RebindFiles(); + } + + protected void OnFileBound(object sender, RepeaterItemEventArgs e) + { + if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem) + { + IMediaFile f = (IMediaFile)e.Item.DataItem; + Image _image = (Image)e.Item.FindControl("img_image"); + Literal _date = (Literal)e.Item.FindControl("lt_date"); + Button _delete = (Button)e.Item.FindControl("bt_delete"); + Literal _defaultScreenshot = (Literal)e.Item.FindControl("lt_default"); + + Button _defaultScreenshotButton = (Button)e.Item.FindControl("bt_default"); + + if (f.Path == _defaultFile) + { + _defaultScreenshotButton.Visible = false; + _defaultScreenshot.Visible = true; + _defaultScreenshot.Text = "Default"; + } + else + { + _defaultScreenshotButton.Text = "Make Default"; + _defaultScreenshotButton.CommandArgument = f.Path; + _defaultScreenshot.Visible = false; + } + + _image.ImageUrl = "/umbraco/imagegen.ashx?image=" + f.Path + "&height=100"; + _date.Text = f.CreateDate.ToShortDateString() + " - " + f.CreateDate.ToShortTimeString(); + _delete.CommandArgument = f.Id.ToString(); + + } + } + + protected void SetDefaultImage(object sender, CommandEventArgs e) + { + var defaultScreenshot = e.CommandArgument.ToString(); + MarkFileAsCurrent(defaultScreenshot); + RebindFiles(); + } + + private void MarkFileAsCurrent(string defaultScreenshot) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + IListingItem project = provider.GetListing((int)ProjectId); + project.DefaultScreenshot = defaultScreenshot; + provider.SaveOrUpdate(project); + _defaultFile = project.DefaultScreenshot; + } + + protected void Page_Load(object sender, EventArgs e) + { + + + if (umbraco.library.IsLoggedOn() && ProjectId != null) + { + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + Member mem = Member.GetCurrentMember(); + IListingItem project = provider.GetListing((int)ProjectId); + _defaultFile = project.DefaultScreenshot; + + + if ((project.Vendor.Member.Id == mem.Id) || + Utills.IsProjectContributor(mem.Id, (int)ProjectId)) + { + holder.Visible = true; + RebindFiles(); + + umbraco.library.RegisterJavaScriptFile("swfUpload", "/scripts/swfupload/SWFUpload.js"); + umbraco.library.RegisterJavaScriptFile("swfUpload_cb", "/scripts/swfupload/callbacks.js"); + umbraco.library.RegisterJavaScriptFile("swfUpload_progress", "/scripts/swfupload/fileprogress.js"); + + MemberGuid = mem.UniqueId.ToString(); + ProjectGuid = project.ProjectGuid.ToString(); + } + } + } + + protected void SaveStep(object sender, EventArgs e) + { + //move to the license step + ProjectCreatorHelper.MoveToNextStep(this,(int)ProjectId); + } + + protected void MoveLast(object sender, EventArgs e) + { + //move to the files step + ProjectCreatorHelper.MoveToPreviousStep(this, (int)ProjectId); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs new file mode 100644 index 00000000..deea0bf0 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Package.Steps { + + + public partial class Screenshots { + + /// + /// holder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder holder; + + /// + /// rp_screenshots control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater rp_screenshots; + + /// + /// MovePrevious control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton MovePrevious; + + /// + /// MoveNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button MoveNext; + } +} diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx new file mode 100644 index 00000000..232acb03 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx @@ -0,0 +1,121 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorPayout.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Payout.VendorPayout" %> +<%@ Import Namespace="Marketplace.Interfaces" %> + +

Eligable Orders

+

Payouts are given on orders occured in the previous month and have not been refunded.

+

To view past payout requests View your payout history.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Select allPackageLicensePurchaserCountryVAT #Order DatePayout Value*
+ + + <%# Eval("Package") %><%# Eval("LicenseTypeName") %>"><%# ((IMember)Eval("Member")).Name %><%# ((IMember)Eval("Member")).CompanyCountry %><%# ((IMember)Eval("Member")).CompanyVATNumber %><%# Eval("OrderDate") %><%# Eval("PayoutAmount") %>
Select Payout Items Total*:€0.00
+* your profit after any vouchers & fees have been removed + + + + +
+
+ Generate your payout request +

+ + +

+If you are required to generate an invoice against your income please use this field to record your invoice +
+
+
+ + + + + + +
+

There are currently no orders eligable for payout. View your payout history

+
+ + + + + + +<%-- + // temporary notification code. + umbraco.library.SendMail("nh@umbraco.dk", "nh@umbraco.dk", "Payout requested", "Hey Niels, There's a payout requested. Check our.umbraco.org/umbraco/",true); + + --%> + + + + +

Payout Submitted

+
+

Your payout request has been sent for processing. All payouts are processed on the 20th of the month. View your payout history

+
+ \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.cs b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.cs new file mode 100644 index 00000000..18b70945 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.cs @@ -0,0 +1,137 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using NotificationsCore; + +namespace Marketplace.usercontrols.Deli.Payout +{ + public partial class VendorPayout : System.Web.UI.UserControl + { + + + public int PayoutHistoryPage { get; set; } + protected string HistoryPage; + + private IDeliOrderItemProvider _orderItemProvider; + private IOrderProvider _orderProvider; + private IMemberProvider _memberProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private ILicenseProvider _licenseProvider; + private IPayoutProvider _payoutProvider; + private IVendor vendor; + + + protected void Page_Load(object sender, EventArgs e) + { + + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + _payoutProvider = (IPayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + + IMember mem = _memberProvider.GetCurrentMember(); + vendor = _vendorProvider.GetVendorByGuid(mem.UniqueId); + + HistoryPage = umbraco.library.NiceUrl(PayoutHistoryPage); + + if (!IsPostBack) + { + BindOrderItems(); + } + } + + protected void BindOrderItems() + { + + + DateTime now = DateTime.Now; + + DateTime lastDayLastMonth = new DateTime(now.Year, now.Month, 1); + lastDayLastMonth = lastDayLastMonth.AddDays(-1); + + + // bind the table to any order that has not been paid out and does not have a payout id + var items = _orderItemProvider.GetOrderItemsForPayout(vendor.Member.Id, lastDayLastMonth) + .Where(x => x.PayoutId == null) + .Select(x => new + { + Id = x.Id, + Package = _listingProvider.GetListing(x.ListingItemId,true).Name, + LicenseTypeName = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Member = _orderProvider.GetOrder(x.OrderId).Member, + PayoutAmount = x.PayoutAmount, + OrderDate = string.Format("{0:D}",x.CreateDate) + }); + + + if (items.Count() > 0) + { + PayoutList.DataSource = items; + PayoutList.DataBind(); + payoutForm.Visible = true; + NoPayouts.Visible = false; + } + else + { + payoutForm.Visible = false; + NoPayouts.Visible = true; + } + } + + protected void PayoutRequest_Click(object s, EventArgs e) + { + // Create the new payout + var payout = new Marketplace.Providers.Payout.Payout(); + payout.VendorRef = vendor_reference.Text; + payout.Guid = Guid.NewGuid(); + payout.PayoutDate = DateTime.Now; + payout.VendorId = vendor.Member.Id; + payout.Processed = false; + _payoutProvider.SaveOrUpdate(payout); + + + //grab the list of orderitems that this payout applies to + + List items = new List(); + foreach (RepeaterItem ri in PayoutList.Items) + { + if (ri.ItemType != ListItemType.Header || ri.ItemType != ListItemType.Footer) + { + var check = (CheckBox)ri.FindControl("RowCheckbox"); + if (check.Checked) + { + var itemID = Int32.Parse(((HiddenField)ri.FindControl("RowId")).Value); + var orderItem = _orderItemProvider.GetOrderItem(itemID); + + //set the payout id for the order items + orderItem.PayoutId = payout.Id; + _orderItemProvider.SaveOrUpdate(orderItem); + + //add to the list of the order items for the payout + items.Add(orderItem); + } + } + } + + payout.OrderItems = items; + + //send notification to Niels :) + InstantNotification not = new InstantNotification(); + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliPayoutRequest", payout); + + //rebind the table to remove any that have been set as paid out + payoutHolder.Visible = false; + PayoutThanks.Visible = true; + } + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.designer.cs b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.designer.cs new file mode 100644 index 00000000..7d1e7753 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayout.ascx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Payout { + + + public partial class VendorPayout { + + /// + /// payoutHolder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder payoutHolder; + + /// + /// payoutForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder payoutForm; + + /// + /// PayoutList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater PayoutList; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// vendor_reference control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox vendor_reference; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + + /// + /// NoPayouts control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NoPayouts; + + /// + /// PayoutThanks control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PayoutThanks; + } +} diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx new file mode 100644 index 00000000..717f75dc --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx @@ -0,0 +1,93 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorPayoutHistory.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Payout.VendorPayoutHistory" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +

Payout History

+

The following list shows all your past and payouts and their status

+ + + + + + + + + + + + + + + + + + + + +"> + + + + +
DateReferenceStatusValue
+ +">[+]  +<%# Eval("PayoutDate") %> + +<%# Eval("Reference") %> + +<%# Eval("Status") %> + +€<%# Eval("PayoutAmount") %> +
+

Payout details

+ + + + + + + + + + + + + + + + + + + + + + + + + +
PackageLicensePurchaserCountryVAT #Order DatePayout Value*
<%# Eval("Package") %><%# Eval("LicenseTypeName") %>"><%# ((IMember)Eval("Member")).Name %><%# ((IMember)Eval("Member")).CompanyCountry %><%# ((IMember)Eval("Member")).CompanyVATNumber %><%# Eval("OrderDate") %>€<%# Eval("PayoutAmount") %>
+ + +
+ + + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.cs b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.cs new file mode 100644 index 00000000..b1d3ea29 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using System.Configuration; + +namespace Marketplace.usercontrols.Deli.Payout +{ + public partial class VendorPayoutHistory : System.Web.UI.UserControl + { + + private IDeliOrderItemProvider _orderItemProvider; + private IOrderProvider _orderProvider; + private IMemberProvider _memberProvider; + private IVendorProvider _vendorProvider; + private IListingProvider _listingProvider; + private ILicenseProvider _licenseProvider; + private IPayoutProvider _payoutProvider; + private IVendor vendor; + private IMember mem; + + + + + protected void Page_Load(object sender, EventArgs e) + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + _vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + _listingProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + _orderProvider = (IOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + _payoutProvider = (IPayoutProvider)MarketplaceProviderManager.Providers["PayoutProvider"]; + + + PayoutHistoryList.ItemDataBound += new RepeaterItemEventHandler(PayoutHistoryList_ItemDataBound); + + mem = _memberProvider.GetCurrentMember(); + vendor = _vendorProvider.GetVendorByGuid(mem.UniqueId); + + BindListing(); + } + + + private void BindListing() + { + var payouts = _payoutProvider.GetPayoutsByVendor(mem.Id, null, true).OrderByDescending(x => x.PayoutDate).Select(x => new + { + Id = x.Id, + PayoutDate = String.Format("{0:D}",x.PayoutDate), + Reference = x.VendorRef, + PayoutAmount = GetPayoutValue(x.OrderItems), + Status = (x.OrderItems.FirstOrDefault().IsPaidOut)?"Processed":"Pending" + }); + + PayoutHistoryList.DataSource = payouts; + PayoutHistoryList.DataBind(); + } + + protected void PayoutHistoryList_ItemDataBound(object sender, RepeaterItemEventArgs e) + { + RepeaterItem ri = (RepeaterItem)e.Item; + if (ri.ItemType == ListItemType.Item || ri.ItemType == ListItemType.AlternatingItem) + { + Repeater itemRepeater = ((RepeaterItem)e.Item).FindControl("payoutItemRepeater") as Repeater; + int rowId = Int32.Parse((((RepeaterItem)e.Item).FindControl("rowId") as HiddenField).Value); + + var payout = _payoutProvider.GetPayout(rowId); + + // bind the table to any order that has not been paid out and does not have a payout id + var items = payout.OrderItems + .Select(x => new + { + Id = x.Id, + Package = _listingProvider.GetListing(x.ListingItemId, true).Name, + LicenseTypeName = _licenseProvider.GetLicense(x.LicenseId).LicenseType.ToString(), + Member = _orderProvider.GetOrder(x.OrderId).Member, + PayoutAmount = x.PayoutAmount, + OrderDate = string.Format("{0:D}", x.CreateDate) + }); + + itemRepeater.DataSource = items; + itemRepeater.DataBind(); + } + + } + + private double GetPayoutValue(IEnumerable items) + { + double val = 0.00; + foreach (var i in items) + { + val += i.PayoutAmount; + } + + return val; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.designer.cs b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.designer.cs new file mode 100644 index 00000000..aababbfa --- /dev/null +++ b/Marketplace/usercontrols/Deli/Payout/VendorPayoutHistory.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Payout { + + + public partial class VendorPayoutHistory { + + /// + /// PayoutHistoryList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater PayoutHistoryList; + } +} diff --git a/Marketplace/usercontrols/Deli/PopularProjects.ascx b/Marketplace/usercontrols/Deli/PopularProjects.ascx new file mode 100644 index 00000000..334e581b --- /dev/null +++ b/Marketplace/usercontrols/Deli/PopularProjects.ascx @@ -0,0 +1,83 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="PopularProjects.ascx.cs" Inherits="Marketplace.usercontrols.Deli.PopularProjects" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +<%@ Import Namespace="Marketplace.Providers.Helpers" %> +<%@ Register Src="~/usercontrols/Deli/ListPagination.ascx" TagPrefix="deli" TagName="paging" %> + + +
+ +
+

Popular Projects

 + + + + + " class="viewAll">All popular + + + + +

Showing <%= PageStartListingNumber %> - <%=PageEndListingNumber %> of <%=TotalListings %> Projects

+ + + + + + + +
+ +
+ + + +
+

There are no listings that meet your filter criteria

+
+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/PopularProjects.ascx.cs b/Marketplace/usercontrols/Deli/PopularProjects.ascx.cs new file mode 100644 index 00000000..d677b9e8 --- /dev/null +++ b/Marketplace/usercontrols/Deli/PopularProjects.ascx.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli +{ + public partial class PopularProjects : UserControl + { + + public int TotalListings { get; set; } + public int PageStartListingNumber { get; set; } + public int PageEndListingNumber { get; set; } + + private string _listingType = ""; + public string ListingType + { + get { return _listingType; } + set { _listingType = value; } + } + + private int _maxPageSize = 20; + public int MaxPageSize + { + get { return _maxPageSize; } + set { _maxPageSize = value; } + } + + private int _pageNumber; + public int PageNumber + { + get + { + if (_pageNumber > 0) + return _pageNumber - 1; + + return _pageNumber; + } + set + { + _pageNumber = value; + } + } + + public bool paged { get; set; } + + protected void Page_PreRender(object sender, EventArgs e) + { + Bind_Data(); + } + + protected void Bind_Data() + { + var projectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + var skip = PageNumber * _maxPageSize; + var take = _maxPageSize; + + IEnumerable projects; + + if (paged == false) + { + switch (_listingType) + { + case "free": + projects = projectsProvider.GetListingsByPopularity(0, 0, true).Where(x => x.ListingType == Interfaces.ListingType.free).Take(take); + break; + + case "commercial": + projects = projectsProvider.GetTopPaidListings(0, 8, true); + break; + + default: + projects = projectsProvider.GetListingsByPopularity(0, take, true); + break; + } + + ListingOpen.Visible = false; + ListingClose.Visible = false; + ProjectCounter.Visible = false; + paging.Visible = false; + } + else + { + int count; + + if (_listingType == "commercial") + { + projects = projectsProvider.GetTopPaidListings(skip, take, true); + count = projectsProvider.Count(Interfaces.ListingType.commercial); + } + else + { + projects = projectsProvider.GetListingsByPopularity(0, 0, true).ToList(); + if (_listingType == "free") + { + count = projects.Count(x => x.ListingType == Interfaces.ListingType.free); + projects = projects.Where(x => x.ListingType == Interfaces.ListingType.free).Skip(skip).Take(take); + } + else + { + count = projects.Count(); + projects = projects.Skip(skip).Take(take); + } + } + + if (count > _maxPageSize) + { + paging.Visible = true; + + var numPages = (count / (decimal)_maxPageSize); + var intNumPages = Convert.ToInt32(numPages); + + + if (numPages % 1 > 0 && numPages % 1 <= (decimal)0.5) + { + intNumPages += 1; + } + + paging.NumberOfPages = intNumPages; + } + + var projectCount = projects.Count(); + + if (projectCount > 0) + { + ProjectCounter.Visible = true; + TotalListings = count; + PageStartListingNumber = skip + 1; + PageEndListingNumber = skip + projectCount; + } + else + { + ProjectCounter.Visible = false; + Listing.Visible = false; + NoListings.Visible = true; + } + + ListingOpen.Visible = true; + ListingClose.Visible = true; + WidgetTitle.Visible = false; + WidgetFeatures.Visible = false; + } + + Listing.DataSource = projects; + Listing.DataBind(); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/PopularProjects.ascx.designer.cs b/Marketplace/usercontrols/Deli/PopularProjects.ascx.designer.cs new file mode 100644 index 00000000..f69aaae0 --- /dev/null +++ b/Marketplace/usercontrols/Deli/PopularProjects.ascx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class PopularProjects { + + /// + /// ListingOpen control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ListingOpen; + + /// + /// WidgetTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder WidgetTitle; + + /// + /// WidgetFeatures control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder WidgetFeatures; + + /// + /// ProjectCounter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ProjectCounter; + + /// + /// Listing control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater Listing; + + /// + /// ListingClose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ListingClose; + + /// + /// NoListings control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NoListings; + + /// + /// paging control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.usercontrols.Deli.ListPagination paging; + } +} diff --git a/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx new file mode 100644 index 00000000..a59699e4 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MemberDataLookup.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Profile.MemberDataLookup" %> + + + + E-mail: +
+ Password: +
+ + + + + + +

Couldn't connect to umbraco.com

+

This could be because your credentials are wrong or because you're not online.

" + + + +

We retrieved the following data from umbraco.com

+ + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.cs b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.cs new file mode 100644 index 00000000..9096e8c0 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; + +namespace Marketplace.usercontrols.Deli.Profile +{ + public partial class MemberDataLookup : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void getMemberData_Click(object sender, EventArgs e) + { + try + { + lookupFailed.Visible = false; + com.umbraco.MemberLookUp service = new com.umbraco.MemberLookUp(); + com.umbraco.MemberData md = service.GetMemberData(tb_login.Text, tb_password.Text); + + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + + Member current = new Member(memberProvider.GetCurrentMember().Id); + if (current != null) + { + current.getProperty("umbracoDotComID").Value = md.Id; + + if (!string.IsNullOrEmpty(md.Address)) + { + lt_data.Text += "Company Address: " + md.Address + "
"; + current.getProperty("companyAddress").Value = md.Address; + + } + + if (!string.IsNullOrEmpty(md.Country)) + { + lt_data.Text += "Company Country: " + md.Country+ "
"; + current.getProperty("companyCountry").Value = md.Country; + } + + if (!string.IsNullOrEmpty(md.VATNumber)) + { + lt_data.Text += "Company VAT Number: " + md.VATNumber + "
"; + current.getProperty("companyVATNumber").Value = md.VATNumber; + } + + if (!string.IsNullOrEmpty(md.InvoicingEmail)) + { + lt_data.Text += "Company Invoice Email: " + md.VATNumber + "
"; + current.getProperty("companyInvoiceEmail").Value = md.InvoicingEmail; + } + + string groups = string.Empty; + foreach (string mg in md.MemberGroups) + { + + + MemberGroup g = MemberGroup.GetByName(mg); + if (g != null) + { + groups += mg + ", "; + current.AddGroup(g.Id); + } + } + + if (!string.IsNullOrEmpty(groups)) + { + lt_data.Text += "Groups: " + groups.Substring(0, groups.Length - 2); + } + } + + + + lookupSuccess.Visible = true; + lookupLogin.Visible = false; + + } + catch + { + lookupFailed.Visible = true; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.designer.cs b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.designer.cs new file mode 100644 index 00000000..0db5d941 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MemberDataLookup.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Profile { + + + public partial class MemberDataLookup { + + /// + /// lookupLogin control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel lookupLogin; + + /// + /// tb_login control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_login; + + /// + /// tb_password control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_password; + + /// + /// bt_getMemberData control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_getMemberData; + + /// + /// lookupFailed control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel lookupFailed; + + /// + /// lookupSuccess control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel lookupSuccess; + + /// + /// lt_data control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lt_data; + } +} diff --git a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx new file mode 100644 index 00000000..d36b8cab --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx @@ -0,0 +1,96 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MyProjects.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Profile.MyProjects" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +
+

Your existing projects

+ + + + +

Project where you are contributor

+ + + +
+ + + + + +
+

Vendor Resources

+

The following resources will help you get started as a Deli Vendor. If you have any questions regarding Deli or the commercialization of your package please contact the Umbraco HQ

+ +
+ + + + + + diff --git a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs new file mode 100644 index 00000000..0d69ff78 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli.Profile +{ + public partial class MyProjects : System.Web.UI.UserControl + { + public int edit { get; set; } + public int forum { get; set; } + public int licenses { get; set; } + public int team { get; set; } + + protected string editUrl; + protected string forumUrl; + protected string licenseUrl; + protected string teamUrl; + + protected void Page_Load(object sender, EventArgs e) + { + editUrl = umbraco.library.NiceUrl(edit); + forumUrl = umbraco.library.NiceUrl(forum); + licenseUrl = umbraco.library.NiceUrl(licenses); + teamUrl = umbraco.library.NiceUrl(team); + + + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + var member = memberProvider.GetCurrentMember(); + var provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + + var projects = provider.GetListingsByVendor(member.Id, true, true); + myProjects.DataSource = projects; + myProjects.DataBind(); + + var contribProjects = provider.GetListingsForContributor(member.Id); + myTeamProjects.DataSource = contribProjects; + myTeamProjects.DataBind(); + } + + protected string GetIcon(string defaultIcon) + { + if (!string.IsNullOrEmpty(defaultIcon)) + { + return defaultIcon; + } + return "/css/img/package2.png"; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs new file mode 100644 index 00000000..99e4d945 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Profile { + + + public partial class MyProjects { + + /// + /// myProjects control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater myProjects; + + /// + /// myTeamProjects control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater myTeamProjects; + + /// + /// LoginView1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LoginView LoginView1; + } +} diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx b/Marketplace/usercontrols/Deli/Profile/Signup.ascx new file mode 100644 index 00000000..39ac09fa --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/Signup.ascx @@ -0,0 +1,312 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Profile.Signup" %> +<%@ Register Assembly="Marketplace" TagPrefix="Deli" Namespace="Marketplace.Controls" %> + + +
    +
  • Basic Profile
    • +
  • Vendor Profile
    • +
+ + + + +
+
+ Basic Information +

+ We just need the most basic information from you. +

+

+ Name + +

+

+ Company + +

+

+ Email + +

+

+ Password + +

+

+ Bio
No html allowed + +

+
+ +
+ Billing Information +

+ If you are planning on buying products from the Deli, to speed up the checkout process fill in as much of the following as possible +

+

+ VAT Number + +

+

+ Address + +

+

+ Country + +

+

+ Billing Email + +

+ +
+ +
+ Services +

+ Share your ideas, topics and photos related to umbraco. +

+

+ Twitter Alias + +

+

+ Flickr Alias + +

+

+ +

+
+ +
+ Newsletters and treshold +

+ Treshold is a way to control what items are displayed to you. Any item with a score lower then your set treshold, will not be displayed in the forum. +

+

+ Treshold + +

+ +

+ Email + Do not send me any notifications or newsletters from our.umbraco.org +

+ +
+ + +
+ Where do you live? +

+ Tell us where you live, you can leave out streetnames, but city, zip-code and country is mandatory. When your location is displayed correctly on the map below, + enough information has been provided. +

+ +

+ + + + + +

+ +
+ +
+
+ + + +
+ +
+ +
+ + + + + + +
+
+ Vendor Information +

+ This is the information for your Vendor profile that will be displayed to users. +

+

+ Vendor Name + +

+

+ Company Bio + +

+

+ Company Url + +

+

+ Support Url + +

+

+ Billing email address + +

+

+ Support email address + +

+

+ Country + +

+
+
+ Banking & Tax Details +

Please fill in as much of these details as possible to make it easier for us to pay you

+

+ Your Currency + +

+

+ IBAN + +

+

+ SWIFT + +

+

+ BSB + +

+

+ Bank Account No. + +

+

+ PayPal Account + +

+

+ Tax Id + +

+

+ VAT Number + +

+
+
+ Deli Vendor Terms & Conditions +

By ticking the following box you are stating that you agree to the terms and conditions set out by Umbraco in the Deli Vendor Terms & Conditions document

+

+ Do you Accept the Deli Vendor Terms & Conditions? +

+
+ +
+ +
+
+ + + + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs new file mode 100644 index 00000000..ffdf6f6a --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs @@ -0,0 +1,297 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using umbraco.cms.businesslogic.member; +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Members; +using System.Web.UI.HtmlControls; + +namespace Marketplace.usercontrols.Deli.Profile +{ + public partial class Signup : System.Web.UI.UserControl { + + public string Group { get; set; } + public string memberType { get; set; } + public int NextPage { get; set; } + + private IMemberProvider mp; + private IMember m; + + protected void Page_Init(object sender,EventArgs e){ + mp = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + m = mp.GetCurrentMember(); + + if (m == null || !m.IsDeliVendor) + { + ProfileNavigation.Visible = false; + } + } + + + protected void Page_Load(object sender, EventArgs e) { + //lazyloading the needed javascript for validation. (addded it to the master template as our ahah forms need it aswel) + //umbraco.library.RegisterJavaScriptFile("jquery.validation", "/scripts/jquery.validation.js"); + + if(!Page.IsPostBack){ + ((HtmlGenericControl)profileNav.Parent).Attributes.Add("class","current"); + } + + + if (!Page.IsPostBack && m != null) { + tb_name.Text = m.Name; + tb_email.Text = m.Email; + + //make sure that it is not required to enter the password.. + tb_password.CssClass = "title"; + + //hack on the save button... + bt_submit.Text = "Save"; + + //treshold and newsletter + + cb_bugMeNot.Checked = m.BugMeNot; + + + tb_treshold.Text = m.Threshold.ToString(); + + //optional.. + tb_twitter.Text = m.Twitter; + tb_flickr.Text = m.Flickr; + tb_company.Text = m.Company; + tb_bio.Text = m.Profile; + + //Location + tb_lat.Value = m.Latitude; + tb_lng.Value = m.Longitude; + tb_location.Text = m.Location; + + //billing details + tb_companyAddress.Text = m.CompanyAddress; + dd_companyCountry.SelectedValue = m.CompanyCountry; + tb_companyBillingEmail.Text = m.CompanyInvoiceEmail; + tb_companyVatNumber.Text = m.CompanyVATNumber; + + if (m.IsDeliVendor) + { + var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + var vendor = vendorProvider.GetVendorById(m.Id); + + + tb_vendorCompany.Text = vendor.VendorCompanyName; + dd_vendorCountry.SelectedValue = vendor.VendorCountry; + tb_vendorDescription.Text = vendor.VendorDescription; + + tb_vendorUrl.Text = vendor.VendorUrl; + tb_vendorSupportUrl.Text = vendor.SupportUrl; + tb_vendorBillingEmail.Text = vendor.BillingContactEmail; + tb_vendorSupportEmail.Text = vendor.SupportContactEmail; + tb_vendorIban.Text = vendor.IBAN; + tb_vendorSwift.Text = vendor.SWIFT; + tb_vendorBsb.Text = vendor.BSB; + tb_vendorAccount.Text = vendor.AccountNumber; + tb_vendorPayPal.Text = vendor.PayPalAccount; + tb_vendorBaseCurrency.Text = vendor.BaseCurrency; + tb_vendorTaxId.Text = vendor.TaxId; + tb_vendorVatNumber.Text = vendor.VATNumber; + + //check to see if the box is checked. If it is dont allow it to be rechecked + if (vendor.DeliTermsAgreementDate != DateTime.MinValue && vendor.DeliTermsAgreementDate != null) + { + cb_vendorTerms.Checked = true; + cb_vendorTerms.Enabled = false; + } + + } + + } + + } + + protected void createMember(object sender, EventArgs e) { + + //Member is already logged in, and we just need to save his new data... + if (m != null) { + m.Name = tb_name.Text; + m.Email = tb_email.Text; + + if (tb_password.Text != "") + m.Password = tb_password.Text; + + //optional.. + m.Twitter = tb_twitter.Text; + m.Flickr = tb_flickr.Text; + m.Company = tb_company.Text; + m.Profile = tb_bio.Text; + + //location + m.Location = tb_location.Text; + m.Latitude = tb_lat.Value; + m.Longitude = tb_lng.Value; + + //billing info + m.CompanyAddress = tb_companyAddress.Text; + m.CompanyCountry = dd_companyCountry.SelectedValue; + m.CompanyInvoiceEmail = tb_companyBillingEmail.Text; + m.CompanyVATNumber = tb_companyVatNumber.Text; + + var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + if (m.CompanyCountry.ToLower() != null) + { + switch (m.CompanyCountry) + { + case "dk": + cartProvider.SetCurrency(Currency.DKK); + break; + + case "us": + case "ca": + cartProvider.SetCurrency(Currency.USD); + break; + + default: + cartProvider.SetCurrency(Currency.EUR); + break; + } + } + + + //treshold + newsletter + m.Threshold = Int32.Parse(tb_treshold.Text); + m.BugMeNot = cb_bugMeNot.Checked; + + mp.SaveOrUpdate(m); + + Response.Redirect(umbraco.library.NiceUrl(NextPage)); + + } else { + if (tb_email.Text != "") { + m = mp.GetMemberByEmail(tb_email.Text); + if (m == null) { + + m = new DeliMember(); + + m.Name = tb_name.Text; + m.Email = tb_email.Text; + m.Password = tb_password.Text; + + + //Location + m.Location = tb_location.Text; + m.Latitude = tb_lat.Value; + m.Longitude = tb_lng.Value; + + //billing info + m.CompanyAddress = tb_companyAddress.Text; + m.CompanyCountry = dd_companyCountry.SelectedValue; + m.CompanyInvoiceEmail = tb_companyBillingEmail.Text; + m.CompanyVATNumber = tb_companyVatNumber.Text; + + + var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + if (m.CompanyCountry.ToLower() != null) + { + switch (m.CompanyCountry) + { + case "dk": + cartProvider.SetCurrency(Currency.DKK); + break; + + case "us": + case "ca": + cartProvider.SetCurrency(Currency.USD); + break; + + default: + cartProvider.SetCurrency(Currency.EUR); + break; + } + } + + //optional.. + m.Twitter = tb_twitter.Text; + m.Flickr = tb_flickr.Text; + m.Company = tb_company.Text; + m.Profile = tb_bio.Text; + + //treshold + newsletter + m.Threshold = Int32.Parse(tb_treshold.Text); + m.BugMeNot = cb_bugMeNot.Checked; + + //Standard values + m.ReputationTotal = 20; + m.ReputationCurrent = 20; + m.ForumPosts = 0; + + //add the group + m.Groups = new string[] { Group }; + + mp.SaveOrUpdate(m); + + Response.Redirect(umbraco.library.NiceUrl(NextPage)); + } + } + } + } + + protected void updateVendor(object sender, EventArgs e) + { + var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + var vendor = vendorProvider.GetVendorById(m.Id); + + vendor.VendorCompanyName = tb_vendorCompany.Text; + vendor.VendorCountry = dd_vendorCountry.SelectedValue; + vendor.VendorDescription = tb_vendorDescription.Text; + + vendor.VendorUrl = tb_vendorUrl.Text; + vendor.SupportUrl = tb_vendorSupportUrl.Text; + vendor.BillingContactEmail = tb_vendorBillingEmail.Text; + vendor.SupportContactEmail = tb_vendorSupportEmail.Text; + vendor.IBAN = tb_vendorIban.Text; + vendor.SWIFT = tb_vendorSwift.Text; + vendor.BSB = tb_vendorBsb.Text; + vendor.AccountNumber = tb_vendorAccount.Text; + vendor.PayPalAccount = tb_vendorPayPal.Text; + vendor.BaseCurrency = tb_vendorBaseCurrency.Text; + vendor.TaxId = tb_vendorTaxId.Text; + vendor.VATNumber = tb_vendorVatNumber.Text; + + if (cb_vendorTerms.Enabled && cb_vendorTerms.Checked) + { + vendor.DeliTermsAgreementDate = DateTime.Now.ToUniversalTime(); + } + + vendorProvider.SaveOrUpdate(vendor); + + Response.Redirect(umbraco.library.NiceUrl(NextPage)); + } + + protected void ChangeProfile(object sender, EventArgs e) + { + var b = sender as LinkButton; + var parentControl = b.Parent as HtmlGenericControl; + + switch (b.CommandArgument) + { + case "Basic": + + SignupBasicProfile.Visible = true; + VendorProfile.Visible = false; + parentControl.Attributes.Add("class", "current"); + ((HtmlGenericControl)vendorNav.Parent).Attributes.Add("class", ""); + break; + case "Vendor": + SignupBasicProfile.Visible = false; + VendorProfile.Visible = true; + parentControl.Attributes.Add("class", "current"); + ((HtmlGenericControl)profileNav.Parent).Attributes.Add("class", ""); + break; + default: + break; + } + } + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs new file mode 100644 index 00000000..e749c3ce --- /dev/null +++ b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs @@ -0,0 +1,465 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Profile { + + + public partial class Signup { + + /// + /// ProfileNavigation control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ProfileNavigation; + + /// + /// profileNav control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton profileNav; + + /// + /// vendorNav control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton vendorNav; + + /// + /// SignupBasicProfile control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder SignupBasicProfile; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// tb_name control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_name; + + /// + /// Label2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// tb_company control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_company; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// tb_email control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_email; + + /// + /// Label4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// tb_password control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_password; + + /// + /// Label10 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label10; + + /// + /// tb_bio control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_bio; + + /// + /// tb_companyVatNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_companyVatNumber; + + /// + /// tb_companyAddress control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_companyAddress; + + /// + /// dd_companyCountry control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.Controls.CountryDropDownList dd_companyCountry; + + /// + /// tb_companyBillingEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_companyBillingEmail; + + /// + /// Label5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// tb_twitter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_twitter; + + /// + /// Label6 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label6; + + /// + /// tb_flickr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_flickr; + + /// + /// tb_emailConfirm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_emailConfirm; + + /// + /// Label7 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label7; + + /// + /// tb_treshold control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_treshold; + + /// + /// Label9 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label9; + + /// + /// cb_bugMeNot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox cb_bugMeNot; + + /// + /// Label8 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label8; + + /// + /// tb_location control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_location; + + /// + /// tb_lat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField tb_lat; + + /// + /// tb_lng control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField tb_lng; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + + /// + /// VendorProfile control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder VendorProfile; + + /// + /// tb_vendorCompany control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorCompany; + + /// + /// tb_vendorDescription control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorDescription; + + /// + /// tb_vendorUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorUrl; + + /// + /// tb_vendorSupportUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorSupportUrl; + + /// + /// tb_vendorBillingEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorBillingEmail; + + /// + /// tb_vendorSupportEmail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorSupportEmail; + + /// + /// dd_vendorCountry control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.Controls.CountryDropDownList dd_vendorCountry; + + /// + /// tb_vendorBaseCurrency control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorBaseCurrency; + + /// + /// tb_vendorIban control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorIban; + + /// + /// tb_vendorSwift control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorSwift; + + /// + /// tb_vendorBsb control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorBsb; + + /// + /// tb_vendorAccount control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorAccount; + + /// + /// tb_vendorPayPal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorPayPal; + + /// + /// tb_vendorTaxId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorTaxId; + + /// + /// tb_vendorVatNumber control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_vendorVatNumber; + + /// + /// cb_vendorTerms control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox cb_vendorTerms; + + /// + /// bt_vendorSubmit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_vendorSubmit; + } +} diff --git a/Marketplace/usercontrols/Deli/ProjectView.ascx b/Marketplace/usercontrols/Deli/ProjectView.ascx new file mode 100644 index 00000000..e0ef621c --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectView.ascx @@ -0,0 +1,429 @@ +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="ProjectView.ascx.cs" + Inherits="Marketplace.usercontrols.Deli.ProjectView" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +
+ +
+
+ Edit + + started this project on + + it's current version is + + . +
+
+ +
+ <% if (!String.IsNullOrEmpty(Project.GACode)) + { + %> + ', 'Download Button', '<%= Project.Name %>');"> + Download + <% + } + else + { + %> + + + + <% + } + %> +
+ +

+ Package Info

+

+ Project Owner/Creator

+ +
+ + Avatar + +

<%= Project.Vendor.Member.Name %>

+ + posts + + + karma + +
+ +
+

+ Purchase a License

+
    + + +
  • + + + +
    • +     +     +
+
+ +
+

+ Project Compatibility

+

+ + +
+
+ + + + View Details + + + Report Compatibility + +

+
+
+

+ Project Information

+
+
Project owner:
+
+ + <%= Project.Vendor.Member.Name %> + +
+ + +
Contributors:
+
+ + + "> + <%# Eval("Text") %>  + + +
+ + +
Created:
+
+ <%= Project.CreateDate.ToString("D") %> +
+ <% if (Project.Stable) + { %> +
Is Stable:
+
+ Project is stable +
+ <%} %> +
Current version
+
+ <%= Project.CurrentVersion %> +
+ <% if (!string.IsNullOrEmpty(Project.LicenseName)) + { %> +
License
+
+ + <%= Project.LicenseName %> +
+ <% } %> + + +
Tags
+
+ + + "> + <%# Eval("Text") %>  + + +
+ +
Downloads:
+
+ +
+
+
+ +
+

+ Edit Project Tags

+

+ +

+
+
+
+ + + +
+

+ Contribute

+ Group

+ This package is open for collaboration. +
+ Contact the owner

+
+ +
+
+

+

+
+ +
+ + + + + +
+
+
    +
+
+ + +
+

+ Package Files

+
+ + + + +
+

+ Hot fix / Upgrade Files

+
+ + + + +
+

+ Source Code

+
+ + + + +
+

+ Documentation

+
+ + +
+

+ Resources

+
    + +
+
+ + +
+

+ Archived Files

+
+ + +
+ +
+
+
diff --git a/Marketplace/usercontrols/Deli/ProjectView.ascx.cs b/Marketplace/usercontrols/Deli/ProjectView.ascx.cs new file mode 100644 index 00000000..c23b1b51 --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectView.ascx.cs @@ -0,0 +1,553 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using Marketplace.Helpers; +using Marketplace.Providers.Cart; +using Marketplace.Providers.Accounting; +using Marketplace.Providers.MediaFile; +using System.Text; +using Marketplace.Data; +using Marketplace.uVersion; + + +namespace Marketplace.usercontrols.Deli +{ + + + public partial class ProjectView : System.Web.UI.UserControl + { + + public IListingItem Project { get; set; } + private IListingProvider projectProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + private Currency _currency = Currency.EUR; + + protected void Page_Load(object sender, EventArgs e) + { + Project = projectProvider.GetCurrentListing(); + if (!IsPostBack) + { + projectProvider.IncrementProjectViews(Project); + SetSecurables(); + SetupProject(); + } + SetupAnalytics(); + } + + private void SetupProject() + { + + #region Memberbadge + + MemberPosts.Text = Project.Vendor.Member.ForumPosts.ToString(); + MemberKarma.Text = Project.Vendor.Member.ReputationCurrent.ToString(); + + #endregion + + #region Standard Features + + ProjectName.Text = Project.Name; + ProjectCreateDate.Text = String.Format("{0:D}", Project.CreateDate); + ProjectCurrentVersion.Text = Project.CurrentVersion; + VendorLink.Text = Project.Vendor.Member.Name; + VendorLink.NavigateUrl = "/member/" + Project.Vendor.Member.Id; + + //description + if (Project.Description.Contains('<')) + ProjectDescrition.Text = uForum.Library.Xslt.ResolveLinks(Project.Description); + else + ProjectDescrition.Text = uForum.Library.Xslt.ResolveLinks(umbraco.library.ReplaceLineBreaks(Project.Description)); + + #endregion + + #region Screenshots + //screenshots + if (Project.ScreenShots.Count() > 0) + { + ScreenshotRepeater.DataSource = Project.ScreenShots; + ScreenshotRepeater.DataBind(); + } + else + { + ScreenshotRepeater.Visible = false; + } + + #endregion + + #region Resources + + //resources + var resouceFormat = "
  • {1}
    • "; + + if (!string.IsNullOrEmpty(Project.ProjectUrl)) + ProjectResources.Text += string.Format(resouceFormat, Project.ProjectUrl, "Project Website"); + + if(!string.IsNullOrEmpty(Project.DemonstrationUrl)) + ProjectResources.Text += string.Format(resouceFormat, Project.DemonstrationUrl, "View a Demonstration"); + + if (!string.IsNullOrEmpty(Project.SourceCodeUrl)) + ProjectResources.Text += string.Format(resouceFormat, Project.SourceCodeUrl, "Download Source Code"); + + if (!string.IsNullOrEmpty(Project.SupportUrl)) + ProjectResources.Text += string.Format(resouceFormat, Project.SupportUrl, "Support & Issues"); + + if (!string.IsNullOrEmpty(Project.LicenseUrl)) + ProjectResources.Text += string.Format(resouceFormat, Project.LicenseUrl, "Read the License"); + + #endregion + + #region Files + //files + + var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + + var files = Project.PackageFile.Where(x => !x.Archived).OrderByDescending(x => x.CreateDate).Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + Member = new Member(x.CreatedBy), + UmbracoVersion = x.UmbVersion.ToVersionNameString(), //x.UmbVersion.Description, + DotNetVersion = x.DotNetVersion, + MediumTrust = (x.SupportsMediumTrust)?"Supports Medium Trust":"Full Trust Required", + CreateDate = x.CreateDate.ToShortDateString() + + }); + + if (files.Count() > 0) + { + ProjectFileRepeater.DataSource = files; + ProjectFileRepeater.DataBind(); + } + else + { + ProjectFileRepeater.Visible = false; + } + + var hotFixes = Project.HotFixes.Where(x => !x.Archived).OrderByDescending(x => x.CreateDate).Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + Member = new Member(x.CreatedBy), + UmbracoVersion = x.UmbVersion.ToVersionNameString(), //x.UmbVersion.Description, + DotNetVersion = x.DotNetVersion, + MediumTrust = (x.SupportsMediumTrust) ? "Supports Medium Trust" : "Full Trust Required", + CreateDate = x.CreateDate.ToShortDateString() + + }); + + if (hotFixes.Count() > 0) + { + HotFixRepeater.DataSource = hotFixes; + HotFixRepeater.DataBind(); + } + else + { + HotFixRepeater.Visible = false; + } + + var sourceFiles = Project.SourceFile.Where(x => !x.Archived).OrderByDescending(x => x.CreateDate).Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + Member = new Member(x.CreatedBy), + UmbracoVersion = x.UmbVersion.ToVersionNameString(), // "TBI",//x.UmbVersion.Description, + DotNetVersion = x.DotNetVersion, + MediumTrust = (x.SupportsMediumTrust) ? "Supports Medium Trust" : "Full Trust Required", + CreateDate = x.CreateDate.ToShortDateString() + + }); + + if (sourceFiles.Count() > 0) + { + SourceRepeater.DataSource = sourceFiles; + SourceRepeater.DataBind(); + } + else + { + SourceRepeater.Visible = false; + } + + + #endregion + + #region Documentation + //Documenation + + var docs = Project.DocumentationFile.Where(x => !x.Archived).Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + CreateDate = x.CreateDate, + Member = new Member(x.CreatedBy) + }); + + + if (docs.Count() > 0) + { + ProjectDocRepeater.DataSource = docs; + ProjectDocRepeater.DataBind(); + } + else + { + ProjectDocRepeater.Visible = false; + } + + #endregion + + #region Archive + + //Archived Files + var archive = new List(); + + var packageArchive = Project.PackageFile.Where(x => x.Archived); + var docArchive = Project.DocumentationFile.Where(x => x.Archived); + + archive.AddRange(packageArchive); + archive.AddRange(docArchive); + + if (archive.Count() > 0) + { + ArchiveRepeater.DataSource = archive.Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + Member = new Member(x.CreatedBy), + UmbracoVersion = x.UmbVersion.ToVersionString(), //x.UmbVersion.Description, + DotNetVersion = x.DotNetVersion, + MediumTrust = (x.SupportsMediumTrust) ? "Supports Medium Trust" : "Full Trust Required", + CreateDate = x.CreateDate.ToShortDateString() + }); + + ArchiveRepeater.DataBind(); + } + else + { + ArchiveRepeater.Visible = false; + } + + #endregion + + #region Sidebar + + //download box + if (!string.IsNullOrEmpty(Project.CurrentReleaseFile)) + { + //ProjectNameDownload.Text = Project.Name; + //ProjectCurrentVersionDownload.Text = Project.CurrentVersion; + + var file = Project.PackageFile.Where(x => x.Id == Int32.Parse(Project.CurrentReleaseFile)).FirstOrDefault(); + if (file != null) + { + + var uVersions = UVersion.GetAllVersions(); + + using (var ctx = new MarketplaceDataContext()) + { + var count = 0; + var verCount = 0; + var ct = "This project has been reported to be compatible with "; + + foreach (var ver in uVersions) + { + var reports = ctx.DeliVersionCompatibilities.Where(x => x.version == ver.Name && x.projectId == Project.Id); + + if (reports.Count() > 0) + { + float compats = reports.Where(x => x.isCompatible).Count(); + float numReps = reports.Count(); + var perc = Convert.ToInt32(((compats / numReps) * 100)); + + if (perc >= 80) + { + verCount++; + if (count < 2) + { + count++; + ct += ver.Name + ", "; + } + } + } + + } + + if (count == 0) + ct = "No compatible versions have been reported, be the first!"; + else + { + if (verCount > 2) + { + ct += "and " + (verCount - 2) + " other versions."; + } + else + ct = ct.Trim().TrimEnd(','); + } + ProjectCompatitbleWithUmbraco.Text = ct; + } + + + // file.UmbVersion.Description; + + //////////////////////////////////////////////////////////////// + // moved to versionCompatibilityReport.cshtml for AJAXifCation// + //////////////////////////////////////////////////////////////// + + //var compatDetails = "This project is compatible with the following versions as reported by community members who have downloaded this package:

    "; + + //var uVersions = UVersion.GetAllVersions(); + + //using (var ctx = new MarketplaceDataContext()) + //{ + // foreach (var ver in uVersions) + // { + // var reports = ctx.DeliVersionCompatibilities.Where(x => x.version == ver.Name && x.projectId == Project.Id); + + // if (reports.Count() > 0) + // { + // float compats = reports.Where(x => x.isCompatible).Count(); + // float numReps = reports.Count(); + // var perc = Convert.ToInt32(((compats / numReps) * 100)); + + // var smiley = "unhappy"; + + // if (perc >= 95) + // smiley = "joyous"; + // else if (perc < 95 && perc >= 80) + // smiley = "happy"; + // else if (perc < 80 && perc >= 65) + // smiley = "neutral"; + // else if (perc < 65 && perc >= 50) + // smiley = "unhappy"; + // else + // smiley = "superUnhappy"; + + // compatDetails += "" + ver.Name + " (" + perc + "%)"; + // } + // else + // compatDetails += "" + ver.Name + " (untested)"; + // } + //} + + //compatDetails += "
    "; + + + var compatDetails = string.Empty; + if (!string.IsNullOrEmpty(file.DotNetVersion)) + compatDetails += ".NET Version:" + file.DotNetVersion + "
    "; + + compatDetails += "Supports Medium Trust:"; + compatDetails += (file.SupportsMediumTrust) ? "Yes" : "No"; + compatDetails += "
    "; + ProjectCompatibileDetails.Text = compatDetails; + + } + + } + else + { + HasReports.Visible = false; + DownloadPanel.Visible = false; + } + + + + //Commercial options + if (Project.ListingType != ListingType.commercial) + { + CommercePanel.Visible = false; + } + else + { + var licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + var licenses = licenseProvider.GetProjectLicenses(Project.ProjectGuid).Where(x => x.IsActive); + ProjectPurchaseRepeater.DataSource = licenses; + ProjectPurchaseRepeater.DataBind(); + } + + //Collab + CollabPanel.Visible = Project.OpenForCollab; + + + + //package info panel + + //project contributors + + using (var ctx = new MarketplaceDataContext()) + { + var contributors = ctx.projectContributors.Where(x => x.projectId == Project.Id) + .Select(x => new Member(x.memberId)).ToList(); + + + if (contributors.Count() > 0) + { + ContribRepeater.DataSource = contributors; + ContribRepeater.DataBind(); + } + } + + //Tags + + TagRepeater.DataSource = Project.Tags; + TagRepeater.DataBind(); + + if (TagEditPanel.Visible) + { + TagEditRepeater.DataSource = Project.Tags; + TagEditRepeater.DataBind(); + + string taglist = string.Empty; + var tagProvider = ((IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]); + var tags = tagProvider.GetAllTags(); + foreach (var t in tags) + { + taglist += "\"" + t.Text + "\","; + } + + TagStringArray.Text = taglist; + } + + //Download Counter + + DownloadCount.Text = Project.Downloads.ToString(); + + #endregion + + } + + protected void SetupAnalytics() + { + if (!string.IsNullOrEmpty(Project.GACode)) + { + + var eventCategory = "_" + Project.Name.ToLower().Replace(" ", ""); + var analyticsSB = new StringBuilder(); + + analyticsSB.Append(""); + + + // need a better way to do this. For some reason have to walk to the top of the tree then down to find it. + Literal holder = Page.Master.Master.Master.Controls[0].FindControl("EndScripts").FindControl("EndScriptsLit") as Literal; + holder.Text = analyticsSB.ToString(); + + } + } + + protected void LicenseBound(Object sender, RepeaterItemEventArgs e) + { + var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + ICart _cart = cartProvider.GetCurrentCart(); + _currency = _cart.Currency; + + Literal _name = (Literal)e.Item.FindControl("LicenseType"); + Literal _price = (Literal)e.Item.FindControl("LicensePrice"); + ImageButton _addToCart = (ImageButton)e.Item.FindControl("LicenseAddToCart"); + + var License = (ILicense)e.Item.DataItem; + + switch (License.LicenseType) + { + case LicenseType.Domain: + _name.Text = "Domain"; + break; + case LicenseType.IP: + _name.Text = "IP"; + break; + case LicenseType.Unlimited: + _name.Text = "Unlimited"; + break; + case LicenseType.SourceCode: + _name.Text = "Source Code"; + break; + default: + break; + } + + _price.Text = DeliCurrency.FriendlyConvertFromEuro((decimal)License.Price, DeliCurrency.FromSymbol(_currency.ToString())); + _addToCart.CommandArgument = License.Id.ToString(); + + if (!String.IsNullOrEmpty(Project.GACode)) + { + var eventCategory = "_" + Project.Name.ToLower().Replace(" ", ""); + _addToCart.OnClientClick = "vendorTracker._trackEvent('" + eventCategory + "', 'Add To Cart - " + _name.Text + "', '" + Project.Name + " " + _name.Text + "'," + License.Price + ");"; + } + + + } + + protected void _addToCart_Click(object sender, EventArgs e) + { + var button = (ImageButton)sender; + var license = ((ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]).GetLicense(Int32.Parse(button.CommandArgument)); + var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + + var cartItem = new CartItem() + { + LicenseId = Int32.Parse(button.CommandArgument), + ListingItem = Project, + Quantity = 1, + GrossPrice = license.Price + + }; + + cartProvider.AddItem(cartItem); + + //redirect to the cart after adding item. + Response.Redirect("~/deli/cart?returnUrl=" + Server.UrlEncode(Request.RawUrl)); + + } + + private void SetSecurables() + { + var memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + var mem = memberProvider.GetCurrentMember(); + var isVendorAuthenticated = umbraco.library.IsLoggedOn() && (Project.Vendor.Member.Id == mem.Id || our.Utills.IsProjectContributor(mem.Id,Project.Id)); + EditOption.Visible = isVendorAuthenticated; + TagEditPanel.Visible = isVendorAuthenticated; + + + //ReportVersionOptions.Visible = !isVendorAuthenticated && umbraco.library.IsLoggedOn() && library.HasDownloaded(mem.Id, Project.Id); + VotingOptions.Visible = !isVendorAuthenticated && umbraco.library.IsLoggedOn() && uPowers.Library.Xslt.YourVote(mem.Id,Project.Id,"powersProject") == 0; // show voting only if the member is logged on and is not associated with the project in some way; + + if (mem != null) + { + AdminVotingOptions.Visible = (mem.Groups.Contains("admin") && Project.Karma < 15); + } + else + { + AdminVotingOptions.Visible = false; + } + + + } + + protected string IsVoteable() + { + var mem = Member.GetCurrentMember(); + + if (mem == null || (int)mem.getProperty("reputationCurrent").Value <= 69) + { + return " noVote"; + } + return ""; + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/ProjectView.ascx.designer.cs b/Marketplace/usercontrols/Deli/ProjectView.ascx.designer.cs new file mode 100644 index 00000000..0b6c5bc8 --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectView.ascx.designer.cs @@ -0,0 +1,294 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class ProjectView { + + /// + /// VotingOptions control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder VotingOptions; + + /// + /// AdminVotingOptions control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder AdminVotingOptions; + + /// + /// EditOption control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder EditOption; + + /// + /// VendorLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink VendorLink; + + /// + /// ProjectCreateDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCreateDate; + + /// + /// ProjectCurrentVersion control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCurrentVersion; + + /// + /// DownloadPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DownloadPanel; + + /// + /// MemberPosts control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal MemberPosts; + + /// + /// MemberKarma control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal MemberKarma; + + /// + /// CommercePanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CommercePanel; + + /// + /// ProjectPurchaseRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProjectPurchaseRepeater; + + /// + /// HasReports control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder HasReports; + + /// + /// ProjectCompatitbleWithUmbraco control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCompatitbleWithUmbraco; + + /// + /// ProjectCompatibileDetails control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCompatibileDetails; + + /// + /// ReportVersionOptions control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ReportVersionOptions; + + /// + /// ContribRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ContribRepeater; + + /// + /// TagRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater TagRepeater; + + /// + /// DownloadCount control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal DownloadCount; + + /// + /// TagEditPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder TagEditPanel; + + /// + /// TagStringArray control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal TagStringArray; + + /// + /// TagEditRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater TagEditRepeater; + + /// + /// CollabPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CollabPanel; + + /// + /// ProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectName; + + /// + /// ProjectDescrition control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectDescrition; + + /// + /// ScreenshotRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ScreenshotRepeater; + + /// + /// ProjectFileRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProjectFileRepeater; + + /// + /// HotFixRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater HotFixRepeater; + + /// + /// SourceRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater SourceRepeater; + + /// + /// ProjectDocRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProjectDocRepeater; + + /// + /// ProjectResources control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectResources; + + /// + /// ArchiveRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ArchiveRepeater; + } +} diff --git a/Marketplace/usercontrols/Deli/ProjectsList.ascx b/Marketplace/usercontrols/Deli/ProjectsList.ascx new file mode 100644 index 00000000..97a1ddaa --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectsList.ascx @@ -0,0 +1,62 @@ +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="ProjectsList.ascx.cs" Inherits="Marketplace.usercontrols.Deli.ProjectsList" %> +<%@ Import Namespace="Marketplace.Interfaces" %> +<%@ Import Namespace="Marketplace.Providers.Helpers" %> +<%@ Register Src="~/usercontrols/Deli/ListPagination.ascx" TagPrefix="deli" TagName="paging" %> + +
    +
    + + + +

    Showing <%= PageStartListingNumber %> - <%=PageEndListingNumber %> of <%=TotalListings %> Projects

    +     + + + + + + + + +
    +

    There are no listings that meet your filter criteria

    +
    +     + +
    +
    + + diff --git a/Marketplace/usercontrols/Deli/ProjectsList.ascx.cs b/Marketplace/usercontrols/Deli/ProjectsList.ascx.cs new file mode 100644 index 00000000..1b8433fe --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectsList.ascx.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI; +using Marketplace.Providers; +using Marketplace.Interfaces; +using Marketplace.Providers.Helpers; + + +namespace Marketplace.usercontrols.Deli +{ + public partial class ProjectsList : UserControl + { + + public int TotalListings { get; set; } + public int PageStartListingNumber { get; set; } + public int PageEndListingNumber { get; set; } + + private string _listingType = ""; + public string ListingType + { + get { return _listingType; } + set { _listingType = value; } + + } + + private int _maxPageSize = 20; + public int MaxPageSize { get { return _maxPageSize; } set { _maxPageSize = value; } } + + private int _pageNumber; + public int PageNumber + { + get + { + if (_pageNumber > 0) + return _pageNumber - 1; + + return _pageNumber; + } + set + { + _pageNumber = value; + } + } + + public string Tag { get; set; } + + public bool IsCategoryListing { get; set; } + + + protected void Page_PreRender(object sender, EventArgs e) + { + Bind_Data(); + } + + protected void Bind_Data() + { + int count; + + var projectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + List projects; + + Tag = (string.IsNullOrEmpty(Tag) == false && Tag != "all") ? Tag : string.Empty; + + var skip = PageNumber * _maxPageSize; + var take = _maxPageSize; + + if (IsCategoryListing == false) + { + if (string.IsNullOrEmpty(Tag)) + { + count = projectsProvider.Count(); + projects = projectsProvider.GetAllListings(skip, take, true).OrderByDescending(x => x.Downloads).ToList(); + } + else + { + count = projectsProvider.Count(Tag); + projects = projectsProvider.GetListingsByTag(Tag, skip, take, true).ToList(); + } + } + else + { + var categoryProvider = (ICategoryProvider)MarketplaceProviderManager.Providers["CategoryProvider"]; + var category = categoryProvider.GetCurrent(); + + count = string.IsNullOrEmpty(ListingType) == false + ? projectsProvider.Count(category) + : projectsProvider.Count(category, ListingType.GetListingTypeFromString()); + + Trace.Write("begin get category"); + + projects = string.IsNullOrEmpty(ListingType) + ? projectsProvider.GetListingsByCategory(category, skip, take, true).ToList() + : projectsProvider.GetListingsByCategory(category, ListingType.GetListingTypeFromString(), skip, take, true).ToList(); + + Trace.Write("end get category"); + } + + if (count > _maxPageSize) + { + paging.Visible = true; + + var numPages = (count / (decimal)_maxPageSize); + var intNumPages = Convert.ToInt32(numPages); + + if (numPages % 1 > 0 && numPages % 1 <= (decimal)0.5) + { + intNumPages += 1; + } + + paging.NumberOfPages = intNumPages; + } + + var projectCount = projects.Count(); + if (projectCount > 0) + { + TotalListings = count; + PageStartListingNumber = skip + 1; + PageEndListingNumber = skip + projectCount; + } + else + { + ProjectCounter.Visible = false; + Listing.Visible = false; + NoListings.Visible = true; + } + + Listing.DataSource = projects; + Listing.DataBind(); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/ProjectsList.ascx.designer.cs b/Marketplace/usercontrols/Deli/ProjectsList.ascx.designer.cs new file mode 100644 index 00000000..c35b6969 --- /dev/null +++ b/Marketplace/usercontrols/Deli/ProjectsList.ascx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class ProjectsList { + + /// + /// ProjectCounter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ProjectCounter; + + /// + /// Listing control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater Listing; + + /// + /// NoListings control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NoListings; + + /// + /// paging control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Marketplace.usercontrols.Deli.ListPagination paging; + } +} diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx new file mode 100644 index 00000000..4e153419 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx @@ -0,0 +1,61 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="PayPalConfirm.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Purchase.PayPalConfirm" %> + +

     

    +

    Thank You!

    +

     

    +

    +Your order is being processed and you licenses will be available shortly. +

    +

    +Your Licenses +
    +Your Profile +

    + + + + + +
    +Your order is confirmed and your license is ready to configure. +Please select a link below to continue: +
    + +

    +Your Licenses +
    +Your Profile +

    + +
    + +
    +     + + +

     

    +

    Invoice

    +

     

    +
    + + Your invoice is available here + +
    +     + + + +

    Thank You!

    +
    +Your order is pending approval and your license will be ready soon. +Please select a link below to continue: +
    + +

    +Your Licenses +
    +Your Profile +

    + +     + diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.cs b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.cs new file mode 100644 index 00000000..053893a7 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.cs @@ -0,0 +1,527 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Providers.Orders; +using Marketplace.Providers; +using Marketplace.Interfaces; +using Marketplace.Providers.Listing; +using Marketplace.Providers.OrderNote; +using Marketplace.Providers.MemberLicense; +using System.Collections.Specialized; +using System.Net; +using System.Text; +using umbraco.BusinessLogic; +using Umbraco.Ecommerce.BusinessLogic; +using Umbraco.Ecommerce.PaymentMethods; +using System.Configuration; +using NotificationsCore; + +namespace Marketplace.usercontrols.Deli.Purchase +{ + public partial class PayPalConfirm : System.Web.UI.UserControl + { + #region properties + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + public IOrder dOrder; + + private IDeliOrderItemProvider _orderItemProvider; + public IDeliOrderItemProvider OrderItemProvider + { + get + { + if (_orderItemProvider != null) + return _orderItemProvider; + else + { + _orderItemProvider = (IDeliOrderItemProvider)MarketplaceProviderManager.Providers["OrderItemProvider"]; + return _orderItemProvider; + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + private OrderNoteProvider _orderNoteProvider; + public OrderNoteProvider OrderNoteProvider + { + get + { + if (_orderNoteProvider != null) + return _orderNoteProvider; + else + { + _orderNoteProvider = (OrderNoteProvider)MarketplaceProviderManager.Providers["OrderNoteProvider"]; + return _orderNoteProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + public MemberLicense mLicense; + + private IMemberLicenseProvider _memberLicenseProvider; + public IMemberLicenseProvider MemberLicenseProvider + { + get + { + if (_memberLicenseProvider != null) + return _memberLicenseProvider; + else + { + _memberLicenseProvider = (IMemberLicenseProvider)MarketplaceProviderManager.Providers["memberLicenseProvider"]; + return _memberLicenseProvider; + } + } + } + + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + + private bool testMode = bool.Parse(ConfigurationManager.AppSettings["deliPayPalTest"]); + public bool TestMode + { + get { return testMode; } + set { testMode = value; } + } + + #endregion + + protected void Page_Load(object sender, EventArgs e) + { + try + { + if (!IsPostBack) + { + + NameValueCollection form = HttpContext.Current.Request.QueryString; + HandleOrder(form, TestMode); + + } + + } + catch (Exception ex) + { + string formStr = ""; + foreach (string key in HttpContext.Current.Request.QueryString.AllKeys) + formStr += key + ": " + HttpContext.Current.Request.QueryString[key] + "..."; + + umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "PAYPAL CONFIRM: Response: " + ex.ToString() + formStr); + + } + } + + public void TESTHandleOrder(NameValueCollection form, bool testMode) + { + try + { + string amount = form["amount"]; + int invoice = int.Parse(form["invoice"]); + string status = form["payment_status"]; + string txt_id = form["txn_id"]; + + // log the IPN response in the umbracoLog + string formStr = ""; + foreach (string key in form.AllKeys) + formStr += key + ": " + form[key] + "...."; + + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM: - " + formStr); + + } + catch (Exception ex) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM ERROR: " + ex.ToString()); + } + } + + public void HandleOrder(NameValueCollection form, bool testMode) + { + try + { + string amount = form["mc_gross"]; + int invoice = int.Parse(form["invoice"]); + string status = form["payment_status"]; + string txt_id = form["txn_id"]; + string NoteText = ""; + + // log the PayPal response in the umbracoLog before anything else + string formStr = ""; + foreach (string key in form.AllKeys) + formStr += key + ": " + form[key] + "...."; + + // get the Deli Order + dOrder = OrderProvider.GetOrder(invoice); + + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM: Order: " + dOrder.Id.ToString() + " - " + formStr); + + switch (status) + { + case "Completed": + // make sure this isn't a duplicate from paypal + if (dOrder.Status != OrderStatus.Confirmed) + { + if (!testMode) // production! + { + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Confirmed.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Confirmed; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + dOrder.PaymentDate = DateTime.Now.ToUniversalTime(); + dOrder.ProcessedTotal = Convert.ToDouble(amount); + + // create a MemberLicense for each OrderItem + foreach (IOrderItem item in dOrder.Items) + { + // create licenses for multiple quantity + for (int i = 0; i < item.Quantity; i++) + { + mLicense = new MemberLicense(); + mLicense.LicenseId = LicenseProvider.GetLicense(item.LicenseId).Id; + mLicense.Member = dOrder.Member; + mLicense.OrderItemId = item.Id; + mLicense.ListingItemId = item.ListingItemId; + mLicense.CreateDate = DateTime.Now.ToUniversalTime(); + mLicense.IsActive = true; + + MemberLicenseProvider.SaveOrUpdate(mLicense); + } + } + + OrderProvider.SaveOrUpdate(dOrder); + + // webservice call to create order on umbraco.com + string invoicePath; + + try + { + invoicePath = CreateDotComOrder(dOrder, txt_id); + } + catch (Exception e) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM ERROR: " + e.Message + " :: " + e.InnerException + " :: " + e.StackTrace); + + invoicePath = string.Empty; + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli Error: invoice generation failed"); + + InvoicePanel.Visible = false; + PaymentConfirmPanel.Visible = true; + PaymentPendingPanel.Visible = false; + } + + if (invoicePath.Length > 0) + { + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli invoice: " + invoicePath); + + InvoiceLink.NavigateUrl = "http://umbraco.com" + invoicePath; + + InvoicePanel.Visible = true; + + } + + PaymentConfirmPanel.Visible = true; + PaymentPendingPanel.Visible = false; + + + // send order complete mail + InstantNotification not = new InstantNotification(); + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliOrderComplete", dOrder, dOrder.Member, txt_id); + + } + else // test! + { + NoteText = "DEV order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Confirmed.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Confirmed; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + dOrder.PaymentDate = DateTime.Now.ToUniversalTime(); + dOrder.ProcessedTotal = Convert.ToDouble(amount); + + // create a MemberLicense for each OrderItem + foreach (IOrderItem item in dOrder.Items) + { + // create licenses for multiple quantity + for (int i = 0; i < item.Quantity; i++) + { + mLicense = new MemberLicense(); + mLicense.LicenseId = LicenseProvider.GetLicense(item.LicenseId).Id; + mLicense.Member = dOrder.Member; + mLicense.OrderItemId = item.Id; + mLicense.ListingItemId = item.ListingItemId; + mLicense.CreateDate = DateTime.Now.ToUniversalTime(); + mLicense.IsActive = true; + + MemberLicenseProvider.SaveOrUpdate(mLicense); + } + } + + OrderProvider.SaveOrUpdate(dOrder); + + // webservice call to create order on umbraco.com + string invoicePath; + + try + { + invoicePath = CreateDotComOrder(dOrder, txt_id); + } + catch (Exception e) + { + + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM ERROR: " + e.Message + " :: " + e.InnerException + " :: " + e.StackTrace); + + invoicePath = string.Empty; + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli Error: invoice generation failed"); + + InvoicePanel.Visible = false; + PaymentConfirmPanel.Visible = true; + PaymentPendingPanel.Visible = false; + } + + if (invoicePath.Length > 0) + { + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, "Deli invoice: " + invoicePath); + + InvoiceLink.NavigateUrl = "http://umbraco.com" + invoicePath; + + InvoicePanel.Visible = true; + + } + + + PaymentConfirmPanel.Visible = true; + PaymentPendingPanel.Visible = false; + + + // send order complete mail + InstantNotification not = new InstantNotification(); + not.Invoke(NotificationsWeb.Config.ConfigurationFile, NotificationsWeb.Config.AssemblyDir, "DeliOrderComplete", dOrder, dOrder.Member, txt_id); + + } + + } + break; + + case "Pending": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Pending.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Pending; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + case "Failed": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Rejected.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Rejected; + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + case "Refunded": + NoteText = "order status changed from " + dOrder.Status.ToString() + " to " + OrderStatus.Refunded.ToString() + "with transaction id: " + txt_id; + dOrder.Status = OrderStatus.Refunded; + dOrder.IsRefunded = true; + dOrder.RefundDate = DateTime.Now.ToUniversalTime(); + + OrderNoteProvider.AddOrderNote((int)dOrder.Id, (int)dOrder.Member.Id, NoteText); + + // todo: revoke license here + // todo: mark specific OrderItems as Refunded + + OrderProvider.SaveOrUpdate(dOrder); + + break; + + default: + break; + } + + } + catch (Exception ex) + { + Log.Add(LogTypes.Debug, -1, "DELI PAYPAL CONFIRM " + ex.Message + " :: " + ex.InnerException + " :: " + ex.StackTrace); + } + } + + public int CreateEcomOrder(IOrder o, bool TestMode) + { + try + { + // Create customer information + CustomerInfo ci = new CustomerInfo(); + ci.AddData("id", o.Member.Id.ToString()); + ci.AddData("email", o.Member.Email); + + Guid payment = new CreditCard().Id; + + // create order + Order providerOrder = Order.MakeNew(ci.ToXml(), o.Id.ToString(), payment, "deli order", o.Member.Email); + providerOrder.CustomerReference = o.Id.ToString(); + providerOrder.ChangeStatus(Order.Status.Confirmed); + providerOrder.Comment = "deli order"; + + if (TestMode) + providerOrder.TestMode = true; + + foreach (IOrderItem item in dOrder.Items) + { + OrderLine l = new OrderLine(); + l.Quantity = item.Quantity; + l.ProductName = ListingProvider.GetListing(item.ListingItemId, false).Name + ", License: " + LicenseProvider.GetLicense(item.LicenseId).LicenseType.ToString(); + l.Price = (decimal)item.NetPrice; + l.ProductId = item.ListingItemId.ToString(); + l.Note = "deli order id: " + o.Id.ToString(); + + providerOrder.AddOrderLine(l); + } + + // generate invoice + if (!TestMode) + providerOrder.GenerateInvoice(false); + else + providerOrder.GenerateInvoice(true); + + + return providerOrder.OrderId; + } + catch + { + return 0; + } + } + + protected string CreateDotComOrder(IOrder dOrder, string transactionId) + { + com.umbraco.orders.Orders orderService = new com.umbraco.orders.Orders(); + com.umbraco.orders.OrderProxy orderProxy = new com.umbraco.orders.OrderProxy(); + com.umbraco.orders.BuyerProxy buyerProxy = new com.umbraco.orders.BuyerProxy(); + + // set up Ecomm Order + orderProxy.DeliOrderID = dOrder.Id; + orderProxy.PurchaseOrder = ""; + orderProxy.TransactionID = transactionId; + + // buyer + buyerProxy.ourMemberId = dOrder.Member.Id; + buyerProxy.ourMemberGuid = dOrder.Member.UniqueId; + buyerProxy.IP = dOrder.IP; + buyerProxy.Name = dOrder.Member.Name; + buyerProxy.Login = dOrder.Member.Name; + buyerProxy.Address = dOrder.Member.CompanyAddress; + buyerProxy.Company = dOrder.Member.Company; + buyerProxy.Country = Marketplace.library.GetCountry(dOrder.Member.CompanyCountry); + buyerProxy.Email = dOrder.CompanyInvoiceEmail; + buyerProxy.VAT = !dOrder.Member.VatInvalid?dOrder.Member.CompanyVATNumber:""; + buyerProxy.Phone = ""; + + //order lines + var orderLineProxyList = new List(); + + foreach(IOrderItem item in dOrder.Items) + { + com.umbraco.orders.OrderLineProxy lineProxy = new com.umbraco.orders.OrderLineProxy(); + IListingItem listingItem = ListingProvider.GetListing(item.ListingItemId); + + lineProxy.VendorEconomicID = listingItem.Vendor.EconomicId; + lineProxy.Amount = (decimal)item.NetPrice; + lineProxy.Quantity = item.Quantity; + lineProxy.description = ListingProvider.GetListing(item.ListingItemId, false).Name + ", License Type: " + LicenseProvider.GetLicense(item.LicenseId).LicenseType.ToString(); + + // add order line to order + orderLineProxyList.Add(lineProxy); + + } + + + orderProxy.OrderLines = orderLineProxyList.ToArray(); + orderProxy.Buyer = buyerProxy; + + bool isTestMode = bool.Parse(ConfigurationManager.AppSettings["deliPayPalTest"]); + + + com.umbraco.orders.OrderProxy returnOrderProxy = orderService.Create(orderProxy, isTestMode, ConfigurationManager.AppSettings["deliWebServiceUser"], ConfigurationManager.AppSettings["deliWebServicePass"]); + + + // set Ecomm order id + dOrder.OrderId = returnOrderProxy.EcommerceOrderID; + OrderProvider.SaveOrUpdate(dOrder); + + return returnOrderProxy.InvoicePath; + + } + + + #region Utilities + + private string Encode(string oldValue) + { + string newValue = oldValue.Replace("\"", "'"); + newValue = System.Web.HttpUtility.UrlEncode(newValue); + newValue = newValue.Replace("%2f", "/"); + return newValue; + } + + #endregion + + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.designer.cs b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.designer.cs new file mode 100644 index 00000000..e5847153 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalConfirm.ascx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Purchase { + + + public partial class PayPalConfirm { + + /// + /// PaymentConfirmPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel PaymentConfirmPanel; + + /// + /// InvoicePanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel InvoicePanel; + + /// + /// InvoiceLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink InvoiceLink; + + /// + /// PaymentPendingPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel PaymentPendingPanel; + } +} diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx new file mode 100644 index 00000000..19cffd8a --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx @@ -0,0 +1,42 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="PayPalPayment.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Purchase.PayPalPayment" %> + + +
    + + + + + + +<% +// PayPal item identifier +int i = 1; + +// build order post when more than one item in cart +foreach (Marketplace.Providers.OrderItem.DeliOrderItem item in Order.Items) +{ +%> + + + + +<% + i++; +} +%> + + + + + + + + + +
    + + + +     \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.cs b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.cs new file mode 100644 index 00000000..9c140fe5 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.cs @@ -0,0 +1,243 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using umbraco.cms.businesslogic.member; +using umbraco.businesslogic; + +using Marketplace.Interfaces; +using Marketplace.Providers; +using Marketplace.Providers.Orders; +using Marketplace.Providers.PaymentInfo; +using Marketplace.Providers.Listing; +using Marketplace.Providers.Accounting; +using System.Configuration; + +namespace Marketplace.usercontrols.Deli.Purchase +{ + public partial class PayPalPayment : System.Web.UI.UserControl + { + + #region Properties + + private bool testMode = bool.Parse(ConfigurationManager.AppSettings["deliPayPalTest"]); + public bool TestMode + { + get { return testMode; } + set { testMode = value; } + } + + private string merchantEmailAddress; + public string MerchantEmailAddress + { + get { return merchantEmailAddress; } + set { merchantEmailAddress = value; } + } + + private int notifyPageID; + public int NotiFyPageID + { + get { return notifyPageID; } + set { notifyPageID = value; } + } + + private int returnPageID; + public int ReturnPageID + { + get { return returnPageID; } + set { returnPageID = value; } + } + + public string _email = ""; + public string _totalPrice = ""; + public string _orderTaxTotal = ""; + public string _paypalurl = "https://www.paypal.com/cgi-bin/webscr"; + public string _notifyurl = ""; + public string _returnurl = ""; + + #endregion + + private ICartProvider _cartProvider; + public ICartProvider CartProvider + { + get + { + if (_cartProvider != null) + { + return _cartProvider; + } + else + { + _cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; + return _cartProvider; + } + } + } + + private ICart _cart; + public ICart ShoppingCart + { + get + { + if (_cart != null) + { + return _cart; + } + else + { + _cart = CartProvider.GetCurrentCart(); + return _cart; + } + } + set + { + _cart = value; + } + } + + private UmbracoEcommerceOrderProvider _orderProvider; + public UmbracoEcommerceOrderProvider OrderProvider + { + get + { + if (_orderProvider != null) + return _orderProvider; + else + { + _orderProvider = (UmbracoEcommerceOrderProvider)MarketplaceProviderManager.Providers["OrderProvider"]; + return _orderProvider; + } + } + } + + private IOrder _order; + public IOrder Order + { + get + { + if (_order != null) + return _order; + else + { + if (ShoppingCart.OrderId != null) + { + _order = OrderProvider.GetOrder((int)ShoppingCart.OrderId); + return _order; + } + else + { + _order = OrderProvider.CreateOrder(ShoppingCart); + return _order; + } + } + } + } + + private NodeListingProvider _listingProvider; + public NodeListingProvider ListingProvider + { + get + { + if (_listingProvider != null) + return _listingProvider; + else + { + _listingProvider = (NodeListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + return _listingProvider; + } + } + } + + private ILicenseProvider _licenseProvider; + public ILicenseProvider LicenseProvider + { + get + { + if (_licenseProvider != null) + return _licenseProvider; + else + { + _licenseProvider = (ILicenseProvider)MarketplaceProviderManager.Providers["LicenseProvider"]; + return _licenseProvider; + } + } + } + + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + private IMember _member; + public IMember Member + { + get + { + if (_member != null) + return _member; + else + { + _member = MemberProvider.GetCurrentMember(); + return _member; + } + } + } + + + protected void Page_Load(object sender, EventArgs e) + { + + if (umbraco.library.IsLoggedOn()) + { + if (Order.Member.Id == Member.Id) + { + pl_orderInfo.Visible = true; + + // set config + SetConfiguration(); + + _totalPrice = CartProvider.GetLocalizedCartGrossValue().ToString(); + _orderTaxTotal = CartProvider.GetLocalizedTaxTotal().ToString(); + + _email = Member.CompanyInvoiceEmail; + + // clear the cart from sesison + _cartProvider.ClearCart(); + + } + } + + } + + protected void SetConfiguration() + { + + _notifyurl = "http://" + Request.Url.Host + "/umbraco/ipn/production.aspx"; + _returnurl = "http://" + Request.Url.Host + umbraco.library.NiceUrl(Int32.Parse(ConfigurationManager.AppSettings["deliPayPalReturnUrl"].ToString())); + + merchantEmailAddress = "sales@umbraco.dk"; + + if (TestMode) + { + _paypalurl = "https://www.sandbox.paypal.com/cgi-bin/webscr"; + merchantEmailAddress = "paul@umbraco.com"; + _notifyurl = "http://dev.our.umbraco.org/umbraco/ipn/dev.aspx"; + _returnurl = "http://dev.our.umbraco.org/deli/order-confirm.aspx"; + } + + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.designer.cs b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.designer.cs new file mode 100644 index 00000000..3295387c --- /dev/null +++ b/Marketplace/usercontrols/Deli/Purchase/PayPalPayment.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.Purchase { + + + public partial class PayPalPayment { + + /// + /// pl_orderInfo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder pl_orderInfo; + } +} diff --git a/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx new file mode 100644 index 00000000..ef00f6e6 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx @@ -0,0 +1,215 @@ +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="RepoProjectView.ascx.cs" Inherits="Marketplace.usercontrols.Deli.RepoProjectView" %> +<%@ Import Namespace="Marketplace.Interfaces" %> + + +

    + +
    + + started this project on + + it's current version is + + + . +
    + +
    + + + + + + + + + + +
    + + Visit the Deli to Purchase a License for this project + +
    +     + +
    + +

    Project Summary

    +
    +
    Project owner:
    +
    + <%= Project.Vendor.Member.Name %> +
    + + + +
    Contributors:
    +
    + + + <%# Eval("ContributorName") %> + + +
    + +     + +
    Created:
    +
    + <%= Project.CreateDate.ToString("D") %> +
    + +
    Compatible with:
    +
    + +
    + +
    .NET Version:
    +
    + +
    + + +
    Supports Medium Trust:
    +
    + +
    + + + <% if(Project.Stable){ %> +
    Is Stable:
    +
    + Project is stable +
    + <%} %> + +
    Current version
    +
    + <%= Project.CurrentVersion %> +
    + + <% if (!string.IsNullOrEmpty(Project.LicenseName)) + { %> +
    License
    +
    + + <%= Project.LicenseName %> + +
    + <% } %> + + +
    Tags
    +
    + + "> + <%# Eval("Text") %> +   + +
    +     + + +
    Downloads:
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    + show more... +
    + +
    + +
    + + + + + + + + + +
    +
    + + +
    +

    + Please note: + the compatibility between this package and your umbraco version hasn't been verified by our admins yet +

    +
    +     + + +
    + +
    +
    + + More Information + + Visit the project's full page in the Deli + + +
    + + + + +
    +
    + + + \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.cs b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.cs new file mode 100644 index 00000000..53646962 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.cs @@ -0,0 +1,165 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; +using umbraco.cms.businesslogic.member; +using Marketplace.Helpers; +using Marketplace.Providers.Cart; +using Marketplace.Providers.Accounting; + + +namespace Marketplace.usercontrols.Deli +{ + + public partial class RepoProjectView : System.Web.UI.UserControl + { + public IListingItem Project { get; set; } + public string listingId; + + public string callback; + public string version; + public string useLegacySchema; + + + protected void Page_Load(object sender, EventArgs e) + { + var projectProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + + version = Request.QueryString["version"]; + useLegacySchema = Request.QueryString["useLegacySchema"]; + callback = Request.QueryString["callback"]; + + listingId = Request.QueryString["id"]; + + + int pId = 0; + if (int.TryParse(listingId, out pId)) + { + pId = int.Parse(listingId); + Project = projectProvider.GetListing(pId); + } + else + { + Project = projectProvider.GetCurrentListing(); + } + + if (!IsPostBack && Project != null) + { + projectProvider.IncrementProjectViews(Project); + SetupProject(); + } + + } + + private void SetupProject() + { + var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; + var archive = new List(); + + #region Verified File Notice + + var package = Project.PackageFile.Where(x => x.Current).FirstOrDefault(); + + if (package != null) + { + if (!package.Verified) + { + NotVerifiedNotice.Visible = true; + } + } + + #endregion + + #region Standard Features + + ProjectName.Text = Project.Name; + ProjectCreateDate.Text = String.Format("{0:D}", Project.CreateDate); + ProjectCurrentVersion.Text = Project.CurrentVersion; + VendorLink.Text = Project.Vendor.Member.Name; + VendorLink.NavigateUrl = "/member/" + Project.Vendor.Member.Id; + FullProjectLink.NavigateUrl = "http://deli.umbraco.org" + umbraco.library.NiceUrl(Project.Id); + + + if (Project.Description.Contains('<')) + { + ProjectDescrition.Text = uForum.Library.Xslt.ResolveLinks(Project.Description.Substring(0, 200)); + LongProjectDescription.Text = uForum.Library.Xslt.ResolveLinks(Project.Description.Substring(200)); + } + else + { + ProjectDescrition.Text = uForum.Library.Xslt.ResolveLinks(umbraco.library.ReplaceLineBreaks(Project.Description.Substring(0, 200))); + LongProjectDescription.Text = uForum.Library.Xslt.ResolveLinks(umbraco.library.ReplaceLineBreaks(Project.Description.Substring(200))); + } + + + + #endregion + + #region Screenshots + //screenshots + if (Project.ScreenShots.Count() > 0) + { + ScreenshotRepeater.DataSource = Project.ScreenShots; + ScreenshotRepeater.DataBind(); + } + else + { + ScreenshotsPanel.Visible = false; + } + + #endregion + + #region Documentation + //Documenation + + var docs = Project.DocumentationFile.Where(x => !x.Archived && x.FileType == FileType.docs).Select(x => new + { + Id = x.Id, + Name = x.Name, + FileType = x.FileType.FileTypeAsString(), + Vendor = vendorProvider.GetVendorById(x.CreatedBy), + }); + + ProjectDocRepeater.DataSource = docs; + ProjectDocRepeater.DataBind(); + #endregion + + #region Sidebar + + //download box + if (!string.IsNullOrEmpty(Project.CurrentReleaseFile)) + { + var file = Project.PackageFile.Where(x => x.Id == Int32.Parse(Project.CurrentReleaseFile)).FirstOrDefault(); + if (file != null) + { + ProjectCompatitbleWithUmbraco.Text = "TBI";//file.UmbVersion.Description; + ProjectCompatitbleWithDotNet.Text = file.DotNetVersion; + ProjectCompatitbleWithMediumTrust.Text = (file.SupportsMediumTrust) ? "Yes" : "No"; + } + + } + + DownloadCount.Text = Project.Downloads.ToString(); + + //Commercial options + PurchaseLink.NavigateUrl = "http://deli.umbraco.org" + umbraco.library.NiceUrl(Project.Id); + + if (Project.ListingType != ListingType.commercial) + { + CommercePanel.Visible = false; + } + + + } + + #endregion + + } + + + + } diff --git a/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.designer.cs b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.designer.cs new file mode 100644 index 00000000..529b7845 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Repository/RepoProjectView.ascx.designer.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class RepoProjectView { + + /// + /// ProjectName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectName; + + /// + /// VendorLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink VendorLink; + + /// + /// ProjectCreateDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCreateDate; + + /// + /// ProjectCurrentVersion control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCurrentVersion; + + /// + /// DownloadPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder DownloadPanel; + + /// + /// CommercePanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder CommercePanel; + + /// + /// PurchaseLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink PurchaseLink; + + /// + /// ContribRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ContribRepeater; + + /// + /// ProjectCompatitbleWithUmbraco control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCompatitbleWithUmbraco; + + /// + /// ProjectCompatitbleWithDotNet control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCompatitbleWithDotNet; + + /// + /// ProjectCompatitbleWithMediumTrust control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectCompatitbleWithMediumTrust; + + /// + /// TagRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater TagRepeater; + + /// + /// DownloadCount control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal DownloadCount; + + /// + /// ProjectDescrition control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal ProjectDescrition; + + /// + /// LongProjectDescription control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal LongProjectDescription; + + /// + /// ScreenshotsPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ScreenshotsPanel; + + /// + /// ScreenshotRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ScreenshotRepeater; + + /// + /// NotVerifiedNotice control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder NotVerifiedNotice; + + /// + /// FullProjectLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink FullProjectLink; + + /// + /// ProjectDocRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater ProjectDocRepeater; + } +} diff --git a/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx new file mode 100644 index 00000000..0d5e71b2 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx @@ -0,0 +1,46 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RefundRequest.ascx.cs" Inherits="Marketplace.usercontrols.Deli.MemberSupport.RefundRequest" %> + + + + + + + +
    + +Request a Refund + +

    + + +

    + +

    + + +

    + + +

    + +

    + +

    + +

    +
    + +     + + +

    Oops something went wrong, please try again.

    +     + + +

    Thank you for your refund request, we'll be in touch soon.

    +     \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.cs b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.cs new file mode 100644 index 00000000..0b740644 --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using Umbraco.Support.zendesk; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli.MemberSupport +{ + public partial class RefundRequest : System.Web.UI.UserControl + { + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + private IMember _member; + public IMember Member + { + get + { + if (_member != null) + return _member; + else + { + _member = MemberProvider.GetCurrentMember(); + return _member; + } + } + } + + protected void bt_submit_Click(object sender, EventArgs e) + { + pnlForm.Visible = false; + + try + { + string body = "Member name: " + Member.Name + "," + Member.Company + + "Order Date: " + OrderDate.Text + + "Refund Request: " + umbraco.library.ReplaceLineBreaks(tb_desc.Text); + + Ticket.Create(Member.Email, "Refund Request", body, "Deli", tb_package.Text); + + pnlSuccess.Visible = true; + } + catch + { + pnlError.Visible = false; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.designer.cs b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.designer.cs new file mode 100644 index 00000000..39123a6f --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Member/RefundRequest.ascx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.MemberSupport { + + + public partial class RefundRequest { + + /// + /// pnlForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlForm; + + /// + /// valsum control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ValidationSummary valsum; + + /// + /// RequiredFieldValidator3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3; + + /// + /// tb_package control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_package; + + /// + /// OrderDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox OrderDate; + + /// + /// RequiredFieldValidator2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2; + + /// + /// tb_desc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_desc; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + + /// + /// pnlError control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlError; + + /// + /// pnlSuccess control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSuccess; + } +} diff --git a/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx new file mode 100644 index 00000000..1cae4e2f --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx @@ -0,0 +1,47 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VendorSupportRequest.ascx.cs" Inherits="Marketplace.usercontrols.Deli.VendorSupport.VendorSupportRequest" %> + + + + + + + +
    + +Submit a support ticket +

    + +

    + +

    + + +

    + +

    + +

    + +

    + +

    +
    + + +     + + +

    Oops something went wrong, please try again.

    +     + + +

    Thank you for your support ticket, we'll be in touch soon.

    +     \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.cs b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.cs new file mode 100644 index 00000000..64a1aadd --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +using Umbraco.Support.zendesk; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli.VendorSupport +{ + public partial class VendorSupportRequest : System.Web.UI.UserControl + { + private IMemberProvider _memberProvider; + public IMemberProvider MemberProvider + { + get + { + if (_memberProvider != null) + return _memberProvider; + else + { + _memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; + return _memberProvider; + } + } + } + + private IMember _member; + public IMember Member + { + get + { + if (_member != null) + return _member; + else + { + _member = MemberProvider.GetCurrentMember(); + return _member; + } + } + } + + protected void bt_submit_Click(object sender, EventArgs e) + { + pnlForm.Visible = false; + + try + { + string body = "Submitted by Deli Vendor: " + Member.IsDeliVendor.ToString() + "\r\n" + + "Vendor name: " + Member.Name + "," + Member.Company + "\r\n" + + umbraco.library.ReplaceLineBreaks(tb_desc.Text); + + Ticket.Create(Member.Email, tb_subject.Text, body, "Deli", tb_package.Text); + + pnlSuccess.Visible = true; + } + catch + { + pnlError.Visible = false; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.designer.cs b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.designer.cs new file mode 100644 index 00000000..d840d70c --- /dev/null +++ b/Marketplace/usercontrols/Deli/Support/Vendor/VendorSupportRequest.ascx.designer.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli.VendorSupport { + + + public partial class VendorSupportRequest { + + /// + /// pnlForm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlForm; + + /// + /// valsum control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ValidationSummary valsum; + + /// + /// RequiredFieldValidator1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1; + + /// + /// tb_subject control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_subject; + + /// + /// RequiredFieldValidator3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3; + + /// + /// tb_package control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_package; + + /// + /// RequiredFieldValidator2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2; + + /// + /// tb_desc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_desc; + + /// + /// bt_submit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_submit; + + /// + /// pnlError control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlError; + + /// + /// pnlSuccess control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSuccess; + } +} diff --git a/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx new file mode 100644 index 00000000..5931ba38 --- /dev/null +++ b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="TopPaidProjectsList.ascx.cs" Inherits="Marketplace.usercontrols.Deli.TopPaidProjectsList" %> + + +
      +
    • "><%# Eval("Name") %>
      +<%--<%# Marketplace.library.GetManufacturerName(((Marketplace.Interfaces.IVendor)Eval("Vendor"))) %>--%> +
      •  +
    +     diff --git a/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.cs b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.cs new file mode 100644 index 00000000..d67a6471 --- /dev/null +++ b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Marketplace.Interfaces; +using Marketplace.Providers; + +namespace Marketplace.usercontrols.Deli +{ + public partial class TopPaidProjectsList : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; + var Projects = ProjectsProvider.GetTopPaidListings(0,5, true); + + + + TopRepeater.DataSource = Projects; + TopRepeater.DataBind(); + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.designer.cs b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.designer.cs new file mode 100644 index 00000000..2ec1bd44 --- /dev/null +++ b/Marketplace/usercontrols/Deli/TopPaidProjectsList.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.Deli { + + + public partial class TopPaidProjectsList { + + /// + /// TopRepeater control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater TopRepeater; + } +} diff --git a/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx b/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx new file mode 100644 index 00000000..2dcad174 --- /dev/null +++ b/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx @@ -0,0 +1,12 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HeaderLogin.ascx.cs" Inherits="our.usercontrols.HeaderLogin" %> + + + You are logged in as %name% + You are not logged in + + + Your profile + Log out + Log in + Create a profile + \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx new file mode 100644 index 00000000..b976e92c --- /dev/null +++ b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="Login_novalidationscript.ascx.cs" Inherits="Marketplace.usercontrols.ourUmbraco.Login_novalidationscript" %> + +
    +
    + +
    + Email + +
    + +
    + Password + +
    +
    + +
    +
    +
    +     \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs new file mode 100644 index 00000000..2d69ed36 --- /dev/null +++ b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace Marketplace.usercontrols.ourUmbraco +{ + public partial class Login_novalidationscript : System.Web.UI.UserControl + { + public int NextPage { get; set; } + public string ErrorMessage { get; set; } + + protected void Page_Load(object sender, EventArgs e) + { + umbraco.library.RegisterJavaScriptFile("jquery.validation", "/scripts/jquery.validation.js"); + } + + protected void login(object sender, EventArgs e) + { + string email = tb_email.Text; + string password = tb_password.Text; + string redirectUrl = Request.QueryString["redirectUrl"]; + + umbraco.cms.businesslogic.member.Member m = umbraco.cms.businesslogic.member.Member.GetMemberFromLoginNameAndPassword(email, password); + + if (m != null) + { + umbraco.cms.businesslogic.member.Member.AddMemberToCache(m); + + if (!string.IsNullOrEmpty(redirectUrl)) + Response.Redirect(redirectUrl); + + if (NextPage > 0) + Response.Redirect(umbraco.library.NiceUrl(NextPage) + "?loggedin=true"); + + } + else + { + lt_err.Text = "

    " + ErrorMessage + "

    "; + lt_err.Visible = true; + } + } + } +} \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs new file mode 100644 index 00000000..df1f141f --- /dev/null +++ b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Marketplace.usercontrols.ourUmbraco { + + + public partial class Login_novalidationscript { + + /// + /// Panel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel Panel1; + + /// + /// lt_err control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lt_err; + + /// + /// Label2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// tb_email control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_email; + + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// tb_password control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tb_password; + + /// + /// bt_login control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_login; + } +} diff --git a/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx b/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx new file mode 100644 index 00000000..b1360ea0 --- /dev/null +++ b/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx @@ -0,0 +1,27 @@ +<%@ Control Language="c#" AutoEventWireup="false" Codebehind="umbLogin.ascx.cs" Inherits="umbracoMemberControls.umbGroupSignInOut" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> + + + + + + + + + + + + + + +
    + +
    Password +
    +
    +     + + + + Sign Out + + diff --git a/Marketplace/xslt/repository.xslt b/Marketplace/xslt/repository.xslt new file mode 100644 index 00000000..ddd0b198 --- /dev/null +++ b/Marketplace/xslt/repository.xslt @@ -0,0 +1,423 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 0 + + + + + + v45l + v45 + v4 + all + v4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    + +

    Categories:

    +
    + +
    + + + + + + + +
    +     +
    +
    + +

    Latest Packages:

    +
    + + + 10 + +
    +
    + +

    +     + + + + + + +

    + +

    + + +

    +

    + + + + 99999999 + byName + + +
    + +

    +     + + + + +

    + +

    + + + +
    +

    + + + + + View complete project page +

    + +

    + Author: + + + +

    +
    + +

    Install

    + + + + + + + + + + + + + + +

    + + + + + + if(confirm('Are you sure you wish to download:\n\n\n\n'))document.location.href = 'http://&guid=' + + + + + + + + document.location.href = '' + + + + Download and Install Package Download and Install package + +

    + + +

    Documentation

    +

    + + + + + + + Download Documentation (opens in new window) Documentation (opens in new window) + + + + There's currently no documentation available + + +

    +     + + + + + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    +

    + + + +

    +

    + + + + + + + + + + +
    +

    + + Info More info and download + +
    +
    +     + + +
    +

    + Please note: the compatibility between this package and your umbraco version hasn't been verified by our admins yet. +

    +
    +     +     \ No newline at end of file diff --git a/our.umbraco.org.sln b/our.umbraco.org.sln index a4b787f5..9c1fdc01 100644 --- a/our.umbraco.org.sln +++ b/our.umbraco.org.sln @@ -38,6 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F3A30E EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uWiki", "uWiki\uWiki.csproj", "{996601FA-5C0E-46A6-B39D-2863BADC80D8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marketplace", "Marketplace\Marketplace.csproj", "{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -158,6 +160,16 @@ Global {996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|x86.ActiveCfg = Release|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Release|Any CPU.Build.0 = Release|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/repositories.config b/packages/repositories.config index b5941443..7636b066 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -1,5 +1,7 @@  + + From dad7eeffacdd384fd4c218ae7709f6437ad0ce76 Mon Sep 17 00:00:00 2001 From: TimGeyssens Date: Mon, 23 Feb 2015 15:57:11 +0100 Subject: [PATCH 2/7] ignore usercontrol files in /deli subfolder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index efb96b34..c13f9509 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ OurUmbraco.Site/App_Data/cache/ *.sln.ide/ NuGetBackup OurUmbraco.Site/web.config +OurUmbraco.Site/usercontrols/Deli/ From 59272124cda15a120439b64ff9bc4c9633a5d87a Mon Sep 17 00:00:00 2001 From: TimGeyssens Date: Mon, 23 Feb 2015 16:00:15 +0100 Subject: [PATCH 3/7] Adds marketplace dependencies --- .../MarketPlace/MarketPlace.Webservices.dll | Bin 0 -> 14848 bytes .../MarketPlace/Marketplace.BusinessLogic.dll | Bin 0 -> 11264 bytes dependencies/MarketPlace/Marketplace.Data.dll | Bin 0 -> 50688 bytes .../MarketPlace/Marketplace.Interfaces.dll | Bin 0 -> 34304 bytes .../MarketPlace/Marketplace.Presentation.dll | Bin 0 -> 5120 bytes .../MarketPlace/Marketplace.Providers.dll | Bin 0 -> 155648 bytes .../MarketPlace/Marketplace.Umbraco.dll | Bin 0 -> 5632 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 dependencies/MarketPlace/MarketPlace.Webservices.dll create mode 100644 dependencies/MarketPlace/Marketplace.BusinessLogic.dll create mode 100644 dependencies/MarketPlace/Marketplace.Data.dll create mode 100644 dependencies/MarketPlace/Marketplace.Interfaces.dll create mode 100644 dependencies/MarketPlace/Marketplace.Presentation.dll create mode 100644 dependencies/MarketPlace/Marketplace.Providers.dll create mode 100644 dependencies/MarketPlace/Marketplace.Umbraco.dll diff --git a/dependencies/MarketPlace/MarketPlace.Webservices.dll b/dependencies/MarketPlace/MarketPlace.Webservices.dll new file mode 100644 index 0000000000000000000000000000000000000000..bbee39af711c9f80b490e79d921e0d8694cde0a4 GIT binary patch literal 14848 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 H2R-ngxnWQi literal 0 HcmV?d00001 diff --git a/dependencies/MarketPlace/Marketplace.BusinessLogic.dll b/dependencies/MarketPlace/Marketplace.BusinessLogic.dll new file mode 100644 index 0000000000000000000000000000000000000000..f39457f7a6399a13dd146353fb1244bdcc9b9ac1 GIT binary patch literal 11264 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 literal 0 HcmV?d00001 diff --git a/dependencies/MarketPlace/Marketplace.Data.dll b/dependencies/MarketPlace/Marketplace.Data.dll new file mode 100644 index 0000000000000000000000000000000000000000..08caba981b219ea244345f65e127e56a2c5b180e GIT binary patch literal 50688 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 literal 0 HcmV?d00001 diff --git a/dependencies/MarketPlace/Marketplace.Interfaces.dll b/dependencies/MarketPlace/Marketplace.Interfaces.dll new file mode 100644 index 0000000000000000000000000000000000000000..d67eef50a883b294d2bec386ff77dda92fa5d6bc GIT binary patch literal 34304 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
    @@ -18,25 +18,29 @@
    - -
    - + +
    + + - - + + - + + + + - + @@ -61,7 +65,7 @@ - + @@ -73,7 +77,7 @@ - + @@ -87,7 +91,7 @@ - + @@ -100,15 +104,15 @@ - + - - + + @@ -166,22 +170,25 @@ - + - + + - - + + + - + - + + - + @@ -190,10 +197,12 @@ - - - - + + + + + + @@ -242,8 +251,9 @@ - - + + + @@ -254,13 +264,16 @@ - - + + - + + + - - + + + @@ -289,10 +302,12 @@ - - - - + + + + + + @@ -304,7 +319,7 @@ - + From fa80423162a061dd0170959eea179fa1117b9c3f Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 23 Feb 2015 19:39:30 +0100 Subject: [PATCH 5/7] fixes one of the ugliest things I've ever seen. You don't have to use razor macros in webforms just to write logic in views, which will also make it crazy slower. --- OurUmbraco.Site/masterpages/Master.master | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/OurUmbraco.Site/masterpages/Master.master b/OurUmbraco.Site/masterpages/Master.master index 5a81099c..5214cd6f 100644 --- a/OurUmbraco.Site/masterpages/Master.master +++ b/OurUmbraco.Site/masterpages/Master.master @@ -1,4 +1,5 @@ <%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> +<%@ Import Namespace="Umbraco.Web" %> @@ -50,14 +51,11 @@ - - @{ - var css = Model.Level > 2 && Model.AncestorOrSelf(3).Id == 1057 ? "profile has-sidebar" : Model.NodeTypeAlias.ToLower().Replace(" ","-"); - - } - - - +<% + var model = UmbracoContext.Current.PublishedContentRequest.PublishedContent; +%> + + "> @@ -116,7 +114,7 @@ - + From 36fad21dde02d7e09893f68f136db40933a29c28 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 23 Feb 2015 19:54:15 +0100 Subject: [PATCH 6/7] Fixes startup handlers to listen to the correct event --- NotificationsWeb/EventHandlers/Forum.cs | 2 +- our.umbraco.org/custom Handlers/ForumPostsCounter.cs | 2 +- uForum/NewForumHandler.cs | 2 +- uRepo/RepoStartupHandler.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NotificationsWeb/EventHandlers/Forum.cs b/NotificationsWeb/EventHandlers/Forum.cs index bf5dda68..44e8f0f0 100644 --- a/NotificationsWeb/EventHandlers/Forum.cs +++ b/NotificationsWeb/EventHandlers/Forum.cs @@ -13,7 +13,7 @@ namespace NotificationsWeb.EventHandlers { public class Forum : ApplicationEventHandler { - protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) { //sub comment author to topic CommentService.Created += CommentService_Created; diff --git a/our.umbraco.org/custom Handlers/ForumPostsCounter.cs b/our.umbraco.org/custom Handlers/ForumPostsCounter.cs index b78f661f..dafb8613 100644 --- a/our.umbraco.org/custom Handlers/ForumPostsCounter.cs +++ b/our.umbraco.org/custom Handlers/ForumPostsCounter.cs @@ -16,7 +16,7 @@ namespace our.custom_Handlers { * This handler updates the members forum posts counter * So the forum doesnt know about where and how the member stores these counts */ - protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) { TopicService.Created += TopicService_Created; CommentService.Created += CommentService_Created; diff --git a/uForum/NewForumHandler.cs b/uForum/NewForumHandler.cs index 596d5bdc..eae89ef6 100644 --- a/uForum/NewForumHandler.cs +++ b/uForum/NewForumHandler.cs @@ -13,7 +13,7 @@ namespace uForum { * This handler creates a forum entry in the forumForums table * When a forum node is created in the content tree, all forums are connected to a node */ - protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) { ContentService.Published += ContentService_Published; ContentService.Deleted += ContentService_Deleted; diff --git a/uRepo/RepoStartupHandler.cs b/uRepo/RepoStartupHandler.cs index 9cb56a77..7c1ea8df 100644 --- a/uRepo/RepoStartupHandler.cs +++ b/uRepo/RepoStartupHandler.cs @@ -6,7 +6,7 @@ namespace uRepo { public class AppStart : ApplicationEventHandler { - protected override void ApplicationInitialized(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) { RouteTable.Routes.MapHttpRoute( name: "RepoApi", From 45ddddb7c856ce98fc7a426fce7f40f99eaf1119 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 23 Feb 2015 23:44:00 +0100 Subject: [PATCH 7/7] Updates to latest examine commits new search controllers and views , updates examine config. --- Notification/Notification.csproj | 4 +- Notification/packages.config | 2 +- NotificationsWeb/NotificationsWeb.csproj | 6 +- NotificationsWeb/packages.config | 2 +- OurUmbraco.Site/OurUmbraco.Site.csproj | 8 +- OurUmbraco.Site/Views/Search/Search.cshtml | 29 +++ OurUmbraco.Site/Views/Web.config | 6 +- OurUmbraco.Site/config/ExamineIndex.config | 8 +- OurUmbraco.Site/config/ExamineSettings.config | 36 +-- OurUmbraco.Site/masterpages/Community.master | 14 +- OurUmbraco.Site/packages.config | 2 +- .../usercontrols/ExamineSearchResults.ascx | 11 +- .../our.umbraco.org/ExamineSearchResults.ascx | 11 +- .../Controllers/SearchController.cs | 40 ++++ our.umbraco.org/Models/SearchResultModel.cs | 26 +++ our.umbraco.org/SearchResultExtensions.cs | 207 ++++++++++++++++++ our.umbraco.org/Startup.cs | 80 +++++++ our.umbraco.org/our.umbraco.org.csproj | 12 +- our.umbraco.org/packages.config | 2 +- .../usercontrols/ExamineSearchResults.ascx | 11 +- .../usercontrols/ExamineSearchResults.ascx.cs | 205 +---------------- uDocumentation/packages.config | 2 +- uDocumentation/uDocumentation.csproj | 4 +- uEvents/packages.config | 2 +- uEvents/uEvents.csproj | 4 +- uForum/packages.config | 2 +- uForum/uForum.csproj | 4 +- uPowers/packages.config | 2 +- uPowers/uPowers.csproj | 4 +- uRepo/packages.config | 2 +- uRepo/uRepo.csproj | 3 + uVersion/packages.config | 2 +- uVersion/uVersion.csproj | 4 +- uWiki/packages.config | 2 +- uWiki/uWiki.csproj | 4 +- 35 files changed, 474 insertions(+), 289 deletions(-) create mode 100644 OurUmbraco.Site/Views/Search/Search.cshtml create mode 100644 our.umbraco.org/Controllers/SearchController.cs create mode 100644 our.umbraco.org/Models/SearchResultModel.cs create mode 100644 our.umbraco.org/SearchResultExtensions.cs create mode 100644 our.umbraco.org/Startup.cs diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index 1234f461..4cfb3b62 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -71,9 +71,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/Notification/packages.config b/Notification/packages.config index 7f7a1ce3..17e6222a 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -3,7 +3,7 @@ - + diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index 61cb92a0..534aeae8 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -71,9 +71,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False @@ -274,7 +274,7 @@ - + diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 7f7a1ce3..17e6222a 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -3,7 +3,7 @@ - + diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index a0411bc0..02bd4595 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -82,9 +82,9 @@ ..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll True - - False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + + ..\packages\Examine.0.1.60.2941\lib\Examine.dll + True ..\dependencies\Our\FergusonMoriyama.ConfigFormRenderer.dll @@ -4662,6 +4662,7 @@ + web.config @@ -4711,7 +4712,6 @@ - diff --git a/OurUmbraco.Site/Views/Search/Search.cshtml b/OurUmbraco.Site/Views/Search/Search.cshtml new file mode 100644 index 00000000..1e61ffe4 --- /dev/null +++ b/OurUmbraco.Site/Views/Search/Search.cshtml @@ -0,0 +1,29 @@ +@using our +@inherits UmbracoTemplatePage + +@{ + Layout = "~/Views/Layout.cshtml"; +} + +
    +

    Search results

    + + @foreach (var result in Model.Content.SearchResults) + { +
    +

    + + @result.GetTitle() + +

    +

    + @result.GenerateBlurb(250) +

    + @result.GetDate()
    http://our.umbraco.org/@result.FullUrl()     +
    + + } + + +

    Processed in @Model.Content.Totalmilliseconds milliseconds

    +
    \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Web.config b/OurUmbraco.Site/Views/Web.config index 801d9519..56486560 100644 --- a/OurUmbraco.Site/Views/Web.config +++ b/OurUmbraco.Site/Views/Web.config @@ -6,13 +6,13 @@
    - + - + - + diff --git a/OurUmbraco.Site/config/ExamineIndex.config b/OurUmbraco.Site/config/ExamineIndex.config index 90c2ab55..25e84686 100644 --- a/OurUmbraco.Site/config/ExamineIndex.config +++ b/OurUmbraco.Site/config/ExamineIndex.config @@ -100,11 +100,11 @@ More information and documentation can be found on CodePlex: http://umbracoexami - + - + @@ -115,6 +115,10 @@ More information and documentation can be found on CodePlex: http://umbracoexami + + + + diff --git a/OurUmbraco.Site/config/ExamineSettings.config b/OurUmbraco.Site/config/ExamineSettings.config index 87e61f45..ddf2b8ce 100644 --- a/OurUmbraco.Site/config/ExamineSettings.config +++ b/OurUmbraco.Site/config/ExamineSettings.config @@ -12,49 +12,37 @@ More information and documentation can be found on CodePlex: http://umbracoexami - + indexTypes="Documents" /> - - + analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" + indexTypes="documentation"/> - + analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/> + autoOptimize="false" + analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/> @@ -80,11 +68,11 @@ More information and documentation can be found on CodePlex: http://umbracoexami - - - + + + diff --git a/OurUmbraco.Site/masterpages/Community.master b/OurUmbraco.Site/masterpages/Community.master index 84631cd9..19f1e88b 100644 --- a/OurUmbraco.Site/masterpages/Community.master +++ b/OurUmbraco.Site/masterpages/Community.master @@ -1,10 +1,9 @@ <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> +<%@ Import Namespace="System.Web.Routing" %> +<%@ Import Namespace="System.Web.Mvc" %> - - -
    @@ -341,12 +340,17 @@ + +<% + var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(Context), new RouteData())); +%> +
    -
    +
    - +
    diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index bc28ada0..722e1726 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -4,7 +4,7 @@ - + diff --git a/OurUmbraco.Site/usercontrols/ExamineSearchResults.ascx b/OurUmbraco.Site/usercontrols/ExamineSearchResults.ascx index a55b1370..51c3fb27 100644 --- a/OurUmbraco.Site/usercontrols/ExamineSearchResults.ascx +++ b/OurUmbraco.Site/usercontrols/ExamineSearchResults.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ExamineSearchResults.ascx.cs" Inherits="our.usercontrols.ExamineSearchResults" %> <%@ Import Namespace="our.usercontrols" %> +<%@ Import Namespace="our" %>

    Please provide a longer search term

    @@ -24,17 +25,17 @@
    -
    +

    - - <%# ((Examine.SearchResult)Container.DataItem).getTitle() %> + + <%# ((Examine.SearchResult)Container.DataItem).GetTitle() %>

    - <%# ((Examine.SearchResult)Container.DataItem).generateBlurb(250) %> + <%# ((Examine.SearchResult)Container.DataItem).GenerateBlurb(250) %>

    - <%# ((Examine.SearchResult)Container.DataItem).getDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).fullURL()%>     + <%# ((Examine.SearchResult)Container.DataItem).GetDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).FullUrl()%>
    diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ExamineSearchResults.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ExamineSearchResults.ascx index 54b3ab5b..191cc4cd 100644 --- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ExamineSearchResults.ascx +++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ExamineSearchResults.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ExamineSearchResults.ascx.cs" Inherits="our.usercontrols.ExamineSearchResults" %> <%@ Import Namespace="our.usercontrols" %> +<%@ Import Namespace="our" %>

    Please provide a longer search term

    @@ -23,16 +24,16 @@
    -
    +

    - - <%# ((Examine.SearchResult)Container.DataItem).getTitle() %> + + <%# ((Examine.SearchResult)Container.DataItem).GetTitle() %>

    - <%# ((Examine.SearchResult)Container.DataItem).generateBlurb(250) %> + <%# ((Examine.SearchResult)Container.DataItem).GenerateBlurb(250) %>

    - <%# ((Examine.SearchResult)Container.DataItem).getDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).fullURL()%>     + <%# ((Examine.SearchResult)Container.DataItem).GetDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).FullUrl()%>
    diff --git a/our.umbraco.org/Controllers/SearchController.cs b/our.umbraco.org/Controllers/SearchController.cs new file mode 100644 index 00000000..bd6d7785 --- /dev/null +++ b/our.umbraco.org/Controllers/SearchController.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web.Mvc; +using Examine; +using Examine.LuceneEngine.Providers; +using our.Models; +using Umbraco.Web.Models; + +namespace our.Controllers +{ + public class SearchController : Controller + { + + public ActionResult Search(RenderModel model, string term) + { + var multiIndexSearchProvider = (MultiIndexSearcher)ExamineManager.Instance.SearchProviderCollection["MultiIndexSearcher"]; + + var criteria = multiIndexSearchProvider.CreateSearchCriteria(); + var compiled = criteria + .GroupedOr(new[] { "Body", "Body", "Title", "description", "nodeName" }, term) + .Compile(); + + var watch = new Stopwatch(); + watch.Start(); + //TODO: The result.TotalSearchResults will yield a max of 100 which is incorrect, this is an issue + // in Examine, it needs to limit the results to 100 but still tell you how many in total + var result = multiIndexSearchProvider.Search(compiled, 100); + watch.Stop(); + + return View(new RenderModel( + new SearchResultModel(model.Content, result, watch.ElapsedMilliseconds, term))); + } + + } + +} diff --git a/our.umbraco.org/Models/SearchResultModel.cs b/our.umbraco.org/Models/SearchResultModel.cs new file mode 100644 index 00000000..cc26d861 --- /dev/null +++ b/our.umbraco.org/Models/SearchResultModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Examine; +using Umbraco.Core.Models; +using Umbraco.Core.Models.PublishedContent; + +namespace our.Models +{ + public class SearchResultModel : PublishedContentWrapped + { + public ISearchResults SearchResults { get; private set; } + public double Totalmilliseconds { get; private set; } + public string SearchTerm { get; private set; } + + public SearchResultModel(IPublishedContent content, ISearchResults searchResults, double totalmilliseconds, string searchTerm) + : base(content) + { + SearchResults = searchResults; + Totalmilliseconds = totalmilliseconds; + SearchTerm = searchTerm; + } + } +} diff --git a/our.umbraco.org/SearchResultExtensions.cs b/our.umbraco.org/SearchResultExtensions.cs new file mode 100644 index 00000000..7a744241 --- /dev/null +++ b/our.umbraco.org/SearchResultExtensions.cs @@ -0,0 +1,207 @@ +using System; +using System.Data.SqlClient; +using System.Web; +using Examine; + +namespace our +{ + public static class SearchResultExtensions + { + public static string GetTitle(this SearchResult result) + { + if (result["__IndexType"] == "content") + return HttpContext.Current.Server.HtmlEncode(result["nodeName"]); + else if (result["__IndexType"] == "documents" || result["__IndexType"] == "documentation") + return HttpContext.Current.Server.HtmlEncode(result["Title"]); + else + return string.Empty; + + } + + public static string GetDate(this SearchResult result) + { + try + { + if (result["__IndexType"] == "content") + return HttpContext.Current.Server.HtmlEncode(string.Format("Last update: {0}", GetFormattedDateTime(result["updateDate"], "MMMM dd, yyyy"))); + + if (result["__IndexType"] == "documents") + return HttpContext.Current.Server.HtmlEncode(string.Format("Created: {0} / Last update: {1}", DateTime.Parse(result["Created"]).ToString("MMMM dd, yyyy HH:mm"), DateTime.Parse(result["Updated"]).ToString("MMMM dd, yyyy HH:mm"))); + + if (result["__IndexType"] == "documentation") + return HttpContext.Current.Server.HtmlEncode(string.Format("Last update: {0}", GetFormattedDateTime(result["dateCreatedSearchAble"], "MMMM dd, yyyy"))); + } + catch (FormatException ex) + { + // Catches "String was not recognized as a valid DateTime." errors + // TODO: Figure out why these errors occur.. + } + + return string.Empty; + } + + public static string GetDateSortable(this SearchResult result) + { + try + { + if (result["__IndexType"] == "content") + return GetFormattedDateTime(result["updateDate"], "yyyy-MM-dd HH:mm"); + + if (result["__IndexType"] == "documents") + return DateTime.Parse(result["Updated"]).ToString("yyyy-MM-dd HH:mm"); + + if (result["__IndexType"] == "documentation") + return GetFormattedDateTime(result["dateCreatedSearchAble"], "yyyy-MM-dd HH:mm"); + } + catch (FormatException ex) + { + // Catches "String was not recognized as a valid DateTime." errors + // TODO: Figure out why these errors occur.. + } + return string.Empty; + } + + public static string GetFormattedDateTime(string date, string format) + { + try + { + var dateTime = new DateTime(int.Parse(date.Substring(0, 4)), int.Parse(date.Substring(4, 2)), int.Parse(date.Substring(6, 2))); + return dateTime.ToString(format); + } + catch + { + return string.Empty; + } + } + + public static string FullUrl(this SearchResult result) + { + if (result["__IndexType"] == "content") + return umbraco.library.NiceUrl(result.Id); + + else if (result["__IndexType"] == "documentation") + { + return result["url"]; + } + else if (result["__IndexType"] == "documents") + return "TODO"; + //return uForum.Library.NiceTopicUrl(result.Id); + else + return string.Empty; + } + + public static string GenerateBlurb(this SearchResult result, int noOfChars) + { + var text = string.Empty; + + if (result["__IndexType"] == "content") + { + switch (result.Fields["nodeTypeAlias"]) + { + case "WikiPage": + //Wiki uses bodyText field + if (result.Fields.ContainsKey("bodyText")) + text = result.Fields["bodyText"]; + break; + case "Project": + //Project uses description field + if (result.Fields.ContainsKey("descripiton")) + text = result.Fields["description"]; + break; + } + + } + else if (result["__IndexType"] == "documents") + { + + try + { + if (result.Fields.ContainsKey("Body")) + text = result["Body"]; + } + catch { } + } + else if (result["__IndexType"] == "documentation") + { + + try + { + if (result.Fields.ContainsKey("Body")) + text = result["Body"]; + } + catch { } + } + + text = umbraco.library.StripHtml(text); + + if (text.Length > noOfChars && text.Length > 0) + { + text = text.Substring(0, noOfChars) + "..."; + } + + return text; + + } + + public static string CssClassName(this SearchResult result) + { + string cssClass = string.Empty; + + if (result["__IndexType"] == "content") + { + switch (result.Fields["nodeTypeAlias"]) + { + case "WikiPage": + cssClass = " wiki "; + break; + case "Project": + cssClass = " project "; + break; + } + } + else if (result["__IndexType"] == "documentation") + { + cssClass = " documentation "; + } + else if (result["__IndexType"] == "documents") + { + cssClass = " forum "; + + + SqlConnection cn = new SqlConnection(umbraco.GlobalSettings.DbDSN); + cn.Open(); + SqlCommand cmd = new SqlCommand("Select answer from forumTopics where id = @id", cn); + cmd.Parameters.AddWithValue("@id", result.Id); + int solved = 0; + try + { + int.TryParse(cmd.ExecuteScalar().ToString(), out solved); + } + catch { } + cn.Close(); + + if (solved != 0) + cssClass += "solution"; + } + + + return cssClass; + + } + + public static string BuildExamineString(this string term, int boost, string field, bool andSearch) + { + term = Lucene.Net.QueryParsers.QueryParser.Escape(term); + var terms = term.Trim().Split(' '); + var qs = field + ":"; + qs += "\"" + term + "\"^" + (boost + 30000).ToString() + " "; + qs += field + ":(+" + term.Replace(" ", " +") + ")^" + (boost + 5).ToString() + " "; + if (!andSearch) + { + qs += field + ":(" + term + ")^" + boost.ToString() + " "; + } return qs; + } + + + } +} \ No newline at end of file diff --git a/our.umbraco.org/Startup.cs b/our.umbraco.org/Startup.cs new file mode 100644 index 00000000..2a89b206 --- /dev/null +++ b/our.umbraco.org/Startup.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web; +using System.Web.Hosting; +using System.Web.Mvc; +using System.Web.Routing; +using Examine; +using Umbraco.Core; +using Umbraco.Web; +using Umbraco.Web.Mvc; +using Umbraco.Web.Security; + +namespace our +{ + public class StartupHandler : ApplicationEventHandler + { + private void CreateRoutes() + { + RouteTable.Routes.MapUmbracoRoute("Search", "search2/{term}", + new + { + Controller = "Search", + Action = "Search", + Term = UrlParameter.Optional + }, + //NOTE: This virtual page will be routed as if it were the root 'community' page + new UmbracoVirtualNodeByIdRouteHandler(1052)); + } + + private void BindExamineEvents() + { + ExamineManager.Instance.IndexProviderCollection["ProjectIndexer"].GatheringNodeData += ProjectIndexer_GatheringNodeData; + } + + /// + /// Need to ensures some custom data is added to this index + /// + /// + /// + void ProjectIndexer_GatheringNodeData(object sender, IndexingNodeDataEventArgs e) + { + //Need to add category, which is a parent folder if it has one, we only care about published data + // so we can just look this up from the published cache + + //TODO: To get at the IPublishedCaches it is only available on the UmbracoContext (which we need to fix) + // but since this method operates async, there isn't one, so we need to make our own to get at the cache + // object by creating a fake HttpContext. Not pretty but it works for now. + if (UmbracoContext.Current == null) + { + var dummyHttpContext = new HttpContextWrapper( + new HttpContext( + new SimpleWorkerRequest("blah.aspx", "", new StringWriter()))); + UmbracoContext.EnsureContext(dummyHttpContext, + ApplicationContext.Current, + new WebSecurity(dummyHttpContext, ApplicationContext.Current), false); + } + + var node = UmbracoContext.Current.ContentCache.GetById(e.NodeId); + if (node == null) return; + + //this has a project group which is it's category + if (node.Parent.DocumentTypeAlias == "ProjectGroup") + { + e.Fields["categoryFolder"] = node.Parent.Name; + } + + + } + + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + { + CreateRoutes(); + BindExamineEvents(); + } + } +} diff --git a/our.umbraco.org/our.umbraco.org.csproj b/our.umbraco.org/our.umbraco.org.csproj index 3555ca5a..4c3897bd 100644 --- a/our.umbraco.org/our.umbraco.org.csproj +++ b/our.umbraco.org/our.umbraco.org.csproj @@ -82,9 +82,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False @@ -248,6 +248,7 @@ + @@ -270,9 +271,11 @@ + + acceptTos.ascx ASPXCodeBehind @@ -357,6 +360,7 @@ ProjectForums.ascx + Signup.ascx ASPXCodeBehind @@ -376,9 +380,7 @@ ASPXCodeBehind - - ASPXCodeBehind - + ASPXCodeBehind diff --git a/our.umbraco.org/packages.config b/our.umbraco.org/packages.config index 7f7a1ce3..17e6222a 100644 --- a/our.umbraco.org/packages.config +++ b/our.umbraco.org/packages.config @@ -3,7 +3,7 @@ - + diff --git a/our.umbraco.org/usercontrols/ExamineSearchResults.ascx b/our.umbraco.org/usercontrols/ExamineSearchResults.ascx index 54b3ab5b..191cc4cd 100644 --- a/our.umbraco.org/usercontrols/ExamineSearchResults.ascx +++ b/our.umbraco.org/usercontrols/ExamineSearchResults.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ExamineSearchResults.ascx.cs" Inherits="our.usercontrols.ExamineSearchResults" %> <%@ Import Namespace="our.usercontrols" %> +<%@ Import Namespace="our" %>

    Please provide a longer search term

    @@ -23,16 +24,16 @@
    -
    +

    - - <%# ((Examine.SearchResult)Container.DataItem).getTitle() %> + + <%# ((Examine.SearchResult)Container.DataItem).GetTitle() %>

    - <%# ((Examine.SearchResult)Container.DataItem).generateBlurb(250) %> + <%# ((Examine.SearchResult)Container.DataItem).GenerateBlurb(250) %>

    - <%# ((Examine.SearchResult)Container.DataItem).getDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).fullURL()%>     + <%# ((Examine.SearchResult)Container.DataItem).GetDate() %>
    http://our.umbraco.org/<%# ((Examine.SearchResult)Container.DataItem).FullUrl()%>
    diff --git a/our.umbraco.org/usercontrols/ExamineSearchResults.ascx.cs b/our.umbraco.org/usercontrols/ExamineSearchResults.ascx.cs index c64addc2..cd18eefe 100644 --- a/our.umbraco.org/usercontrols/ExamineSearchResults.ascx.cs +++ b/our.umbraco.org/usercontrols/ExamineSearchResults.ascx.cs @@ -9,211 +9,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using Examine; using Examine.Providers; -using System.Data.SqlClient; using Examine.SearchCriteria; namespace our.usercontrols { - public static class SearchResultExtensions - { - public static string getTitle(this SearchResult result) - { - if (result["__IndexType"] == "content") - return HttpContext.Current.Server.HtmlEncode(result["nodeName"]); - else if (result["__IndexType"] == "documents" || result["__IndexType"] == "documentation") - return HttpContext.Current.Server.HtmlEncode(result["Title"]); - else - return string.Empty; - - } - - public static string getDate(this SearchResult result) - { - try - { - if (result["__IndexType"] == "content") - return HttpContext.Current.Server.HtmlEncode(string.Format("Last update: {0}", GetFormattedDateTime(result["updateDate"], "MMMM dd, yyyy"))); - - if (result["__IndexType"] == "documents") - return HttpContext.Current.Server.HtmlEncode(string.Format("Created: {0} / Last update: {1}", DateTime.Parse(result["Created"]).ToString("MMMM dd, yyyy HH:mm"), DateTime.Parse(result["Updated"]).ToString("MMMM dd, yyyy HH:mm"))); - - if (result["__IndexType"] == "documentation") - return HttpContext.Current.Server.HtmlEncode(string.Format("Last update: {0}", GetFormattedDateTime(result["dateCreatedSearchAble"], "MMMM dd, yyyy"))); - } - catch (FormatException ex) - { - // Catches "String was not recognized as a valid DateTime." errors - // TODO: Figure out why these errors occur.. - } - - return string.Empty; - } - - public static string getDateSortable(this SearchResult result) - { - try - { - if (result["__IndexType"] == "content") - return GetFormattedDateTime(result["updateDate"], "yyyy-MM-dd HH:mm"); - - if (result["__IndexType"] == "documents") - return DateTime.Parse(result["Updated"]).ToString("yyyy-MM-dd HH:mm"); - - if (result["__IndexType"] == "documentation") - return GetFormattedDateTime(result["dateCreatedSearchAble"], "yyyy-MM-dd HH:mm"); - } - catch (FormatException ex) - { - // Catches "String was not recognized as a valid DateTime." errors - // TODO: Figure out why these errors occur.. - } - return string.Empty; - } - - public static string GetFormattedDateTime(string date, string format) - { - try - { - var dateTime = new DateTime(int.Parse(date.Substring(0, 4)), int.Parse(date.Substring(4, 2)), int.Parse(date.Substring(6, 2))); - return dateTime.ToString(format); - } - catch - { - return string.Empty; - } - } - - public static string fullURL(this SearchResult result) - { - if (result["__IndexType"] == "content") - return umbraco.library.NiceUrl(result.Id); - - else if (result["__IndexType"] == "documentation") - { - return result["url"]; - } - else if (result["__IndexType"] == "documents") - return "TODO"; - //return uForum.Library.NiceTopicUrl(result.Id); - else - return string.Empty; - } - - public static string generateBlurb(this SearchResult result, int noOfChars) - { - var text = string.Empty; - - if (result["__IndexType"] == "content") - { - switch (result.Fields["nodeTypeAlias"]) - { - case "WikiPage": - //Wiki uses bodyText field - if (result.Fields.ContainsKey("bodyText")) - text = result.Fields["bodyText"]; - break; - case "Project": - //Project uses description field - if (result.Fields.ContainsKey("descripiton")) - text = result.Fields["description"]; - break; - } - - } - else if (result["__IndexType"] == "documents") - { - - try - { - if (result.Fields.ContainsKey("Body")) - text = result["Body"]; - } - catch { } - } - else if (result["__IndexType"] == "documentation") - { - - try - { - if (result.Fields.ContainsKey("Body")) - text = result["Body"]; - } - catch { } - } - - text = umbraco.library.StripHtml(text); - - if (text.Length > noOfChars && text.Length > 0) - { - text = text.Substring(0, noOfChars) + "..."; - } - - return text; - - } - - public static string cssClassName(this SearchResult result) - { - string cssClass = string.Empty; - - if (result["__IndexType"] == "content") - { - switch (result.Fields["nodeTypeAlias"]) - { - case "WikiPage": - cssClass = " wiki "; - break; - case "Project": - cssClass = " project "; - break; - } - } - else if (result["__IndexType"] == "documentation") - { - cssClass = " documentation "; - } - else if (result["__IndexType"] == "documents") - { - cssClass = " forum "; - - - SqlConnection cn = new SqlConnection(umbraco.GlobalSettings.DbDSN); - cn.Open(); - SqlCommand cmd = new SqlCommand("Select answer from forumTopics where id = @id", cn); - cmd.Parameters.AddWithValue("@id", result.Id); - int solved = 0; - try - { - int.TryParse(cmd.ExecuteScalar().ToString(), out solved); - } - catch { } - cn.Close(); - - if (solved != 0) - cssClass += "solution"; - } - - - return cssClass; - - } - - public static string BuildExamineString(this string term, int boost, string field, bool andSearch) - { - term = Lucene.Net.QueryParsers.QueryParser.Escape(term); - var terms = term.Trim().Split(' '); - var qs = field + ":"; - qs += "\"" + term + "\"^" + (boost + 30000).ToString() + " "; - qs += field + ":(+" + term.Replace(" ", " +") + ")^" + (boost + 5).ToString() + " "; - if (!andSearch) - { - qs += field + ":(" + term + ")^" + boost.ToString() + " "; - } return qs; - } - - - } - public partial class ExamineSearchResults : System.Web.UI.UserControl { @@ -305,12 +104,12 @@ namespace our.usercontrols if (sortOrder != null && sortOrder.ToLower() == "desc") { OrderByDateDescLink.CssClass = OrderByDateDescLink.CssClass + "linkNoColor"; - searchResults = searchResults.OrderByDescending(x => x.getDateSortable()); + searchResults = searchResults.OrderByDescending(x => x.GetDateSortable()); } else { OrderByDateAscLink.CssClass = OrderByDateAscLink.CssClass + "linkNoColor"; - searchResults = searchResults.OrderBy(x => x.getDateSortable()); + searchResults = searchResults.OrderBy(x => x.GetDateSortable()); } } else diff --git a/uDocumentation/packages.config b/uDocumentation/packages.config index aa38abdb..cc68fb5f 100644 --- a/uDocumentation/packages.config +++ b/uDocumentation/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uDocumentation/uDocumentation.csproj b/uDocumentation/uDocumentation.csproj index f73c0f90..e08ebf07 100644 --- a/uDocumentation/uDocumentation.csproj +++ b/uDocumentation/uDocumentation.csproj @@ -76,9 +76,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/uEvents/packages.config b/uEvents/packages.config index d01c4514..b3950745 100644 --- a/uEvents/packages.config +++ b/uEvents/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uEvents/uEvents.csproj b/uEvents/uEvents.csproj index cd0e57d6..06e7ec83 100644 --- a/uEvents/uEvents.csproj +++ b/uEvents/uEvents.csproj @@ -74,9 +74,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/uForum/packages.config b/uForum/packages.config index 491954a9..d0851cae 100644 --- a/uForum/packages.config +++ b/uForum/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uForum/uForum.csproj b/uForum/uForum.csproj index 56b53cba..ad171e3c 100644 --- a/uForum/uForum.csproj +++ b/uForum/uForum.csproj @@ -75,9 +75,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/uPowers/packages.config b/uPowers/packages.config index 7f7a1ce3..17e6222a 100644 --- a/uPowers/packages.config +++ b/uPowers/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uPowers/uPowers.csproj b/uPowers/uPowers.csproj index adc17d1f..f1b734bd 100644 --- a/uPowers/uPowers.csproj +++ b/uPowers/uPowers.csproj @@ -75,9 +75,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/uRepo/packages.config b/uRepo/packages.config index 2c646d99..63e8de37 100644 --- a/uRepo/packages.config +++ b/uRepo/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uRepo/uRepo.csproj b/uRepo/uRepo.csproj index 882b3c98..0f52baea 100644 --- a/uRepo/uRepo.csproj +++ b/uRepo/uRepo.csproj @@ -60,6 +60,9 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\Examine.0.1.60.2941\lib\Examine.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll diff --git a/uVersion/packages.config b/uVersion/packages.config index 7f7a1ce3..17e6222a 100644 --- a/uVersion/packages.config +++ b/uVersion/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uVersion/uVersion.csproj b/uVersion/uVersion.csproj index ac14ad24..a55b89ad 100644 --- a/uVersion/uVersion.csproj +++ b/uVersion/uVersion.csproj @@ -66,9 +66,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False diff --git a/uWiki/packages.config b/uWiki/packages.config index 7f7a1ce3..17e6222a 100644 --- a/uWiki/packages.config +++ b/uWiki/packages.config @@ -3,7 +3,7 @@ - + diff --git a/uWiki/uWiki.csproj b/uWiki/uWiki.csproj index 25ab32b2..1ed2e182 100644 --- a/uWiki/uWiki.csproj +++ b/uWiki/uWiki.csproj @@ -71,9 +71,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - + False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False

    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 literal 0 HcmV?d00001 diff --git a/dependencies/MarketPlace/Marketplace.Umbraco.dll b/dependencies/MarketPlace/Marketplace.Umbraco.dll new file mode 100644 index 0000000000000000000000000000000000000000..2a03ff52a4b0241145ab109a558019b73c49bf64 GIT binary patch literal 5632 zcmeHLTWl298UAN>yuJXYc)11=#xaqMskdum2($!zSpzPtZSa~)vn`&TJzfu zC`uk8rBcs&zVqMCfBy5I%baoMTQ?|1L>iul4~gDD&81)Br^7tdtvm0v(%t6w+TT!4 zzSo|ev3$Mkxkb+?>89a0ZlLFd?o}M!a`g1rgkEwBBDro|%dW`v_%P8)B}N-}{UclJ z?LMjPYm_x`4oN(ej&`Hg@$};%`ii90Fm4t^W<>K~Amv1*qEHhn8^$2oN&&)DCCS+01OjnoM*+zr_sq1=;RAZfJ z8z)ukM0QX&bYeN+uZt*=QfU*cVX%QZ(JtPZKzkRdX_1jZw>{NBv#8MlY+&8e;%^47 zp}4yRbwb;dY|}cof?P|DP3|@jHGD+U+krl&JMLnQpc7a>3L??4p`rUve_P+CeX<$O zx4VzA_OH~qZVxqgk%DUr?L#SC-|+HM{^7vw}ayXhCr z&CGoC#9o9Vd&fXo$N7+%=Dmf;3AvCmxREu>*@k(xXKSW8_a^0l59nRstIAa+PJdSJ z0Y8vPD$_e99*}rSqAl^N#JAL2YMlNe@$XXdk;Japme>#-M#pg~#WJxt{aE5#z!v%- z_C6#{+Pm~LJtkMfIV~q+3M1qED#*;^)PszMTukW(wL@Yra9rmGKWw@v$5V{BIc!md z$`SWGbShnqxEG;Q=|;r;1iBdgD&l?#U5s7}xvh68fi3*z0=EU+eaYRVd&qJlY3+n^ zlm0~=;5fT82z@C!kf<~VjL~If8{I`8?GkrO?2&j-;(){viKirn0v@5C0u%JA#Ab=N>EE#oPML?X^K_fmYXUUeY^2><1t;W_+7-x$v=$)e=r(aS z*3t>>I<#Zj%k(xCv;^t&BBc>CW0JPhqe>FvW!ys@z{~Us@CEuga4%^Z83=@qhDd1U&IUq}8 zcvK)iykayUpOlTDnD2R~@_p?~uhm|acGH#(_i^G&L zyjc;HZNn7F$x_}kOgCAuZHnkK!t*WHS=DT?;#-dJ{gZCdGO6U7u4h|$nyC7LDA8E{ zqA&w0ir_-ciC;&veAFljVxc5hk`}({S>=GcWJNunGy~V8w3s$3c2IK}c9tA+Z5zFz znV&o+9N{6Lv?T?GSDosmfjPsnjl3LR&iz(Rn{{KqJ-tPN-NB0#j6W`Sz<<LU?nQDSR4oOJ^+K!gMbBI##g? zi(GB=QA$@Tj#>+AVNn@%o3@Oi*U^Pg{j?cbp8Ct0gFx@cB4VpAQ-eQeti7RbmWE zQE6+!J!Dhcd8KVK9#*&*Z`$x}XyaV9O=>z$_eNcXB%z>tb!TH_898g4jEK-)&EVCY z939RsY|XDmX?qIyr+vvDg|e+17nGa>+o&GG=>7pEuE6EA(|&g71wR5j3YyFBv=2WC??l`Km#{t(GV%t+>$$$9 z!6@)*kOw~&zKaBWIy6nLG}|RxWuY}7^`SQ?fSn62EU#(5hEu+g1+cOpFRtS02ht{m zafiP?%5x5IYv%8qA^0m%S@u!IhzxKzTTwFbXu_|HzFkCxgM!9!Lsl00NW;>XHWob8 z$CiN~4>wo=X<0^Yf=<#TyyxYJO!(xvXsYvf1~wi%E{?GWZBh#l_rDePoTWh8I_Sr) zi~6(mo1_9-@potrcXowN!dFpx;%t8dM Date: Mon, 23 Feb 2015 19:21:41 +0100 Subject: [PATCH 4/7] Fixes web.config to have the correct config section which is required to index the documentation on the site. --- OurUmbraco.Site/web.config | 89 ++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/OurUmbraco.Site/web.config b/OurUmbraco.Site/web.config index 781ca38b..a7374c72 100644 --- a/OurUmbraco.Site/web.config +++ b/OurUmbraco.Site/web.config @@ -1,6 +1,6 @@  - +