localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request 'Set Default Payment on first order' (#128) from feature/update_credit_card_on_order into master

Browse Source 
Reviewed-on: #128
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
This commit is contained in:
Jannik
2020-06-25 12:40:19 +02:00
parent 99b123565c bdd1017232
commit 624ade2032
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prototype/src/main/java/org/hso/ecommerce/components/AdminInitializer.java
View File

@ -1,6 +1,5 @@
package org.hso.ecommerce.components;
import org.hso.ecommerce.entities.booking.PaymentMethod;
import org.hso.ecommerce.entities.shop.Address;
import org.hso.ecommerce.entities.user.User;
import org.hso.ecommerce.repos.user.UserRepository;
@ -26,8 +25,7 @@ public class AdminInitializer {
firstAdmin.created = new Timestamp(System.currentTimeMillis());
firstAdmin.defaultDeliveryAddress = new Address();
firstAdmin.defaultDeliveryAddress.name = "admin";
firstAdmin.defaultPayment = new PaymentMethod();
firstAdmin.defaultPayment.creditCardNumber = ""; //set empty number
firstAdmin.defaultPayment = null;
firstAdmin.email = "admin";
firstAdmin.isActive = true;
firstAdmin.isEmployee = true;

3
prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
View File

@ -1,6 +1,5 @@
package org.hso.ecommerce.controller;
import org.hso.ecommerce.entities.booking.PaymentMethod;
import org.hso.ecommerce.entities.shop.Address;
import org.hso.ecommerce.entities.user.User;
import org.hso.ecommerce.repos.user.UserRepository;
@ -47,7 +46,7 @@ public class RegisterController {
newUser.email = username;
newUser.isEmployee = false;
newUser.salutation = salutation;
newUser.defaultPayment = PaymentMethod.fromCreditCardNumber("");
newUser.defaultPayment = null;
newUser.isActive = true;
newUser.created = new java.sql.Timestamp(System.currentTimeMillis());

5
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopCheckoutController.java
View File

@ -140,6 +140,11 @@ public class ShopCheckoutController {
bookingRepository.saveAll(result.bookings);
warehouseBookingRepository.save(result.warehouseBooking);
if (user.defaultPayment == null) {
user.defaultPayment = PaymentMethod.fromCreditCardNumber(cardnumber);
userRepository.save(user);
}
shoppingCart.clear();
} catch (CreateOrderAction.ArticleNotInStockException e) {

6
prototype/src/main/resources/templates/shop/checkout.html
View File

@ -97,6 +97,12 @@ Musterstraße 4
th:value="${user.defaultPayment != null ? user.defaultPayment.creditCardNumber : ''}"
pattern="[0-9]{6,16}"
required/>
<p th:if="${user.defaultPayment == null}" class="secondary card">
Da dies Ihre erste Bestellung ist, wird die Kreditkarte als Standartzahlungsmittel hinterlegt.
Sie kann unter den Nutzereinstellungen gelöscht oder geändert werden.
</p>
<small th:if="${user.defaultPayment != null}" class="no-padding">Die Standardkreditkarte kann unter
den <a href="/user/settings">Nutzereinstellungen</a> gelöscht oder geändert werden.</small>
</fieldset>
</div>
<div>

2
prototype/src/main/resources/templates/user/settings.html
View File

@ -21,7 +21,7 @@
<main class="sidebar-layout content-width">
<nav th:replace="fragments/customer :: sidebar"></nav>
<div class="content-width">
<form method="POST" th:action="@{/user/settings/changeMail}">
<form class="detailflex" method="POST" th:action="@{/user/settings/changeMail}">
<div>
<h2> Login Daten </h2>
</div>