Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #68 from akritikos/donna_dev
Browse files Browse the repository at this point in the history 
Bad karma
  • Loading branch information
@devgenid
devgenid committed Nov 20, 2017
2 parents 9043924 + fd8141d commit fb4f717
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 75 deletions.
6 changes: 0 additions & 6 deletions EzPay.WebApp/Controllers/CitizenController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,6 @@ public async Task<IActionResult> ChangePassword()
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}

/*var hasPassword = await _userManager.HasPasswordAsync(user);
if (!hasPassword)
{
return RedirectToAction(nameof(SetPassword));
}*/

var model = new LoginViewModel { StatusMessage = CitizenStatusMessage };
return View(model);
}
Expand Down
11 changes: 10 additions & 1 deletion EzPay.WebApp/Controllers/PaymentController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
using Microsoft.AspNetCore.Identity;
using EzPay.Model;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Authorization;

namespace EzPay.WebApp.Controllers
{
[Authorize]
public class PaymentController : Controller
{
private readonly UserManager<Citizen> _userManager;
Expand Down Expand Up @@ -46,8 +48,15 @@ public async Task<IActionResult> Index(Guid id)
return View(model);
}

public IActionResult Pay(Guid id)

public async Task<IActionResult> Pay(Guid id)
{
var user = await _userManager.GetUserAsync(User);
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}

Payment payment = new Payment();
payment.BillId = id;
payment.Date = DateTime.Now;
Expand Down
28 changes: 11 additions & 17 deletions EzPay.WebApp/Controllers/SettlementDetailsController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
using Microsoft.AspNetCore.Identity;
using EzPay.Model;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Authorization;

namespace EzPay.WebApp.Controllers
{
[Authorize]
public class SettlementDetailsController : Controller
{
private readonly UserManager<Citizen> _userManager;
Expand Down Expand Up @@ -39,23 +41,9 @@ public async Task<IActionResult> Settle(LoginViewModel model)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}
//var model = new LoginViewModel
//{
// CitizenId = user.Id,
// FirstName = user.FirstName,
// LastName = user.LastName,
// Address = user.Address,
// County = user.County,
// Email = user.Email,
// PhoneNumber = user.PhoneNumber,
// Bills = _ctx.GetSet<Bill>().Where(c => c.CitizenId == user.Id)
// .Where(c => c.IsSelected == true)
// .Include(b => b.Settlement)
// .Include(b => b.Payment),
// Settlements = _ctx.GetSet<Settlement>().Where(c => c.CitizenId == user.Id)
// .Include(b => b.Bills),

model.SettlementTypes = _ctx.GetSet<SettlementType>().AsQueryable();
//};

model.Bills = model.BillsList.Where(b => b.IsSelected == true);
return View(model);
}
Expand Down Expand Up @@ -109,8 +97,14 @@ public async Task<IActionResult> SubmitSettlement(LoginViewModel model)
}

[HttpGet]
public IActionResult BillsInSettlement(Guid id)
public async Task<IActionResult> BillsInSettlement(Guid id)
{
var user = await _userManager.GetUserAsync(User);
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}

