Fakultas Ilmu Komputer UI

Commit 4b8549f3 authored by WINALDO AMADEA HESTU's avatar WINALDO AMADEA HESTU
Browse files

Merge branch 'staging' into 'master'

merge staging into master

See merge request !30
parents 6f00bd11 39cfa4f8
Pipeline #134488 failed with stages
in 14 minutes and 14 seconds
......@@ -39,10 +39,16 @@ public class PaymentController {
@GetMapping(path="/payment-methods")
public String paymentList(Model model, Principal principal){
String user;
if (principal != null) {
user = principal.getName();
} else {
user = "";
}
paymentService.getUserPayments();
model.addAttribute("username", (principal != null) ? principal.getName() : "");
model.addAttribute("username",user);
model.addAttribute("payments", paymentService.getUserPayments());
model.addAttribute("user", userService.getUserByName(principal.getName()));
model.addAttribute("user", userService.getUserByName(user));
return "payment-methods";
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment