Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Payment Change screen started
  • Loading branch information
@adl13006
adl13006 committed Dec 2, 2015
1 parent cdbef39 commit 586c2df
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 37 deletions.
35 changes: 3 additions & 32 deletions TeamDBAwesome/TeamDBAwesome/js/homeController.js
View file
Expand Up @@ -2,26 +2,6 @@ angular.module('routerApp').controller('homeController', function ($scope, $http

/* BEGIN FUNCTIONS FUNCTIONS */

$scope.authenticateAdmin = function (id, pass) {
return $q(function (resolve, reject) {
var param = id + " " + pass;
var promise = $http.post(url + "/authenticateAdmin", param)
.success(function (data) {
if (data.STATUS == 555) {
$scope.authenticated = false;
resolve('We did it');
} else {
$scope.authenticated = true;
resolve('We did it');
}
})
.error(function (data, status, headers, config) {
$scope.messages = 'There was a network error. Try again later.';
reject('We did not do it');
});
})
}

// Function to register new users.
$scope.createUser = function (newUser) {
// TODO: Make Service fit into things.
Expand Down Expand Up @@ -61,23 +41,14 @@ angular.module('routerApp').controller('homeController', function ($scope, $http
}

$scope.toAdminPage = function (user) {
//var promise = $scope.authenticateAdmin(user.username,user.password);
//promise.then(function(){
// if($scope.authenticated == true){
// $cookies.put('ADMIN',user.username);
//$cookies.put('PWD',user.password);
// $scope.messages = null;
$cookies.put('userid', user.username);
console.log($cookies.get('userid'));
$state.go('admin-home');
//}
// else if ($scope.authenticated == false){
// $scope.messages = 'Incorrect Login Information.';
// }
// });
}

$scope.toUserPage = function (user) {
// need to get userid from username
$cookies.put("userid", user.username);
console.log($cookies.get('userid'));
$state.go('user-home');

}
Expand Down
23 changes: 20 additions & 3 deletions TeamDBAwesome/TeamDBAwesome/js/userController.js
View file
Expand Up @@ -7,19 +7,21 @@ angular.module('routerApp').controller('userController', function ($q, $window,

// Logging out
$scope.logout = function () {
// $cookies.remove('userid');
// $state.go('user-home');
cookies.remove('userid');
$state.go('user-home');
console.log("Happening");
}

// Customer Information Editing
// Retrieve Data
$scope.getUserInfo = function () {
var customerid = 1;
var customerid = $cookies.get('userid');
console.log(customerid);
$scope.user = {};
$http.get("http://localhost:50031/api/GetCustomer?PersonID=" + customerid)
.success(function (response) {
$scope.user = angular.copy(response);
console.log(response);
})
}
// Update User Information
Expand All @@ -40,6 +42,21 @@ angular.module('routerApp').controller('userController', function ($q, $window,
});
}

// Add Payment
$scope.addPayment = function (data) {
var pay = HolderService.getBlankPayment();
console.log(data);
pay.Type = data.type;
pay.CustomerId = $cookies.get('userid');
pay.token = data.token;
pay.email = data.email;
pay.cardnum = data.num
pay.expr_date = data.expr_date;
pay.is_default = data.default;
console.log(pay);

}

// Dealing with Search
$scope.columns = [
{ field: 'TrackId', displayName: ' ', cellTemplate: '<center><button data-ng-click="addToCart(12)" class="btn btn-success btn-xs">Purchase</button></center></td>' },
Expand Down
80 changes: 78 additions & 2 deletions TeamDBAwesome/TeamDBAwesome/pages/user-account.html
View file
@@ -1,4 +1,5 @@
<div data-ng-controller="userController" data-ng-init="getUserInfo()"><a id="top"></a>
<div data-ng-controller="userController" data-ng-init="getUserInfo()">
<a id="top"></a>

<div class="col-md-6 col-md-offset-3">
<h2>Your Account Information</h2>
Expand Down Expand Up @@ -62,7 +63,82 @@
<button type="submit" ng-disabled="form.$invalid || vm.dataLoading" data-ng-click="updateUser(user)" class="btn btn-primary">Submit Changes</button>
</div>
</form><br /><br />
<h2>Update Payment Methods</h2><br />
<h2>Add Payment Methods</h2>

<label for=" type">Payment Type</label>
<select name="type" ng-model="data.type">
<option value="CC">Credit Card</option>
<option value="AP">Apple Pay</option>
<option value="GP">Google Pay</option>
</select><br><br />

<!-- Apple Pay -->
<form name="appleform" role="form" ng-show="data.type == 'AP'">
<div class="form-group" ng-class="{ 'has-error': appleform.token.$dirty && appleform.token.$error.required}">
<label for="token">Token</label>
<input type="text" name="token" id="token" class="form-control" ng-model="data.token" required />
<span ng-show="appleform.token.$dirty && appleform.token.$error.required" class="help-block">Token is required</span>
</div>
<label>
Set as Default:
<input type="checkbox" ng-model="data.default"
ng-true-value="1" ng-false-value="1">
</label><br />
<div class="form-actions">
<button type="submit" ng-show="data.type" ng-disabled="appleform.$invalid || vm.dataLoading" data-ng-click="addPayment(data)" class="btn btn-primary">Submit Payment</button>
</div>
</form>

<!-- Google Pay -->
<form name="gform" role="form" ng-show="data.type == 'GP'">
<div class="form-group" ng-class="{ 'has-error': gform.token.$dirty && gform.token.$error.required}">
<label for="token">Token</label>
<input type="text" name="token" id="token" class="form-control" ng-model="data.token" required />
<span ng-show="gform.token.$dirty && gform.token.$error.required" class="help-block">Token is required</span>
</div>
<div class="form-group" ng-class="{ 'has-error': gform.email.$dirty && gform.email.$error.required}">
<label for="email">Email Address</label>
<input type="text" name="email" id="email" class="form-control" ng-model="data.email" required />
<span ng-show="gform.email.$dirty && gform.email.$error.required" class="help-block">Email is required</span>
</div>
<label>
Set as Default:
<input type="checkbox" ng-model="data.default"
ng-true-value="1" ng-false-value="1">
</label><br />
<div class="form-actions">
<button type="submit" ng-show="data.type" ng-disabled="gform.$invalid || vm.dataLoading" data-ng-click="addPayment(data)" class="btn btn-primary">Submit Payment</button>
</div>
</form>

<!-- Credit Card -->
<form name="cform" role="form" ng-show="data.type == 'CC'">
<div class="form-group" ng-class="{ 'has-error': cform.num.$dirty && cform.num.$error.required}">
<label for="num">Credit Card Number</label>
<input type="text" name="num" id="num" class="form-control" ng-model="data.num" required />
<span ng-show="cform.num.$dirty && cform.num.$error.required" class="help-block">Credit Card Number is required</span>
</div>
<div class="form-group" ng-class="{ 'has-error': cform.date.$dirty && cform.date.$error.required}">
<label for="date">Expiration Date</label>
<input type="text" name="date" id="date" class="form-control" ng-model="data.date" ng-pattern='/^((199\d)|([2-9]\d{3}))-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/' required />
<span ng-show="cform.date.$dirty && cform.date.$error.required" class="help-block">Credit Card Number is required</span>
<span ng-show="cform.date.$error.pattern">Incorrect Format, should be YYYY-MM-DD</span>
</div>
<label>
Set as Default:
<input type="checkbox" ng-model="data.default"
ng-true-value="1" ng-false-value="1">
</label><br />

<div class="form-actions">
<button type="submit" ng-show="data.type" ng-disabled="cform.$invalid || vm.dataLoading" data-ng-click="addPayment(data)" class="btn btn-primary">Submit Payment</button>
</div>
</form>


<br /><br />


Set/edit payment types Screen – design a screen that lets a customer choose credit card,
check, paypal, Google Pay, and Apple Pay options.
</div>
Expand Down

0 comments on commit 586c2df

Please sign in to comment.