diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java index 94e79c6..2cddde2 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -196,9 +196,9 @@ public class RequestController { return "/intern/accounting/vat"; } - @GetMapping("/intern/accounting/intern") + @GetMapping("/intern/accounting/main") public String accountingIntern() { - return "/intern/accounting/intern"; + return "/intern/accounting/main"; } @GetMapping("/intern/accounting/addManual") diff --git a/prototype/src/main/resources/static/css/ecom.css b/prototype/src/main/resources/static/css/ecom.css index f869861..7cb8dc6 100644 --- a/prototype/src/main/resources/static/css/ecom.css +++ b/prototype/src/main/resources/static/css/ecom.css @@ -1,6 +1,5 @@ @import "fonts.css"; - :root { font-family: "Fira Sans"; line-height: 1.15; @@ -326,6 +325,7 @@ footer { */ textarea, input[list], +input[type="number"], input[type="text"], input[type="password"] { background-color: var(--c-base); @@ -415,6 +415,15 @@ fieldset label { display: inline-block; } +input[type=number] { + text-align: right; + -moz-appearance: textfield; +} + +input[type="number"]:focus { + -moz-appearance: number-input; +} + /* * HERO */ @@ -827,14 +836,12 @@ fieldset label { margin: 0px; } - /*** THE UGLY TODO: Refactor ****/ - .dropdown { width: 12.5rem; display: block; @@ -844,6 +851,7 @@ TODO: Refactor display: none; position: absolute; } + .dropdown .dropdown-button { display: block; width: 12.5rem; @@ -851,8 +859,7 @@ TODO: Refactor margin-bottom: 0px; } -.dropdown:hover .dropdown-content { -} +.dropdown:hover .dropdown-content {} .dropdown:hover .dropdown-button { display: inline-block; diff --git a/prototype/src/main/resources/templates/fragments/intern.html b/prototype/src/main/resources/templates/fragments/intern.html index 407bbf4..841f814 100644 --- a/prototype/src/main/resources/templates/fragments/intern.html +++ b/prototype/src/main/resources/templates/fragments/intern.html @@ -8,32 +8,34 @@ diff --git a/prototype/src/main/resources/templates/intern/accounting/addManual.html b/prototype/src/main/resources/templates/intern/accounting/addManual.html index e69de29..64256d7 100644 --- a/prototype/src/main/resources/templates/intern/accounting/addManual.html +++ b/prototype/src/main/resources/templates/intern/accounting/addManual.html @@ -0,0 +1,117 @@ + + + + + + + + Manuelle Buchung + + + + + +
+ +
+

Manuelle Buchung

+
+
+
+ +
+

Manuelle Buchung

+ +
+
+ + EUR +
+
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + + +
+
+
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + + +
+
+
+ +
+
+ +
+ + +
+
+ + + +
+
+
+ +
+

+ Manuelle Buchungen können nicht rückgängig gemacht werden!
+ Es können jedoch Gegenbuchungen erstellt werden. +

+ + +
+
+
+
+ + + + diff --git a/prototype/src/main/resources/templates/intern/accounting/index.html b/prototype/src/main/resources/templates/intern/accounting/index.html index e69de29..acb606c 100644 --- a/prototype/src/main/resources/templates/intern/accounting/index.html +++ b/prototype/src/main/resources/templates/intern/accounting/index.html @@ -0,0 +1,99 @@ + + + + + + + + Alle Buchungen + + + + + + +
+ +
+

Alle Buchungen

+
+
+
+ +
+

Manuelle Buchung

+

+ Buchungen können manuell getätigt werden. + Jetzt Buchen +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EUR - - Kunde 50800 EURKunden-BezahlungBezahlung mit Kreditkarte 89404480
10.09.2019 13:4519,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
10.09.2019 13:45100,00 EURKunde 5080-100,00 EURHauptkonto350,00 EURKunden-Bestellung2504
19.08.2019 12:31250,00 EUR - - Hauptkonto250,00 EURStartkapital -
+

+

+
+ + + + diff --git a/prototype/src/main/resources/templates/intern/accounting/intern.html b/prototype/src/main/resources/templates/intern/accounting/intern.html deleted file mode 100644 index e69de29..0000000 diff --git a/prototype/src/main/resources/templates/intern/accounting/main.html b/prototype/src/main/resources/templates/intern/accounting/main.html new file mode 100644 index 0000000..4d5b736 --- /dev/null +++ b/prototype/src/main/resources/templates/intern/accounting/main.html @@ -0,0 +1,86 @@ + + + + + + + + Hauptbuchungskonto + + + + + + +
+ +
+

Hauptbuchungskonto

+
+
+
+ +
+

Kontostand

+

331,00 EUR

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 13:45-19,00 EURMehrwertsteuer1510,95 EURHauptkonto331,00 EURKunden-Bestellung2504
10.09.2019 13:45100,00 EURKunde 5080-100,00 EURHauptkonto350,00 EURKunden-Bestellung2504
19.08.2019 12:31250,00 EUR - - Hauptkonto250,00 EURStartkapital -
+

+

+
+ + + + diff --git a/prototype/src/main/resources/templates/intern/accounting/vat.html b/prototype/src/main/resources/templates/intern/accounting/vat.html index e69de29..d8606d3 100644 --- a/prototype/src/main/resources/templates/intern/accounting/vat.html +++ b/prototype/src/main/resources/templates/intern/accounting/vat.html @@ -0,0 +1,61 @@ + + + + + + + + Mehrwertsteuerkonto + + + + + + +
+ +
+

Mehrwertsteuerkonto

+
+
+
+ +
+

Kontostand

+

1510.95 EUR

+

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 13:4519,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
+

+

+
+ + + +