diff --git a/pickuphockey/Controllers/SessionsController.cs b/pickuphockey/Controllers/SessionsController.cs index 38e6fce..d63dc38 100644 --- a/pickuphockey/Controllers/SessionsController.cs +++ b/pickuphockey/Controllers/SessionsController.cs @@ -150,7 +150,7 @@ public ActionResult Create() [HttpPost] [ValidateAntiForgeryToken] [Authorize(Roles = "Admin")] - public ActionResult Create([Bind(Include = "SessionId,SessionDate,Note,RegularSetId,BuyDayMinimum")] Session session) + public ActionResult Create([Bind(Include = "SessionId,SessionDate,Note,RegularSetId,BuyDayMinimum,Cost")] Session session) { if (!ModelState.IsValid) return View(session); var now = DateTime.UtcNow; @@ -221,7 +221,7 @@ public ActionResult Edit(int? id) [HttpPost] [ValidateAntiForgeryToken] [Authorize(Roles = "Admin")] - public ActionResult Edit([Bind(Include = "SessionId,SessionDate,CreateDateTime,Note,RegularSetId,BuyDayMinimum")] Session session) + public ActionResult Edit([Bind(Include = "SessionId,SessionDate,CreateDateTime,Note,RegularSetId,BuyDayMinimum,Cost")] Session session) { if (!ModelState.IsValid) return View(session); diff --git a/pickuphockey/Migrations/202412112253129_SessionCost.Designer.cs b/pickuphockey/Migrations/202412112253129_SessionCost.Designer.cs new file mode 100644 index 0000000..5addf14 --- /dev/null +++ b/pickuphockey/Migrations/202412112253129_SessionCost.Designer.cs @@ -0,0 +1,29 @@ +// +namespace pickuphockey.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.5.1")] + public sealed partial class SessionCost : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(SessionCost)); + + string IMigrationMetadata.Id + { + get { return "202412112253129_SessionCost"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/pickuphockey/Migrations/202412112253129_SessionCost.cs b/pickuphockey/Migrations/202412112253129_SessionCost.cs new file mode 100644 index 0000000..d9ce133 --- /dev/null +++ b/pickuphockey/Migrations/202412112253129_SessionCost.cs @@ -0,0 +1,18 @@ +namespace pickuphockey.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class SessionCost : DbMigration + { + public override void Up() + { + AddColumn("dbo.Sessions", "Cost", c => c.Decimal(nullable: false, precision: 18, scale: 2)); + } + + public override void Down() + { + DropColumn("dbo.Sessions", "Cost"); + } + } +} diff --git a/pickuphockey/Migrations/202412112253129_SessionCost.resx b/pickuphockey/Migrations/202412112253129_SessionCost.resx new file mode 100644 index 0000000..7ccea14 --- /dev/null +++ b/pickuphockey/Migrations/202412112253129_SessionCost.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/pickuphockey/Models/Session.cs b/pickuphockey/Models/Session.cs index 1313d23..ce62ab2 100644 --- a/pickuphockey/Models/Session.cs +++ b/pickuphockey/Models/Session.cs @@ -139,6 +139,9 @@ public bool AlreadySold() [ForeignKey("RegularSetId")] public virtual RegularSet RegularSet { get; set; } + [DisplayName("Cost")] + public decimal Cost { get; set; } + [DisplayName("Roster")] [NotMapped] public virtual ICollection Regulars { get; set; } diff --git a/pickuphockey/Views/BuySells/Payment.cshtml b/pickuphockey/Views/BuySells/Payment.cshtml index d68dabd..a5ef6e3 100644 --- a/pickuphockey/Views/BuySells/Payment.cshtml +++ b/pickuphockey/Views/BuySells/Payment.cshtml @@ -14,6 +14,8 @@ // https://gabeoleary.com/posts/venmo-deeplinking-including-from-web-apps var VenmoUrl = "https://venmo.com"; + + var cost = (item.Session.Cost == 0) ? System.Configuration.ConfigurationManager.AppSettings["SessionBuyPrice"] : item.Session.Cost.ToString("F2"); }

Payment for a Spot for @ViewBag.SessionDate.ToString("dddd, MM/dd/yyyy, HH:mm")

@@ -26,7 +28,7 @@
Seller: @item.SellerUser.FullName, @item.SellerUser.Email
- Amount: $@System.Configuration.ConfigurationManager.AppSettings["SessionBuyPrice"] + Amount: $@cost
@if (!string.IsNullOrEmpty(item.SellerUserId) && !string.IsNullOrEmpty(item.BuyerUserId) && item.BuyerUserId == userid && !item.PaymentSent) @@ -37,7 +39,7 @@
- + @if (!string.IsNullOrEmpty(item.SellerUser.MobileLast4)) { @@ -60,7 +62,7 @@ - + diff --git a/pickuphockey/Views/Sessions/Create.cshtml b/pickuphockey/Views/Sessions/Create.cshtml index 1b90b45..23ea1ce 100644 --- a/pickuphockey/Views/Sessions/Create.cshtml +++ b/pickuphockey/Views/Sessions/Create.cshtml @@ -3,6 +3,7 @@ ViewBag.Title = "Create Session"; ViewBag.dst = new pickuphockey.Models.Session()._defaultStartTime.ToString(@"hh\:mm"); var _buyDayMinimum = System.Configuration.ConfigurationManager.AppSettings["BuyDayMinimum"]; + var _cost = System.Configuration.ConfigurationManager.AppSettings["SessionBuyPrice"]; }

Create Session

@@ -34,6 +35,12 @@ @Html.TextBoxFor(model => model.BuyDayMinimum, new { @Value = _buyDayMinimum, style = "width: 40px;" }) +
+ @Html.LabelFor(model => model.Cost, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.TextBoxFor(model => model.Cost, new { @Value = _cost, style = "width: 60px;" }) +
+
@Html.LabelFor(model => model.RegularSetId, htmlAttributes: new { @class = "control-label col-md-2" })
diff --git a/pickuphockey/Views/Sessions/Details.cshtml b/pickuphockey/Views/Sessions/Details.cshtml index 6f33c2e..2e3f1f3 100644 --- a/pickuphockey/Views/Sessions/Details.cshtml +++ b/pickuphockey/Views/Sessions/Details.cshtml @@ -12,6 +12,7 @@ var alreadySold = Model.AlreadySold(); var unmarkedReceivedCount = Model.UnmarkedReceived.Count(); var unmarkedSentCount = Model.UnmarkedSent.Count(); + var cost = (Model.Cost == 0) ? System.Configuration.ConfigurationManager.AppSettings["SessionBuyPrice"] : Model.Cost.ToString("F2"); }

@Html.DisplayFor(model => model.SessionDate)

@@ -152,6 +153,7 @@
}
+ Cost: $@cost } else diff --git a/pickuphockey/Views/Sessions/Edit.cshtml b/pickuphockey/Views/Sessions/Edit.cshtml index 24edfa7..0690242 100644 --- a/pickuphockey/Views/Sessions/Edit.cshtml +++ b/pickuphockey/Views/Sessions/Edit.cshtml @@ -36,6 +36,12 @@ @Html.TextBoxFor(model => model.BuyDayMinimum, new { style = "width: 40px;" }) +
+ @Html.LabelFor(model => model.Cost, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.TextBoxFor(model => model.Cost, new { style = "width: 60px;" }) +
+
@Html.LabelFor(model => model.RegularSetId, htmlAttributes: new { @class = "control-label col-md-2" })
diff --git a/pickuphockey/pickuphockey.csproj b/pickuphockey/pickuphockey.csproj index f7189e7..caeaec2 100644 --- a/pickuphockey/pickuphockey.csproj +++ b/pickuphockey/pickuphockey.csproj @@ -425,6 +425,10 @@ 202312061956109_Locker Room 13.cs + + + 202412112253129_SessionCost.cs + @@ -809,6 +813,9 @@ 202312061956109_Locker Room 13.cs + + 202412112253129_SessionCost.cs + 10.0 diff --git a/scripts/Create Stub Account.sql b/scripts/Create Stub Account.sql index 385c962..82554d6 100644 --- a/scripts/Create Stub Account.sql +++ b/scripts/Create Stub Account.sql @@ -13,7 +13,7 @@ set @venmo = 'john-bryan-17' set @paypal = 'mail@johnbryan.tv' set @last4 = '1672' set @first = 'John' -set @last = 'Bryan - 24' -set @user = 'johnbryan24@brettmorrison.com' -insert into aspnetusers (id, email, emailconfirmed, phonenumberconfirmed, twofactorenabled, lockoutenabled, accessfailedcount, username, passwordhash, securitystamp, firstname, lastname, notificationpreference, paypalemail, venmoaccount, mobilelast4, active) -values (newid(), @user, 1, 0, 0, 1, 0, @user, newid(), newid(), @first, @last, 0, @paypal, @venmo, @last4, 0) +set @last = 'Bryan - 26' +set @user = 'johnbryan26@brettmorrison.com' +insert into aspnetusers (id, email, emailconfirmed, phonenumberconfirmed, twofactorenabled, lockoutenabled, accessfailedcount, username, passwordhash, securitystamp, firstname, lastname, notificationpreference, paypalemail, venmoaccount, mobilelast4, active, NormalizedEmail, NormalizedUserName) +values (newid(), @user, 1, 0, 0, 1, 0, @user, newid(), newid(), @first, @last, 0, @paypal, @venmo, @last4, 0, UPPER(@user), UPPER(@user))