var model = new LoginViewModel
{
Bills = _ctx.GetSet<Bill>().Where(c => c.SettlementId == id)
Expand Down
104 changes: 56 additions & 48 deletions EzPay.WebApp/Views/Payment/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,70 +50,78 @@
</div>

<div class="form-group">
<label for="CardIssuer" class="sr-only">Card Issuer</label>
<div class="col-xs-12 col-sm-4 col-sm-offset-3">
<label for="expdate" class="sr-only">Exp. Date:</label>
<div class="col-xs-12 col-sm-6 col-sm-offset-3">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-university" aria-hidden="true"></i></span>
<select class="form-control" id="CardIssuer">
<option>VISA</option>
<option>Mastercard</option>
<option>Maestro</option>
<option>American Express</option>
<option>Diners</option>
</select>
<span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
<input type="month" name="expdate" id="expdate" required class="form-control" />
</div>
</div>
</div>

<label for="cvv2" class="sr-only">CVV2:</label>
<div class="col-xs-6 col-sm-2 mtop15-mob">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-hashtag" aria-hidden="true"></i></span>
<input type="number" min="3" maxlength="4" required class="form-control" name="cvv2" id="cvv2" placeholder="CVV" />
<div class="form-group">
<label for="CardIssuer" class="sr-only">Card Issuer</label>
<div class="col-xs-12 col-sm-4 col-sm-offset-3">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-university" aria-hidden="true"></i></span>
<select class="form-control" id="CardIssuer">
<option>VISA</option>
<option>Mastercard</option>
<option>Maestro</option>
<option>American Express</option>
<option>Diners</option>
</select>
</div>
</div>
</div>

</div>
<label for="cvv2" class="sr-only">CVV2:</label>
<div class="col-xs-6 col-sm-2 mtop15-mob">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-hashtag" aria-hidden="true"></i></span>
<input type="number" min="3" maxlength="4" required class="form-control" name="cvv2" id="cvv2" placeholder="CVV" />
</div>
</div>

<div class="form-group">
<div class="col-xs-12 col-sm-6 col-sm-offset-3">
<button type="submit" class="btn btn-primary col-xs-3 col-sm-3 lc" onclick="return is_valid_card();">Pay your bill</button>
<a asp-controller="Citizen" asp-action="Index" class="btn btn-default col-xs-3 col-sm-3 pull-right lc">Go Back</a>
</div>
</div>

<script>
<div class="form-group">
<div class="col-xs-12 col-sm-6 col-sm-offset-3">
<button type="submit" class="btn btn-primary col-xs-3 col-sm-3 lc" onclick="return is_valid_card();">Pay your bill</button>
<a asp-controller="Citizen" asp-action="Index" class="btn btn-default col-xs-3 col-sm-3 pull-right lc">Go Back</a>
</div>
</div>

<script>
function is_valid_card()
{
var ccNum = document.getElementById("cardno").value;
function is_valid_card() {
var ccNum = document.getElementById("cardno").value;
var arr = [0, 2, 4, 6, 8, 1, 3, 5, 7, 9];
var
len = ccNum.length,
bit = 1,
sum = 0,
val;
var arr = [0, 2, 4, 6, 8, 1, 3, 5, 7, 9];
var
len = ccNum.length,
bit = 1,
sum = 0,
val;
if (len < 13 || len > 19)
return false;
if (len < 13 || len > 19)
return false;
while (len)
{
val = parseInt(ccNum.charAt(--len), 10);
sum += (bit ^= 1) ? arr[val] : val;
}
while (len) {
val = parseInt(ccNum.charAt(--len), 10);
sum += (bit ^= 1) ? arr[val] : val;
}
var result = sum && sum % 10 === 0;
var result = sum && sum % 10 === 0;
if (result == false)
alert("Invalid card number");
if (result == false)
alert("Invalid card number");
return result;
}
</script>
return result;
}
</script>
</form>

@section Scripts {
Expand Down
6 changes: 4 additions & 2 deletions EzPay.WebApp/wwwroot/css/site.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
padding-top: 60px;
padding-bottom: 60px;
padding-bottom: 80px;
}

.container {
Expand Down Expand Up @@ -112,7 +112,9 @@ div .lc ul {
}

input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
input[type=number]::-webkit-outer-spin-button,
input[type=month]::-webkit-inner-spin-button,
input[type=month]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# .NET Coding School [![Build Status](https://travis-ci.com/akritikos/qualco.svg?token=mYyotAgYHz5qAPrDsB42&branch=master)](https://travis-ci.com/akritikos/qualco)
# .NET Coding School [![Build Status](https://travis-ci.org/akritikos/akritikos.github.io.svg?branch=master)](https://travis-ci.com/akritikos/qualco)

## Qualco Project (Team #2)

Expand Down

0 comments on commit fb4f717

Please sign in to comment.