Compare commits

...

2709 Commits

Author SHA1 Message Date
Lorenz Hilpert
f4df6e8799 Merge branch 'hotfix/4270-4269-Archiv-Artikel' 2023-08-30 10:31:58 +02:00
Lorenz Hilpert
e9a63fd553 #4274 Kaufoption - Preis nicht übernommen 2023-08-29 11:31:58 +02:00
Lorenz Hilpert
23b77c7e48 #4269 Preis wird nicht von Shipping AVA übernommen 2023-08-28 17:01:20 +02:00
Lorenz Hilpert
8b6188a6b5 #4270 Kaufoptionen Bestellung via Mehrfachauswahl wirft Fehler 2023-08-28 14:39:37 +02:00
Lorenz Hilpert
822625a1c2 #4269 PDP Preisanzeige 2023-08-28 14:36:29 +02:00
Lorenz Hilpert
819827cc4c Merge branch 'hotfix/4266-Archivartikel' 2023-08-24 20:04:40 +02:00
Lorenz Hilpert
d09b5b1ce7 #4266 Archivartikel nach Preis-Eingabe Button ausgegraut 2023-08-24 20:03:59 +02:00
Michael Auer
180e93a7da Merge branch 'release/2.3' 2023-08-24 11:50:39 +02:00
Lorenz Hilpert
9671683a93 #4246 UI Searchbox Hint Erneut anzeigen 2023-08-04 15:56:51 +02:00
Lorenz Hilpert
d909d6e804 #4236 Kulturpass - Artikel ohne Preisbindung erhalten günstigeren Preis
(cherry picked from commit 1d865c47d7)
2023-08-03 17:06:46 +02:00
Lorenz Hilpert
15c50779b4 #4245 Wannernummer-Prüfung - Leerzeichen entfernen 2023-08-03 17:05:45 +02:00
Lorenz Hilpert
5bdfec7c3f #4222 Packstückprüfung aktiviert 2023-08-02 10:55:54 +02:00
Lorenz Hilpert
810653c4d1 #4194 Icons DR und PP hinzugefügt 2023-07-28 14:50:44 +02:00
Lorenz Hilpert
eddff0d93f #4232 Preisanzeige bei Versanbestellung 2023-07-27 17:50:09 +02:00
Lorenz Hilpert
44b406fad4 #4221 Scanner - Adapter sind nicht bereit
(cherry picked from commit 78e76818b5)
2023-07-25 14:57:09 +02:00
Lorenz Hilpert
8416028113 (cherry picked from commit edb21308d4) 2023-07-21 10:52:21 +02:00
Lorenz Hilpert
44b33c1e4c Revert "#4209 - FIX - KulturPass-Einlösecode lässt Abholfrist ändern"
This reverts commit 02d60e9bd5.
2023-07-20 13:56:08 +02:00
Lorenz Hilpert
6fb72e4b2f #4121 Vormerker kann nicht manuell bearbeitet werden 2023-07-20 11:42:41 +02:00
Lorenz Hilpert
fce50daff6 #4209 - FIX - KulturPass-Einlösecode lässt Abholfrist ändern 2023-07-19 18:41:06 +02:00
Lorenz Hilpert
b954947bb7 Merge branch 'release/2.3' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.3 2023-07-19 17:45:36 +02:00
Lorenz Hilpert
ddd5d50c5d #4211 Kaufoptionen popup - Prüfung ob Artikel mit Kunden kombinierbar ist 2023-07-19 17:45:17 +02:00
Lorenz Hilpert
215d7ca341 Benachrichtigung für Packstückprüfung einblenden 2023-07-17 01:31:17 +02:00
Lorenz Hilpert
1255df10e0 Benachrichtigungen für Packstückprüfung ausblenden 2023-07-17 01:30:40 +02:00
Lorenz Hilpert
ac35cc237e Leere Notifications nicht anzeigen 2023-07-14 14:50:08 +02:00
Lorenz Hilpert
4fe5034e1c #3666 Design Anpassung 2023-07-14 13:12:48 +02:00
Nino Righi
eec1cb5666 Merged PR 1589: #4180 Hotfix Mehrfachauswahl Für Download Artikel direkt Logistician setzen
#4180 Hotfix Mehrfachauswahl Für Download Artikel direkt Logistician setzen
2023-07-13 08:05:16 +00:00
Lorenz Hilpert
b62e6e8e35 #3666 Benachrichtigung über die Glocke 2023-07-12 17:57:31 +02:00
Nino Righi
b845147050 Merged PR 1584: #4180 Hotfix Add Logistician to Download Destination
#4180 Hotfix Add Logistician to Download Destination
2023-07-11 11:45:10 +00:00
Michael Auer
6bc265a358 Merge branch 'release/2.3' 2023-07-11 12:20:14 +02:00
Nino Righi
98e963d782 Merged PR 1574: #4160 Hotfix Preselect InStore PurchasingOption Tile
#4160 Hotfix Preselect InStore PurchasingOption Tile
2023-07-06 14:34:42 +00:00
Lorenz Hilpert
90268b4ec1 #4165 console log entfernt 2023-07-06 16:30:32 +02:00
Lorenz Hilpert
034693df98 #4165 Performance Fix 2023-07-06 16:30:02 +02:00
Lorenz Hilpert
5b31661f8d Fix Kulturpass in der Warenaugabe und Eingang - Datum nicht bearbeitbar 2023-07-06 13:47:30 +02:00
Lorenz Hilpert
d48b59b374 Scandit Lizenz 2023-07-05 13:12:04 +02:00
Lorenz Hilpert
7d72fc56db Remission Routing fix 2023-07-04 19:04:24 +02:00
Lorenz Hilpert
90edb7dd7e Scanner Fix 2023-07-04 18:28:57 +02:00
Lorenz Hilpert
7ee0c4d145 #4164 Wannennummer scannen beim Öffnen eines WBS ohne Wannenummer 2023-07-04 17:15:38 +02:00
Lorenz Hilpert
67f2ff54be #4163 WBS abschließen ohne Wannennummer möglich 2023-07-04 15:51:26 +02:00
Lorenz Hilpert
f0470d3faa #4161 Artikel ohne Bestand sollen nicht mit dem Wertcode einlösbar sein 2023-07-03 16:53:22 +02:00
Lorenz Hilpert
fb97db99b0 #4151 Aktivierung Packstückprüfung 2023-07-02 11:18:17 +02:00
Lorenz Hilpert
92aad95603 #4157 Warnungstext auf Artikelebene überlappt Menge 2023-06-29 15:52:39 +02:00
Lorenz Hilpert
513cef2a66 #4153 EAN ISBN soll bleiben wenn Artikel nicht gefunden wurde 2023-06-29 15:49:21 +02:00
Lorenz Hilpert
bdf3bbc530 #4153 Artikel können hinzugefügt werden auch ohne Bestand 2023-06-29 14:14:20 +02:00
Lorenz Hilpert
47baf2fa89 Kulturpass - Mehrfache Artikelauswahl über EAN überschreitet verfügbare Exemplare 2023-06-28 17:06:55 +02:00
Lorenz Hilpert
57bfc523ab Kulturpass - Early Exit wenn Dialog geschlossen wird 2023-06-28 14:07:28 +02:00
Lorenz Hilpert
23edea5fa4 Merge branch 'feature/kulturpass' into release/2.3 2023-06-28 13:34:38 +02:00
Lorenz Hilpert
330c59f7e9 #4134 Einlösecode- Warenkorb Pop Up 2023-06-27 15:03:07 +02:00
Lorenz Hilpert
0c65e9dace #4133 vsl. Lieferdatum und Zurücklegen bis deaktiviert 2023-06-26 13:58:58 +02:00
Lorenz Hilpert
9b8ea11866 Kulturpass - loader anzeige 2023-06-23 17:32:49 +02:00
Lorenz Hilpert
17aed38316 Kulturpass Scanner Fix 2023-06-23 16:57:35 +02:00
Lorenz Hilpert
48a7cc4dd4 Kulturpass - Shoppingcart erstellung vor dem start und checkout beim bestellen 2023-06-23 16:51:50 +02:00
Lorenz Hilpert
4417fd9f0d Kulturpass Mengenänderung Verfügbarkeit Check 2023-06-23 15:30:41 +02:00
Lorenz Hilpert
3e429cb261 Kulturpass Hinweistexte 2023-06-23 12:12:47 +02:00
Lorenz Hilpert
48e30e795f Kulturpass - Hinweis leerer Warenkorb 2023-06-23 11:47:27 +02:00
Lorenz Hilpert
953e528298 Kulturpass Warenkorb Mengenänderung und Entfernen 2023-06-23 11:36:38 +02:00
Lorenz Hilpert
4276f427b9 Kulturpass Warenkorb #4133 #4134 2023-06-23 10:39:19 +02:00
Lorenz Hilpert
264d914044 #4124 Kulturpass- Abholfrist auf Bearbeitenseite 2023-06-15 16:28:44 +02:00
Lorenz Hilpert
12f1e7c3af #4124 Kulturpass - Zurücklegen bis und Abholfrist nicht ausgrauen 2023-06-15 14:33:41 +02:00
Lorenz Hilpert
9eb4fbab65 Merge branch 'release/2.3' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.3 2023-06-15 13:52:19 +02:00
Lorenz Hilpert
8d1a63e47f #4120 Marker Bezahlt über KulturPass in der Ergebnisliste 2023-06-15 13:51:57 +02:00
Nino Righi
e449e612c1 Merged PR 1566: #4112 Hotfix Manueller Preis Archivartikel
#4112 Hotfix Manueller Preis Archivartikel
2023-06-15 11:43:09 +00:00
Lorenz Hilpert
6ba65f031b #4119 Kaufoptionen - Nicht verfügbare Kaufoptionen werden ausgegraut 2023-06-15 11:56:05 +02:00
Lorenz Hilpert
f31ac4c2e3 #4117 Bug Fix Collect On Delivery 2023-06-15 11:01:39 +02:00
Lorenz Hilpert
f980f5aaf9 #4113 Wareneingang Navigation entfernt 2023-06-14 17:53:29 +02:00
Lorenz Hilpert
87a1e8a2c4 Kulturpass Handler Fix COLLECT_WITH_SMALLAMOUNTINVOICE 2023-06-14 16:30:19 +02:00
Lorenz Hilpert
5bb9ebd6ec #3961 Bestelldeadline anzeigen 2023-06-14 10:27:20 +02:00
Lorenz Hilpert
45ab1e9cc5 Kulturpass Drucken Fix 2023-06-13 17:51:33 +02:00
Lorenz Hilpert
8d2685a8c3 Fix Kulturpass Anzeige 2023-06-13 17:34:27 +02:00
Lorenz Hilpert
d38c41a99d Kulturpass - Fix - erneut drucken 2023-06-13 16:08:42 +02:00
Lorenz Hilpert
ff3dacde39 #4101 Kulturpass 2023-06-13 15:25:08 +02:00
Nino Righi
90b752e185 Merged PR 1558: #4092 Fix updateNotificationsGroup get orderId from first Item not from initi...
#4092 Fix updateNotificationsGroup get orderId from first Item not from initial form
2023-06-09 12:52:28 +00:00
Nino Righi
3ed9227508 Merged PR 1553: #4074 Bugfixes
#4074 Bugfixes
2023-06-06 16:12:56 +00:00
Nino Righi
9cfe8176d4 Merged PR 1548: #4083 Goods In Out Order Edit Bestellkanal orderSource from Order not from fi...
#4083 Goods In Out Order Edit Bestellkanal orderSource from Order not from first item
2023-06-06 14:53:47 +00:00
Nino Righi
3999b8f623 Merged PR 1544: #4074 Kaufoptionen Manuelle Preiseingabe
#4074 Kaufoptionen Manuelle Preiseingabe
2023-06-06 13:28:57 +00:00
Andreas Schickinger
c8f54b8be5 Merged PR 1540: #4073 Hotfix PP Filter wird zurückgesetzt, wenn nicht vollständig geladen
#4073 Hotfix PP Filter wird zurückgesetzt, wenn nicht vollständig geladen

Related work items: #4073
2023-06-02 14:34:52 +00:00
Nino Righi
413d2f5178 Merged PR 1539: #4048 Changed clientChannel to orderSource
#4048 Changed clientChannel to orderSource
2023-06-02 11:48:23 +00:00
Andreas Schickinger
35c2a6a046 Merged PR 1537: #4050 Hotfix Kaufoptionen Popup - Weiterleiten zur Kundensuche
#4050 Hotfix Kaufoptionen Popup - Weiterleiten zur Kundensuche

Related work items: #4050
2023-06-02 11:23:21 +00:00
Andreas Schickinger
1df201525c Merged PR 1536: #4068 Hotfix Warenkorb Rücklage Menge ändern
#4068 Warenkorb Rücklage Menge ändern hotfix
2023-06-01 15:42:19 +00:00
Lorenz Hilpert
ef72dcf554 #3984 - Filtereinstellungen wenn Artikel für Dig-Versand in Warenkorb sind falsch
(cherry picked from commit 6717f0ee3d)
2023-05-25 10:54:08 +02:00
Michael Auer
c228147c00 Merged PR 1529: Floating Docker Branch-Tags
Es wird zusätzlich zu den bisherigen Docker-Tags, ein Docker-Tag vergeben, das den aktuellen Branch repräsentiert. Da dieses (identische) Tag für jeden neuen Build aus einem Branch wieder vergeben wird, wandert das Tag auf das neueste Docker-Image aus diesem Branch (vgl. Tag _latest_)

Beispiele:
develop => refs_head_develop
release/2.3 => refs_head_release_2.3

(cherry picked from commit 8880ed0df6)
2023-05-24 18:37:47 +02:00
Lorenz Hilpert
4b56b973c8 #3979 SSC Nummer Anzeigen 2023-05-24 17:53:54 +02:00
Lorenz Hilpert
28a00b9f22 Merge branch 'release/2.3' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.3 2023-05-24 17:38:57 +02:00
Nino Righi
b1fe692de5 Merged PR 1527: #4009 Filter reset and Branch Selector Dropdown Bugfixes
#4009 Filter reset and Branch Selector Dropdown Bugfixes
2023-05-23 11:55:14 +00:00
Lorenz Hilpert
08b2f6cbc9 removed console log 2023-05-23 13:32:28 +02:00
Lorenz Hilpert
10e1db388f #3979 Meldenummer in UI anzeigen 2023-05-23 13:32:05 +02:00
Lorenz Hilpert
cd7f71b968 #4044 Handlungsanweisung im Status fehlt 2023-05-22 16:13:57 +02:00
Lorenz Hilpert
9361a631dd Merge branch 'release/2.3' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.3 2023-05-22 10:46:34 +02:00
Lorenz Hilpert
59c5abfd93 Deadline Pipe Fix 2023-05-22 10:46:10 +02:00
Nino Righi
633c23a6f0 Merged PR 1526: #4009 Clear Filter Release
#4009 Clear Filter Release
2023-05-18 22:27:32 +00:00
Lorenz Hilpert
779e7323e2 #3965 HSC ISA - Kundenkarten anlegen raus 2023-05-17 15:51:35 +02:00
Lorenz Hilpert
6e7fbd940b #3961 Order Deadline Popup 2023-05-17 14:56:25 +02:00
Lorenz Hilpert
6878b608fc #4035 branch slector fix 2023-05-17 13:23:43 +02:00
Lorenz Hilpert
a4fab8b64e #4035 Filiale wird bei Reservierung setzen 2023-05-16 15:32:38 +02:00
Lorenz Hilpert
21c0cc8794 #4039 - Irrläufer verschwinden nicht von der Liste 2023-05-16 13:30:51 +02:00
Lorenz Hilpert
7ea11ea0c4 #4039 Neu laden der Liste wenn man im Popup auf erledigt klickt 2023-05-12 16:19:21 +02:00
Lorenz Hilpert
778343f636 #4036 Bugfix scaling von texten 2023-05-09 13:03:02 +02:00
Lorenz Hilpert
d2fb3b6c85 #4036 - Kaufoptionen 2023-05-09 10:33:21 +02:00
Lorenz Hilpert
4c7b5eec38 #4016 Kaufoptionen - Preis bei Versandbestellungen 2023-05-03 16:22:51 +02:00
Lorenz Hilpert
35068e23cd #4021 PP - Suche nach Packstuecken oeffnet details bei einem treffer 2023-05-02 11:33:56 +02:00
Lorenz Hilpert
bc30b86cce #4020 PP - Label wird auf IPad nicht merh zwei zeilig angezeigt 2023-05-02 11:24:36 +02:00
Lorenz Hilpert
461f166e33 #4017 PP - scanId wird beim aender des status mit uebermittelt 2023-05-02 11:14:22 +02:00
Lorenz Hilpert
ad95faffa7 Merge branch 'release/2.3' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.3 2023-04-24 23:09:21 +02:00
Michael Auer
a0eb3c0459 Revert "Update Remi Api Url"
This reverts commit ea9920c4d5.
2023-04-24 16:53:01 +02:00
Lorenz Hilpert
fea435a6d2 Bugfix - Hor-Scroll removed 2023-04-24 16:41:52 +02:00
Lorenz Hilpert
ea9920c4d5 Update Remi Api Url 2023-04-24 16:19:50 +02:00
Lorenz Hilpert
259d0f1648 #3999 Kaufoptionen - Anzeigefehler in Titel/Format 2023-04-24 15:19:52 +02:00
Lorenz Hilpert
872d3ff383 #3391 - Filiale mit Klick auswählen 2023-04-24 14:57:16 +02:00
Michael Auer
d68055f8a9 ~ Version Bump: 2.3 2023-04-24 11:52:12 +02:00
Michael Auer
8d98dcf7e7 Merge tag '2.2' into develop 2023-04-24 11:16:13 +02:00
Michael Auer
c828a69f66 Merge branch 'release/2.2' 2023-04-24 11:16:04 +02:00
Lorenz Hilpert
6311ebe467 Show Navigation for Package-inspection 2023-04-21 10:33:34 +02:00
Lorenz Hilpert
f8a5ceed97 #3391 Fix - Tablet Kaufoptionen PopUp 2023-04-20 13:55:21 +02:00
Lorenz Hilpert
0420bda5da Bugfix - Default Branch in Kaufoptionen 2023-04-20 11:07:45 +02:00
Lorenz Hilpert
6dc532f40e Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-04-20 08:31:50 +02:00
Lorenz Hilpert
0560d01f30 Merge branch 'release/2.2' into develop 2023-04-20 08:31:42 +02:00
Lorenz Hilpert
bc67ec3287 URL Change paragon-data -> paragon-systems.de 2023-04-20 08:28:54 +02:00
Lorenz Hilpert
bed35a2377 URL Change wws 2023-04-20 08:10:45 +02:00
Nino Righi
8d6bd80902 Merged PR 1522: #3989 Hotfix Remission List Item Loading Spinner
#3989 Hotfix Remission List Item Loading Spinner
2023-04-18 11:24:24 +00:00
Nino Righi
8aa870dddd Merged PR 1521: #3506 Fix Removed PackageCode from Payload of ReturnFinalizeReceipt
#3506 Fix Removed PackageCode from Payload of ReturnFinalizeReceipt
2023-04-18 08:44:40 +00:00
Nino Righi
26a3c76d5f Merged PR 1520: #3906 Fix Instock Bug Article Search Results
#3906 Fix Instock Bug Article Search Results
2023-04-17 12:25:29 +00:00
Lorenz Hilpert
18f738f2c3 Bereich Wareneingang aus Navigation entfernt 2023-04-17 11:07:50 +02:00
Lorenz Hilpert
bba50ccbcc Merge branch 'release/2.2' into develop 2023-04-13 14:11:53 +02:00
Lorenz Hilpert
3eea3b913d #3688 PopUp mit Irrläufern - Navigation disabled 2023-04-13 14:10:48 +02:00
Lorenz Hilpert
2dbeec831e #3976 nur ein Titel auf einmal remittieren 2023-04-13 14:00:09 +02:00
Lorenz Hilpert
88a06628e3 #3973 added missing tabindex 2023-04-12 18:24:07 +02:00
Lorenz Hilpert
37ceb30ffb #3973 Bedienung per Tastatur funktioniert fehlerhaft 2023-04-12 13:23:48 +02:00
Lorenz Hilpert
ebd0515e96 #3978 instock-Anfrage wird nicht immer ausgeführt 2023-04-11 16:41:00 +02:00
Nino Righi
ece5d0fa0d Merged PR 1519: #3957 Fix Develop Branch Selector Implementation with new purchasing options...
#3957 Fix Develop Branch Selector Implementation with new purchasing options modal
2023-04-11 14:26:23 +00:00
Lorenz Hilpert
6be214c6cd #3977 Fehlermeldung erscheint an falscher Stelle 2023-04-11 16:25:23 +02:00
Lorenz Hilpert
c470453ea4 Merge branch 'release/2.2' into develop 2023-04-05 11:58:29 +02:00
Nino Righi
bbe9326954 Merged PR 1518: #3957 Filter Current Branch if Role is Store
#3957 Filter Current Branch if Role is Store
2023-04-05 09:55:41 +00:00
Lorenz Hilpert
27961bb4e5 Checkbox Styling Kaufoptionen 2023-04-05 11:09:41 +02:00
Lorenz Hilpert
4952c090ef #3975 Anzahl der Irrläufer in der Liste auf 10 gesetzt 2023-04-05 11:06:17 +02:00
Lorenz Hilpert
74e4016625 #3928 Kaufoptionen - Filialen die IS_ORDERING_ENABLED true sind können ausgewählt werden 2023-04-03 13:14:58 +02:00
Lorenz Hilpert
c389008811 #3967 Fix - Nicht bestellbaren Artikel löschen führt zu Fehlermeldung 2023-04-03 10:21:21 +02:00
Nino Righi
e6dcf22012 Merged PR 1516: #3957 Filialdropdown Sortierung mit Store Rolle
#3957 Filialdropdown Sortierung mit Store Rolle
2023-03-31 15:14:30 +00:00
Nino Righi
d067f925b9 Merged PR 1517: #3927 #3929 #3964 Remission Wannennummer Changes
#3927 #3929 #3964 Remission Wannennummer Changes
2023-03-31 15:05:21 +00:00
Lorenz Hilpert
8b5609f765 #3672 Detailseite 'Falsche Filiale' - Erstes Item wird bei einem Irrläufer auch verblasst angezeigt 2023-03-31 14:08:52 +02:00
Lorenz Hilpert
dd04a1f2af #3963 Fix Falsche Verfügbarkeiten 2023-03-31 14:05:15 +02:00
Lorenz Hilpert
9caabb6cc0 #3960 Buttons Alle auswählen and Alle abwählen will now work correctly. 2023-03-31 13:34:00 +02:00
Nino Righi
33b28d5f41 Merged PR 1515: #3244 Remission Removed "Are you sure you want to remit" - Popup
#3244 Remission Removed "Are you sure you want to remit" - Popup
2023-03-31 11:21:28 +00:00
Lorenz Hilpert
475f9b5e34 Mark PurchaseOptionsModalComponent Fetching if Availabilities are being fetched 2023-03-31 11:29:42 +02:00
Lorenz Hilpert
60f1348ea5 Stock Request Verhindern 2023-03-31 11:10:46 +02:00
Lorenz Hilpert
533b6e1fcf Unit Test Fix 2023-03-31 10:21:38 +02:00
Lorenz Hilpert
8961730b74 #3672 Irrlauefer Details Anpassung 2023-03-30 18:26:51 +02:00
Lorenz Hilpert
5d580714c8 #3953 Minusbestände als Nullbestand anzeigt 2023-03-30 18:08:05 +02:00
Lorenz Hilpert
daf1ead75b #3962 Anrede ist nicht mehr Pflichtfeld 2023-03-30 14:24:12 +02:00
Lorenz Hilpert
aef2654a39 #3962 Anrede ist nicht mehr Pflichtfeld 2023-03-30 13:41:22 +02:00
Lorenz Hilpert
8243cd3528 #3947 PopUp wird nach unten nicht vollständig angezeigt 2023-03-30 11:41:37 +02:00
Lorenz Hilpert
447456d7a6 #3946 Anzeige lieferbare Menge nur in Popup 2023-03-30 11:22:07 +02:00
Lorenz Hilpert
241a34d7a8 Merge branch 'release/2.2' into develop 2023-03-30 11:04:04 +02:00
Lorenz Hilpert
4e67b2e8b9 #3936 - Kundenbestellung Leere Edit Seite
(cherry picked from commit 83406277ad)
2023-03-30 10:54:41 +02:00
Lorenz Hilpert
8bc2ea8373 #3385 Preiseingabe Geschenkkarte 2023-03-30 10:39:40 +02:00
Nino Righi
00a6a113c8 Merged PR 1514: #3956 Hotfix PDP Wording Change Branch Availability
#3956 Hotfix PDP Wording Change Branch Availability
2023-03-30 08:35:25 +00:00
Nino Righi
dc04619128 #3948 Hotfix HSC Kundenbestellungen Details Header Anzeige 2023-03-29 15:12:35 +02:00
Lorenz Hilpert
e066da3762 #3386 Canadd Wurde fuer Download Artikel falsch hinterlegt 2023-03-29 11:54:19 +02:00
Lorenz Hilpert
ad96278956 #3688 List Styling angepasst 2023-03-29 10:29:32 +02:00
Lorenz Hilpert
83406277ad #3936 - Kundenbestellung Leere Edit Seite 2023-03-28 14:40:49 +02:00
Lorenz Hilpert
9e89348381 #3958 Wahl Rücklage Kaufoption wirft Fehler 2023-03-28 14:10:25 +02:00
Lorenz Hilpert
0fb7419598 #3385 HFI Gutschein 2023-03-27 11:19:09 +02:00
Lorenz Hilpert
1790298cb4 #3931 Löschen von Positionen in der Kaufoption 2023-03-24 11:28:53 +01:00
Lorenz Hilpert
ffe8e39c85 #3934 - Anzeige Message Wenn Keine Verfügbarkeiten Existieren 2023-03-24 11:20:14 +01:00
Lorenz Hilpert
67e0f4bd46 #3945 Reinfolge von verfügbar als-Daten ist nicht fest 2023-03-23 19:24:22 +01:00
Lorenz Hilpert
e7b3a58da3 #3946 Fehler Lieferbare Exemplare 2023-03-23 19:20:24 +01:00
Lorenz Hilpert
598f9f3777 #3385 HFI Gutschein Anzeige Kaufoptionen 2023-03-23 18:25:51 +01:00
Lorenz Hilpert
0a7dca2e12 Packstück Kontoller aktivieren 2023-03-23 10:09:48 +01:00
Lorenz Hilpert
4b342778df #3365 Navigation angepasst 2023-03-22 15:32:20 +01:00
Lorenz Hilpert
10e8fd904a #3933 2023-03-22 14:29:57 +01:00
Lorenz Hilpert
1de342fd3b Update Add To Shopping Cart from PDP
(cherry picked from commit 4a5dd23561fdec458447c19c93faa1654ab80c7c)
2023-03-21 11:21:35 +01:00
Lorenz Hilpert
f4c1c3dd7f Merged PR 1513: Kaufoptionen
Related work items: #3365, #3366, #3385, #3386, #3391
2023-03-20 17:11:53 +00:00
Nino Righi
80bfc59356 Merged PR 1500: #3506 Remission Wanne Scanner nach Start der Remission
#3506 Remission Wanne Scanner nach Start der Remission
2023-03-17 09:25:43 +00:00
Lorenz Hilpert
3796f3ed5f Authentication Config Update 2023-03-16 15:30:01 +01:00
Lorenz Hilpert
f2e03d22d8 Merge branch 'develop' into release/2.2 2023-03-16 15:28:36 +01:00
Nino Righi
ef967b66e8 Merged PR 1512: #3887 Removed Scrollbar until Responsive Design
#3887 Removed Scrollbar until Responsive Design
2023-03-16 13:59:47 +00:00
Lorenz Hilpert
58ea70cc6c Merge branch 'develop' into release/2.2 2023-03-15 17:42:51 +01:00
Nino Righi
e4823950df Merged PR 1511: #3887 HSC Details Kundenbestellungen 360 Grad
#3887 HSC Details Kundenbestellungen 360 Grad
2023-03-15 16:41:57 +00:00
Lorenz Hilpert
8f9923ba5d #3673 ArrivalStatus Prüfung 2023-03-14 18:22:17 +01:00
Lorenz Hilpert
72bbd2c36e Checkbox Styling with Sub Options 2023-03-14 14:15:07 +01:00
Lorenz Hilpert
9bdb902a56 #3673 #3905 2023-03-14 13:55:38 +01:00
Nino Righi
bbc2e55ae3 Merged PR 1510: #3878 Updated Section Toggle if Role CallCenter is Active
#3878 Updated Section Toggle if Role CallCenter is Active
2023-03-14 09:16:44 +00:00
Nino Righi
6995bdb527 Merged PR 1508: Filter Doku Readme angelegt mit 2 konkreten Anwendungsbeispielen der Filter I...
Filter Doku Readme angelegt mit 2 konkreten Anwendungsbeispielen der Filter IST Implementierung

Co-authored-by: lorenzh <lorenzh@users.noreply.github.com>
2023-03-13 15:43:59 +00:00
Nino Righi
a7abc35316 Merged PR 1509: #3899 Fix Customer Orders loadItems request with compartmentCode
#3899 Fix Customer Orders loadItems request with compartmentCode
2023-03-10 14:28:29 +00:00
Lorenz Hilpert
772aed597b Wareneingang ausblenden 2023-03-10 08:05:37 +01:00
Lorenz Hilpert
9e18825c27 Merge branch 'develop' into release/2.2 2023-03-10 08:04:44 +01:00
Lorenz Hilpert
27b7ffcf99 #3898 Trefferliste wird in anderen Vorgang übernommen 2023-03-09 14:44:17 +01:00
Nino Righi
d804a744b6 Merged PR 1506: #3895 Purchaseing Options Modal Selected branch check if correct branchType i...
#3895 Purchaseing Options Modal Selected branch check if correct branchType is selected
2023-03-08 19:29:49 +00:00
Nino Righi
fc5cf27bd1 Merged PR 1507: #3882 Fix Hide Select Bullets if items have no actions
#3882 Fix Hide Select Bullets if items have no actions
2023-03-08 19:24:42 +00:00
Lorenz Hilpert
355bba8966 Merge branch 'ipad-bugfix' into develop 2023-03-08 20:22:02 +01:00
Lorenz Hilpert
e31c5f5a19 IPad Bugfix Scanner 2023-03-08 20:03:43 +01:00
Lorenz Hilpert
22837bbf8d IPAd Test Logging 2023-03-08 19:45:25 +01:00
Lorenz Hilpert
6324486dca ipad test 4 2023-03-08 19:21:33 +01:00
Lorenz Hilpert
653100f539 IPad test 4 2023-03-08 19:21:14 +01:00
Lorenz Hilpert
d671ba583d IPad Test 3 2023-03-08 19:20:00 +01:00
Lorenz Hilpert
fba324c6cb IPad fIx test 2 2023-03-08 18:58:02 +01:00
Lorenz Hilpert
ccbec5bcff Scanner test 2023-03-08 18:39:27 +01:00
Lorenz Hilpert
da1978bf21 Wareneingang in der Navigation Aktiviert 2023-03-08 16:01:41 +01:00
Lorenz Hilpert
1672b89775 Message Event Logs 2023-03-08 15:35:31 +01:00
Lorenz Hilpert
d9a9db6ec8 Added Debug Page for IPad 2023-03-08 15:01:17 +01:00
Lorenz Hilpert
0882bc2ca7 Merge branch 'develop' into release/2.2 2023-03-08 13:15:49 +01:00
Nino Righi
89b8d07bb4 Merged PR 1503: #3876 Fix Reorder Modal with Selected Branch now returns correct availabiliti...
#3876 Fix Reorder Modal with Selected Branch now returns correct availabilities based by selected branch
2023-03-08 12:15:07 +00:00
Nino Righi
c65c8edd2d Merged PR 1504: #3891 Fix Tooltip PDP and Articlesearch Availability by Branch
#3891 Fix Tooltip PDP and Articlesearch Availability by Branch
2023-03-08 12:09:08 +00:00
Nino Righi
5f7ce96919 Merged PR 1505: #3896 Assortment Price Update Item Added "x" to stock value
#3896 Assortment Price Update Item Added "x" to stock value
2023-03-08 12:06:13 +00:00
Lorenz Hilpert
d9a2601f75 Merge branch 'develop' into release/2.2 2023-03-08 11:37:49 +01:00
Lorenz Hilpert
37a04cadf8 Added scandit Lizenz 2023-03-08 11:03:59 +01:00
Lorenz Hilpert
ca10c01398 #3360 Bestandsanzeige einer anderen Filiale 2023-03-06 17:37:36 +01:00
Nino Righi
24f6ba117d Merged PR 1502: #3358 Disable Pick Up Option in purchasing Modal if no valid targetBranch is...
#3358 Disable Pick Up Option in purchasing Modal if no valid targetBranch is selected
2023-03-06 14:36:31 +00:00
Lorenz Hilpert
7508144e27 #3886 Informationen nur für Filiale hinterlegen sessionstorage 2023-03-06 13:36:23 +01:00
Lorenz Hilpert
9f0fec8046 Auth Service Delay Window reload 2023-03-06 13:00:27 +01:00
Nino Righi
67d70fac8e Merged PR 1501: #3771 #3876 Customer Orders Select Bullets and Reorder Modal Bugfix
#3771 #3876 Customer Orders Select Bullets and Reorder Modal Bugfix
2023-03-06 09:35:48 +00:00
Lorenz Hilpert
1775f6fd89 #3773 Filter Zielfiliale 2023-03-03 14:56:42 +01:00
Lorenz Hilpert
438c367101 Fix Erneut anmelden 2023-03-03 14:34:17 +01:00
Lorenz Hilpert
cb9d8ffa91 Silent Refresh with code flow 2023-03-03 11:51:13 +01:00
Lorenz Hilpert
2ecb0c5cf6 Update Auth Token Refresh and Configs 2023-03-02 17:43:38 +01:00
Lorenz Hilpert
b01ce5b3b6 Merge branch 'develop' into release/2.2 2023-03-02 15:52:30 +01:00
Lorenz Hilpert
8a55d52b2b AuthService SilentRefresh Catch Error 2023-03-02 11:24:30 +01:00
Lorenz Hilpert
c7e6f00ddb Merge branch 'release/2.2' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/2.2 2023-03-02 10:58:39 +01:00
Lorenz Hilpert
85831ffe5d Config Fix Statging - wws API 2023-03-02 10:58:26 +01:00
Lorenz Hilpert
762a5a2072 Config Fix wws Endpoint 2023-03-02 10:57:30 +01:00
Nino Righi
405e1ed023 Merged PR 1498: #3774 Meldenummer und Branch Select Filter, Unit Test Fixes
#3774 Meldenummer und Branch Select Filter, Unit Test Fixes
2023-03-01 18:11:36 +00:00
Lorenz Hilpert
41177436d4 Silent Refresh Error - Catch Error 2023-03-01 19:04:25 +01:00
Nino Righi
d1fca976a2 Merged PR 1499: #3782 Fix Resetting Filter Settings Properly After Click On Product Search on...
#3782 Fix Resetting Filter Settings Properly After Click On Product Search on Navigation
2023-03-01 17:54:01 +00:00
Lorenz Hilpert
59cf407c26 #3759 Bearbeiten deaktivieren 2023-03-01 17:56:31 +01:00
Lorenz Hilpert
e95828a514 Improvements for Authentication and Silent Refresh 2023-03-01 15:46:01 +01:00
Lorenz Hilpert
8b915c7c83 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-02-28 11:40:15 +01:00
Lorenz Hilpert
ebc6a01b7a #3880 Branch Id in Autocomplete Request - Kundenbestellung 2023-02-28 11:40:05 +01:00
Lorenz Hilpert
8cad3c4c14 Merge branch 'release/2.2' into develop 2023-02-27 18:48:14 +01:00
Lorenz Hilpert
a5537c21a1 Merge branch 'develop' into release/2.2 2023-02-27 18:47:47 +01:00
Lorenz Hilpert
edf96434b7 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-02-27 18:33:08 +01:00
Lorenz Hilpert
257df95c72 #3876 Artikel nachbestellen - In ausgewählte Filiale 2023-02-27 18:32:55 +01:00
Nino Righi
a268df503a Merged PR 1497: #3871 Gelbe Seiten Fachbodenbeschriftung
#3871 Gelbe Seiten Fachbodenbeschriftung
2023-02-27 17:27:23 +00:00
Nino Righi
a57ccbe4c2 Merged PR 1495: #3875 Display Estimated Shipping Date if orderType is not 1
#3875 Display Estimated Shipping Date if orderType is not 1
2023-02-27 17:21:16 +00:00
Lorenz Hilpert
7f37771dc7 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-02-27 17:56:00 +01:00
Lorenz Hilpert
3a753dde83 Fix unit Test For AuthService 2023-02-27 17:55:52 +01:00
Nino Righi
8e91b1363b Merged PR 1496: #3357 Fixed Branches OrderBy
#3357 Fixed Branches OrderBy
2023-02-27 16:53:05 +00:00
Lorenz Hilpert
e77929ab89 #3357 Ausgewählte Filiae wird berücksichtigt 2023-02-27 17:38:09 +01:00
Lorenz Hilpert
02031e97e3 Minor Bugfixes 2023-02-27 17:20:28 +01:00
Lorenz Hilpert
ede1c505d4 #3872 Wording Anpassung 2023-02-27 14:03:13 +01:00
Lorenz Hilpert
5cd5b685d2 #3673 Farbanpassung - Wareneingang 2023-02-27 10:46:42 +01:00
Lorenz Hilpert
d856f1d1cc Fix Unit Test 2023-02-27 10:17:11 +01:00
Lorenz Hilpert
10bb912bda Kundenbestellung Anpassung API 2023-02-27 10:08:16 +01:00
Nino Righi
3b2135a570 Merged PR 1494: #3357 Implementierung Umkreissuche + Unit Test Fix
#3357 Implementierung Umkreissuche + Unit Test Fix
2023-02-24 16:46:31 +00:00
Lorenz Hilpert
9c5d209887 #3870 Load Spinner PP 2023-02-24 17:27:54 +01:00
Lorenz Hilpert
763a770bcf Skip Unit Test 2023-02-24 14:58:29 +01:00
Lorenz Hilpert
f8f3456ba3 #3790 Filialsuche hinzugefügt 2023-02-24 14:51:05 +01:00
Lorenz Hilpert
4da7f02cf7 #3790 Kundenbestellungen 2023-02-24 13:42:58 +01:00
Nino Righi
4772e24c78 Merged PR 1493: #3865 Assortment OrderBy Implementation
#3865 Assortment OrderBy Implementation
2023-02-24 10:45:32 +00:00
Lorenz Hilpert
c3a9b82abb #3867 Preisänderungen - Scrollbalken fehlt 2023-02-23 10:03:54 +01:00
Lorenz Hilpert
4716940708 #3868 Button überdeckt letzte Kachel 2023-02-23 10:02:25 +01:00
Lorenz Hilpert
0eb09e2dbb Merge branch 'develop' into release/2.2 2023-02-22 16:38:42 +01:00
Lorenz Hilpert
111a33b12f #3805 Liste Weitere Verfügbarkeiten 2023-02-22 14:08:26 +01:00
Lorenz Hilpert
bcff2272ab #3853 Gelbe Seiten - Auf Erledigt gesetzte Posten bleiben auf die Liste 2023-02-22 13:30:58 +01:00
Lorenz Hilpert
f30ae91854 Merge branch 'release/2.2' into develop 2023-02-21 10:26:27 +01:00
Lorenz Hilpert
7eaad843a9 Merge branch 'develop' into release/2.2 2023-02-21 10:26:01 +01:00
Lorenz Hilpert
cb367d32c3 #3854 Filter in Sortiment und Wareineingang reagieren nicht einheitlich mit anderen Filtern 2023-02-20 18:15:27 +01:00
Lorenz Hilpert
b4cf88bd54 Bugfix Filter 2023-02-20 18:02:16 +01:00
Lorenz Hilpert
b8097fcd3a Filter Verhalten angepasst 2023-02-20 18:00:15 +01:00
Lorenz Hilpert
6db2238096 Item Update and Error Message for Packstück Kontrolle 2023-02-20 16:51:52 +01:00
Lorenz Hilpert
cd426d5534 #3859 Navigation Tätigkeitskalender 2023-02-20 14:41:26 +01:00
Lorenz Hilpert
c214d47aad Null Check 2023-02-20 13:58:10 +01:00
Lorenz Hilpert
c09c44ec5f Merge branch 'develop' into release/2.2 2023-02-20 13:09:44 +01:00
Lorenz Hilpert
f9f6d0d836 Merged PR 1492: Packstück Kontrolle
Related work items: #3688, #3690, #3816
2023-02-20 12:09:01 +00:00
Nino Righi
74a6c75c21 Merged PR 1490: #3848 IPAD2 Removed Grid and added Flex on Scroll Arrow inside Filter Input O...
#3848 IPAD2 Removed Grid and added Flex on Scroll Arrow inside Filter Input Options
2023-02-17 13:49:55 +00:00
Nino Righi
526ebc77bc Merged PR 1491: #3849 Improvement Sortiment Filter Display Hint
#3849 Improvement Sortiment Filter Display Hint
2023-02-17 13:49:47 +00:00
Lorenz Hilpert
addac44c0f Merge branch 'develop' into release/2.2 2023-02-17 14:05:46 +01:00
Lorenz Hilpert
303d575fde config.json - scope hinzugefuegt - isa-wws-webapi 2023-02-17 14:02:24 +01:00
Lorenz Hilpert
bf8438b229 Version Bump 2.2 2023-02-17 13:37:16 +01:00
Nino Righi
ea8bbafbfa Merged PR 1489: Small fixes
Small fixes
2023-02-17 09:28:50 +00:00
Nino Righi
14815e79d5 Merged PR 1488: #3354 #3814 Ipad styling bugfixes, check environment and native container update
#3354 #3814 Ipad styling bugfixes, check environment and native container update
2023-02-16 16:45:58 +00:00
Nino Righi
4a3de35224 Merged PR 1486: #3524 History Added Word Break normal on caption
#3524 History Added Word Break normal on caption
2023-02-16 15:55:29 +00:00
Nino Righi
974f549c31 Merged PR 1487: #3836 #3837 Gelbe Seiten IPAD Styling fixes and Filter Scrolling
#3836 #3837 Gelbe Seiten IPAD Styling fixes and Filter Scrolling
2023-02-16 15:55:20 +00:00
Lorenz Hilpert
76596939c5 #3794 Submit mit Enter und Lupen-Symbol führt zu unterschiedliche Ergebnisse 2023-02-16 11:31:24 +01:00
Nino Righi
138974bca7 Merged PR 1485: #3359 Removed resetSelectedBranch logic on navigation click
#3359 Removed resetSelectedBranch logic on navigation click
2023-02-14 14:58:47 +00:00
Nino Righi
02aee02694 Merged PR 1482: #3813 Fix IPAD2 Added web-animations-js polyfill
#3813 Fix IPAD2 Added web-animations-js polyfill
2023-02-14 11:01:29 +00:00
Nino Righi
e2ada75611 Merged PR 1483: #3806 IPAD2 Styling Branch Dropdown
#3806 IPAD2 Styling Branch Dropdown
2023-02-14 11:01:24 +00:00
Nino Righi
78b757c55b Merged PR 1484: #3828 Bugfixes Disable Print
#3828 Bugfixes Disable Print
2023-02-14 11:01:15 +00:00
Lorenz Hilpert
dfd273e7bf Build Fehler Fix 2023-02-13 17:52:32 +01:00
Nino Righi
1a72c23412 Merged PR 1481: Gelbe Seiten - Sortiment - Preisänderung Implementation + Init Unit Tests
Gelbe Seiten - Sortiment - Preisänderung Implementation + Init Unit Tests
2023-02-13 16:42:08 +00:00
Michael Auer
55a92ad029 Merge tag '3754-lieferschein-erneut-drucken' into develop 2023-02-13 17:28:42 +01:00
Michael Auer
aea6a0d131 Merge branch 'hotfix/3754-lieferschein-erneut-drucken' 2023-02-13 17:11:39 +01:00
Lorenz Hilpert
e76e031675 Merged PR 1480: #3806 Suchfeld wird nun als geschlossen erkannt und stylings greifen wieder
#3806 Suchfeld wird nun als geschlossen erkannt und stylings greifen wieder
2023-02-08 09:54:55 +00:00
Nino Righi
ed095a95f0 Merged PR 1478: Buffer changes
Buffer changes

Co-authored-by: lorenzh <lorenzh@users.noreply.github.com>
2023-02-06 14:55:17 +00:00
Lorenz Hilpert
3cdb3d6294 Added external library to the project 2023-02-03 16:20:45 +01:00
Nino Righi
06fe8b3742 Merged PR 1477: Branch Selector Changes
Branch Selector Changes
2023-02-03 14:31:13 +00:00
Lorenz Hilpert
6ba7c54089 filialauswahl tablet styling anpassung 2023-02-02 13:01:28 +01:00
Lorenz Hilpert
e2bc284091 #3354 Filialauswahl Tablet design anpassung 2023-02-01 17:27:33 +01:00
Nino Righi
66bf91e177 Merged PR 1476: Branch Selector Bugfixes, BranchType Filtering, Unit Test update
Branch Selector Bugfixes, BranchType Filtering, Unit Test update
2023-02-01 16:04:19 +00:00
Lorenz Hilpert
6039545f9d Fix Core Unit Test Run 2023-01-31 14:39:05 +01:00
Lorenz Hilpert
cc6f70e834 Bundle utils libs in one lib as submodules 2023-01-31 14:25:54 +01:00
Lorenz Hilpert
55d7687561 Create main core package - merged core packges into core as submodules 2023-01-31 13:59:01 +01:00
Lorenz Hilpert
90866e2bea Update test script from parallel to serial run 2023-01-31 10:45:57 +01:00
Lorenz Hilpert
2059e4eba4 Ui libs in ein ui projekt gemerged 2023-01-30 16:48:39 +01:00
Lorenz Hilpert
243a288061 Project Struktur Angepasst - page projekte in einm projekt gemerged 2023-01-30 16:31:29 +01:00
Lorenz Hilpert
623155be92 Merged PR 1475: Packstück Kontrolle 2023-01-30 14:25:47 +00:00
Nino Righi
a404469085 Merged PR 1474: Branch Selector PDP too many instock requests fix
Branch Selector PDP too many instock requests fix
2023-01-30 13:42:33 +00:00
Nino Righi
b0e12b717b Merged PR 1473: Branch Selector Update - Article Search, Search Results, PDP
Branch Selector Update - Article Search, Search Results, PDP
2023-01-30 10:24:25 +00:00
Nino Righi
fdc1dadd36 Merged PR 1472: Branch Selector Update
Branch Selector Update
2023-01-26 09:26:34 +00:00
Nino Righi
872db4085c Merged PR 1469: Feature Branch Selector
Feature Branch Selector
2023-01-24 09:18:10 +00:00
Lorenz Hilpert
8af8cbacd3 css tag hinzugefügt für e2e 2023-01-20 10:47:14 +01:00
Nino Righi
01beef4312 Merged PR 1470: #3742 Fix Task Calendar openCamera Popup on Tablet
#3742 Fix Task Calendar openCamera Popup on Tablet
2023-01-19 09:55:58 +00:00
Nino Righi
a91ffd9ad7 Merged PR 1471: #3729 Goods In List Styling Fix Ipad Mini 6
#3729 Goods In List Styling Fix Ipad Mini 6
2023-01-19 09:55:18 +00:00
Lorenz Hilpert
dc42107668 #3754 Lieferschein erneut drucken - CTA Fix 2023-01-17 16:11:53 +01:00
Nino Righi
670012676c Merged PR 1468: #3742 Fix Task-Calendar PWA Open Camera Popup
#3742 Fix Task-Calendar PWA Open Camera Popup
2023-01-16 12:49:28 +00:00
Nino Righi
8910ce47cd Merged PR 1464: #3729 Bugfixes
#3729 Bugfixes
2023-01-16 09:29:20 +00:00
Nino Righi
bc76ecba46 Merged PR 1467: #3740 Fix Cart Checkout Navigation
#3740 Fix Cart Checkout Navigation
2023-01-13 15:30:18 +00:00
Nino Righi
e50707e1dd Merged PR 1465: #3740 Fix Customer Process generation
#3740 Fix Customer Process generation
2023-01-12 15:59:31 +00:00
Nino Righi
a03c6fe0cb Merged PR 1466: #3741 Fix History Order Details correctly Display the buyerNumber as customer...
#3741 Fix History Order Details correctly Display the buyerNumber as customerNumber
2023-01-12 15:57:56 +00:00
Michael Auer
d5c17b08cc Merge tag 'post-2.1-hotfix' into develop 2023-01-12 16:46:26 +01:00
Lorenz Hilpert
656bab3d48 Build Error Fix After Merge 2023-01-12 16:42:12 +01:00
Michael Auer
cc6e01bd05 Merge tag 'post-2.1-hotfix' into develop (conflicts resolved) 2023-01-12 16:14:35 +01:00
Michael Auer
a9479db5be Merge branch 'hotfix/post-2.1-hotfix' 2023-01-12 15:54:53 +01:00
Lorenz Hilpert
d4546a2865 Update karma.conf.js 2023-01-11 15:55:40 +01:00
Lorenz Hilpert
7e0dd05f3d Shared Lib - Umstrukturierung 2023-01-11 15:49:28 +01:00
Michael Auer
3bbefd3dfc Merge branch 'hotfix/post-2.1-hotfix' 2023-01-10 22:33:02 +01:00
Nino Righi
fdca2ecfee Merged PR 1463: Node 18.x and NPM 8.x Update, Removed ngx-platform-detection
Node 18.x and NPM 8.x Update, Removed ngx-platform-detection
2023-01-10 12:33:53 +00:00
Lorenz Hilpert
ae08e46b30 Merged PR 1462: Implementierung Packstück Kontolle 2023-01-09 15:38:08 +00:00
Nino Righi
bf18b83a75 Fix Shell Navigation if ProcessId is undefined 2023-01-09 16:24:53 +01:00
Nino Righi
393172ec9f Merged PR 1461: #3632 Fix Footer Active Styling
#3632 Fix Footer Active Styling
2023-01-09 14:22:31 +00:00
Nino Righi
781e9df148 Merged PR 1460: #3729 Updated Scan Icon and Removed Option to Scan on Desktop
#3729 Updated Scan Icon and Removed Option to Scan on Desktop
2023-01-09 13:58:04 +00:00
Lorenz Hilpert
2691a217db Lizenz Scandit Update 2023-01-03 14:40:45 +01:00
Lorenz Hilpert
b421f74d1a Merge branch 'feature/scanner-ipad' into develop 2023-01-02 09:43:57 +01:00
Lorenz Hilpert
e3bd33ffc3 Scanner Styling and Login Dialog 2022-12-27 18:52:08 +01:00
Lorenz Hilpert
38c2fd07ae Ipad fix test 2022-12-20 17:05:55 +01:00
Lorenz Hilpert
77ebafd018 Added WWS API - Generated with ng-swagger-gen 2022-12-20 13:13:56 +01:00
Nino Righi
dfab7e3540 Merged PR 1457: #3524 #3599 #3598 Responsive Design History
#3524 #3599 #3598 Responsive Design History
2022-12-19 17:07:43 +00:00
Lorenz Hilpert
262e0c5e11 #3719 Benachrichtigungskanal wird nicht angezeigt 2022-12-19 16:10:53 +01:00
Lorenz Hilpert
e4410fe2c7 Added Scandit Scanner to Application 2022-12-19 14:52:17 +01:00
Lorenz Hilpert
8718dd8231 Merged PR 1459: Fix NotificationChannel Display in AHF
Fix NotificationChannel Display in AHF

Related work items: #3719
2022-12-16 14:26:32 +00:00
Lorenz Hilpert
0274b2af3b Merged PR 1458: #3718 Eingabe bei Enter bewirkt löschen und Eingabe Enter
#3718 Eingabe bei Enter bewirkt löschen und Eingabe Enter
2022-12-16 13:20:20 +00:00
Lorenz Hilpert
1dbd3fd274 Merged PR 1456: Breite für Desktop angepasst
Related work items: #3700
2022-12-16 11:08:08 +00:00
Michael Auer
abdbab807d Merge branch 'feature/docker-multi-label' into develop 2022-12-15 16:46:00 +01:00
Michael Auer
718077025d ~ helmvalues: removed debug-/prod- prefix from docker image tag 2022-12-15 16:45:59 +01:00
Michael Auer
08161c29d3 ~ back to one tag, added extra label BuildType=(Debug/Production) 2022-12-15 16:45:59 +01:00
Michael Auer
942f84dfcf ! removed single quoutes from docker tags 2022-12-15 16:45:59 +01:00
Michael Auer
41defdc291 ~ added second label (Debug/Production) to docker image 2022-12-15 16:45:59 +01:00
Andreas Schickinger
2e286b2de3 Merged PR 1455: #3691 WA Kunden mit unterschiedlichen Kundennummern und gleicher Abholfachnummer
#3691 WA Kunden mit unterschiedlichen Kundennummern und gleicher Abholfachnummer

Related work items: #3691
2022-12-07 14:31:54 +00:00
Andreas Schickinger
168847b24a Merged PR 1454: #3661 AHF Feedbackmeldung beim Nachbestellen entfernt
#3661 AHF Feedbackmeldung beim Nachbestellen entfernt

Related work items: #3661
2022-11-29 14:22:04 +00:00
Andreas Schickinger
69c23a55f7 Merged PR 1453: #3682 AHF // Reservierungsliste - RadionButton ein- und ausblenden bei Paid/Unpaid
#3682 AHF // Reservierungsliste - Radion-Button ein- und ausblenden bei Bezahlt vs Nicht Bezahlt

Related work items: #3682
2022-11-29 14:17:52 +00:00
Lorenz Hilpert
045b8e162a Merged PR 1452: Update to Angular 15 2022-11-28 15:13:44 +00:00
Andreas Schickinger
f344c2b0e8 Merged PR 1451: #3656 TK Loader Styling Anpassung
#3656 TK Loader Styling Anpassung

Related work items: #3656
2022-11-25 12:49:24 +00:00
Lorenz Hilpert
11819e59c6 #3654 Zubuchen zu Pay und Collect Artikeln verhindern 2022-11-25 13:47:30 +01:00
Lorenz Hilpert
caf7331d28 Fix Unit Test 2022-11-24 11:38:42 +01:00
Lorenz Hilpert
68e5926568 Isa Error Logging 2022-11-24 10:45:53 +01:00
Andreas Schickinger
9d46f49634 Merged PR 1450: #3656 TK Kalenderansicht Loading Feedback
#3656 TK Kalenderansicht Loading Feedback

Related work items: #3656
2022-11-22 17:18:44 +00:00
Lorenz Hilpert
daae9323e8 Merged PR 1447: #3643 API Calls in der WA und WE reduziert
#3643 API Calls in der WA und WE reduziert
2022-11-21 16:46:19 +00:00
Andreas Schickinger
80c425aa6f Merged PR 1449: #3645 TK Bugfix Initiales Loading
#3645 TK Bugfix Initiales Loading

Related work items: #3645
2022-11-21 15:37:00 +00:00
Andreas Schickinger
1cbe309778 Merged PR 1448: #3646 Hotfix TK Fehlender Abstand bei keinen Suchergebnissen
#3646 Hotfix TK Fehlender Abstand bei keinen Suchergebnissen

Related work items: #3646
2022-11-21 15:36:33 +00:00
Michael Auer
e3d7813edb Merge tag '2.1' into develop 2022-11-21 11:35:18 +01:00
Michael Auer
189dc64a0f Merge branch 'release/2.1' 2022-11-21 11:35:17 +01:00
Lorenz Hilpert
2f0ede7170 Merge branch 'develop' into release/2.1 2022-11-11 14:49:43 +01:00
Lorenz Hilpert
c7e444d446 #3617 CompartmentLabel für Kunden zwischenhspeichern 2022-11-11 10:56:18 +01:00
Lorenz Hilpert
f5ac916663 #3617 QR-Code Reservierungen 2022-11-10 15:02:27 +01:00
Lorenz Hilpert
b3b9f0223e #3629 - Scpeichern doppelclick abfangen 2022-11-10 14:08:50 +01:00
Lorenz Hilpert
70455df6d3 Merge branch 'develop' into release/2.1 2022-11-08 17:19:29 +01:00
Andreas Schickinger
b89889a3e9 Merged PR 1440: #3602 TK Kalenderansicht lädt nur noch die angezeigten Tage
#3602 TK Kalenderansicht lädt nur noch die angezeigten Tage

Related work items: #3602
2022-11-08 15:50:29 +00:00
Lorenz Hilpert
7ec00925ed Merged PR 1441: #3626 Fehlerbehebung bei der Dummy Anlage Änderung
#3626 Fehlerbehebung bei der Dummy Anlage Änderung
2022-11-08 15:40:07 +00:00
Andreas Schickinger
d3e3d127b3 Merged PR 1439: #3602 TK Performance
- Kein Reload mehr bei Wechsel zwischen Trefferliste/Kalenderansicht
- Suche startet ca. 150ms früher bei Page Load
- In der Wochenansicht wird nur noch die aktuelle Woche und 7 Tage in die Vergangenheit geladen (zuvor: aktuelle Woche + 7 Tage Vergangenheit/ 7 Tage Zukunft)
- In der Monatsansicht werden nur noch die Tage des Monats geladen (zuvor: aktueller Monat + 7 Tage Vergangenheit/ 7 Tage Zukunft
- Bugfix: doppelte Suche wurde ausgelöst, wenn man sucht -> zurück zur Übersicht klickt -> nochmal das gleiche sucht

Related work items: #3602
2022-11-08 09:13:21 +00:00
Nino Righi
11c4d8fb72 Merged PR 1438: #3608 Fix typo
#3608 Fix typo
2022-11-07 16:23:23 +00:00
Andreas Schickinger
9b02a19b9c Merged PR 1437: #3609 Remission Schriftfarbe bei Auswahl weiß
#3609 Remission Schriftfarbe bei Auswahl weiß

Related work items: #3609
2022-11-07 15:44:11 +00:00
Michael Auer
57262919b8 Merge tag '2.1.10' into develop 2022-11-07 15:07:34 +01:00
Michael Auer
f787a15347 Merge branch 'release/2.1' 2022-11-07 15:06:31 +01:00
Michael Auer
bc74eac86d Merge tag '2.1.2' into develop 2022-11-07 14:58:16 +01:00
Michael Auer
0a1df250cb Merge commit '9e58e8aad9ae6a6928235dca55b30a0925c668f6' 2022-11-07 14:55:46 +01:00
Lorenz Hilpert
8a7b9de29d Merged PR 1436: #3615 Übernahme der Suchfeld eingabe in die Kundenanlage
#3615 Übernahme der Suchfeld eingabe in die Kundenanlage
2022-11-07 13:31:14 +00:00
Nino Righi
8efb87a1f7 Merged PR 1434: #3610 Fix Added Async Validator Function to p4m number form block
#3610 Fix Added Async Validator Function to p4m number form block
2022-11-03 18:21:07 +00:00
Andreas Schickinger
27ee667bfb Merged PR 1435: #3604 Kubi Checkmarks bei Kundentypanlage angepasst
#3604 Kubi Checkmarks bei Kundentypanlage angepasst

Related work items: #3604
2022-11-03 14:34:30 +00:00
Lorenz Hilpert
c64ff772e7 Merged PR 1433: Kundenanlage: Scanbutton für das scannen der Kundenkarte
Kundenanlage: Scanbutton für das scannen der Kundenkarte
2022-11-03 14:13:58 +00:00
Lorenz Hilpert
313efebb8b #3611 Dialog Anpassung handleAction 2022-11-02 16:47:58 +01:00
Lorenz Hilpert
9eee4fff6c Merged PR 1432: #3613 Wannennummer Scannen - Dialog erweitert
#3613 Wannennummer Scannen - Dialog erweitert
2022-11-02 15:15:48 +00:00
Lorenz Hilpert
b5a7c96181 Merge branch 'develop' into release/2.1 2022-11-02 15:00:54 +01:00
Lorenz Hilpert
5bea71e19e Merged PR 1431: #3611 Dummy Command angelegt
#3611 Dummy Command angelegt
2022-11-02 13:55:01 +00:00
Lorenz Hilpert
751e533dce Merge branch 'release/2.1' into develop 2022-10-28 11:20:42 +02:00
Lorenz Hilpert
9e58e8aad9 Merge branch 'develop' into release/2.1 2022-10-26 18:52:17 +02:00
Lorenz Hilpert
d62a7d704a #3587 Fix rueckgaenging gemacht, da fix im BE 2022-10-26 18:21:16 +02:00
Andreas Schickinger
f8d7d12d61 Merged PR 1430: #3586 WK Hindernis Popup Text angepasst
#3586 WK Hindernis Popup Text angepasst

Related work items: #3586
2022-10-26 16:07:07 +00:00
Lorenz Hilpert
2ad71cad78 #3587 Filter wurde nicht richtig übernommen 2022-10-26 18:04:38 +02:00
Andreas Schickinger
689d8ead24 Merged PR 1427: #3592 TK Tasks Wochenansicht reload wenn sich das DisplayedDate ändert
#3592 TK Tasks Wochenansicht reload wenn sich das DisplayedDate ändert

Related work items: #3592
2022-10-26 14:33:52 +00:00
Andreas Schickinger
b6a7df76f6 Merged PR 1428: #3593 TK Footer Menü Klick setzt den Filter zurück
#3593 TK Footer Menü Klick setzt den Filter zurück

Related work items: #3593
2022-10-26 14:30:27 +00:00
Andreas Schickinger
41e8145858 Merged PR 1429: #3594 TK Zurück zur Übersicht Button
#3594 TK Zurück zur Übersicht Button

Related work items: #3594
2022-10-26 14:29:27 +00:00
Lorenz Hilpert
3a5b80657c Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-10-26 15:06:23 +02:00
Lorenz Hilpert
41c6897224 uiDateInput - datum mit momentjs parsen 2022-10-26 15:06:16 +02:00
Lorenz Hilpert
8d644cdd65 Merged PR 1426: 3581 Handlungsanweisung
Related work items: #3581
2022-10-25 12:34:39 +00:00
Lorenz Hilpert
7a68229432 Merged PR 1424: #3580 Text in der Kundensuche angepasst
#3580 Text in der Kundensuche angepasst
2022-10-25 11:57:35 +00:00
Lorenz Hilpert
4dab0ef6f6 Merged PR 1425: #3581 Textanpassung für Kundenanlage
#3581 Textanpassung für Kundenanlage
2022-10-25 11:50:22 +00:00
Andreas Schickinger
75cad811bc Merged PR 1423: #3419 TK Suche / Wochenansicht Heute
#3419 TK Suche / Wochenansicht Heute

Related work items: #3419
2022-10-25 08:43:59 +00:00
Lorenz Hilpert
0709f1dd6a Merged PR 1422: #3576 Dialog angepasst und Weiterleitung auf Kundendetails
#3576 Dialog angepasst und Weiterleitung auf Kundendetails

Related work items: #3576
2022-10-24 16:06:00 +00:00
Lorenz Hilpert
478950c446 Merged PR 1421: #3577 Fallback walls Preis undefined ist
#3577 Fallback walls Preis undefined ist
2022-10-24 15:10:13 +00:00
Andreas Schickinger
b5e5601671 Merged PR 1420: #3420 TK Routing
#3420 TK Routing

Related work items: #3420
2022-10-24 14:50:15 +00:00
Lorenz Hilpert
0ee86faa00 Merged PR 1418: Suchbutton werden nicht immer angezeigt
Related work items: #3546
2022-10-24 14:10:30 +00:00
Andreas Schickinger
fa7b204f89 Merged PR 1419: #3547 TK iPad Drucken Button
#3547 TK iPad Drucken Button

Related work items: #3547
2022-10-24 14:06:55 +00:00
Lorenz Hilpert
22f9ba80fe removed unused icons 2022-10-21 16:15:11 +02:00
Michael Auer
065878a6e9 ~ Version Bump: 2.1 2022-10-21 15:35:52 +02:00
Lorenz Hilpert
5df433d603 #3559 PDP falsche Farbe von Reiter-Hintergrund 2022-10-21 14:41:14 +02:00
Lorenz Hilpert
21375855dd #3556 HFI Gutschein Kaufoption im Nachhinein ändern 2022-10-21 14:36:48 +02:00
Lorenz Hilpert
b847ca6b3e #3554 AGB ist Akzeptiert wenn Dialog mit Ja beantwortet wird 2022-10-21 14:26:53 +02:00
Andreas Schickinger
50caf9811d Merged PR 1416: #3520 HFI Geschenkkarte Mengenänderung übergibt Preis
#3520 HFI Geschenkkarte Mengenänderung übergibt Preis

Related work items: #3520
2022-10-21 10:58:21 +00:00
Andreas Schickinger
f0df9e1157 Merged PR 1417: #3571 TK Kalender Klicks navigieren wieder zur Liste
#3571 TK Kalender Klicks navigieren wieder zur Liste

Related work items: #3571
2022-10-21 10:57:53 +00:00
Lorenz Hilpert
3e1347f17e #3573 Breadcrumb Fix 2022-10-20 16:06:10 +02:00
Lorenz Hilpert
86082bbfda #3572 Chckbox Plazierung 2022-10-20 15:21:10 +02:00
Lorenz Hilpert
6e6551ceae #3567 B2B Meldenummer auf der Artikeldetailseite 2022-10-20 14:13:11 +02:00
Lorenz Hilpert
08ef5f0853 #3568 Typo Rechnungsadresse 2022-10-20 13:53:48 +02:00
Lorenz Hilpert
92131453e8 #3422 Focus Searchbar nach Seitenwechsel TK 2022-10-20 13:33:44 +02:00
Lorenz Hilpert
888a95d2a0 #3233 CRM API Anpassung für Kundenkartencheck 2022-10-20 13:12:52 +02:00
Lorenz Hilpert
ab745cba18 #2748 Icons Kundentrefferliste und Details 2022-10-20 11:44:12 +02:00
Lorenz Hilpert
dfe6b3977f #3554 Dialog angepasst 2022-10-19 16:51:06 +02:00
Lorenz Hilpert
e7e8b71a70 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-10-19 13:45:12 +02:00
Lorenz Hilpert
c158e16bd3 #3553 Plattierung AGB akzeptieren 2022-10-19 13:45:04 +02:00
Andreas Schickinger
464fac660b Merged PR 1415: #3543 TK iPad Scrolling
#3543 TK iPad Scrolling

Related work items: #3543
2022-10-19 11:21:18 +00:00
Lorenz Hilpert
79b1920b15 #3542 WA Keine Suchanfrage wenn Daten bereits vorhanden sind 2022-10-18 11:33:52 +02:00
Andreas Schickinger
f071e7b2d5 Merged PR 1411: #3527 Kundenkarten Validator
#3527 Kundenkarten Validator

Related work items: #3527
2022-10-17 15:30:52 +00:00
Andreas Schickinger
3afb8d6ed1 Merged PR 1412: #3422 TK Suchfeld Autofocus directive und Laufende Aufgaben auch ausblenden,...
#3422 TK Suchfeld Autofocus directive und Laufende Aufgaben auch ausblenden, wenn keine vorhanden

Related work items: #3422
2022-10-17 15:03:52 +00:00
Andreas Schickinger
87a2e94dd6 Merged PR 1406: #3496 HFI Geschenkkarte max Preis fix
#3496 HFI Geschenkkarte max Preis fix

Related work items: #3496
2022-10-17 14:01:42 +00:00
Andreas Schickinger
d711d4a816 Merged PR 1409: #3419 TK Überfällige Aufgaben nur anzeigen, wenn vorhanden
#3419 TK Überfällige Aufgaben nur anzeigen, wenn vorhanden

Related work items: #3419
2022-10-17 13:55:47 +00:00
Lorenz Hilpert
a4b4aeed64 #3471 Email entfernen bei klick auf nein 2022-10-17 15:51:08 +02:00
Lorenz Hilpert
3707572bd8 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-10-17 15:48:37 +02:00
Lorenz Hilpert
aef5c06f0a #3531 CSS Kundenanlage Speichern Button Position 2022-10-17 15:48:26 +02:00
Lorenz Hilpert
a021ac0da3 Merged PR 1410: #3503 IPad Sortierung im TK falsh
#3503 IPad Sortierung im TK falsh
2022-10-17 13:40:33 +00:00
Lorenz Hilpert
1e4e6da44e Merged PR 1408: #3545 Fix Icon Positions IPad mini 2
#3545 Fix Icon Positions IPad mini 2
2022-10-17 12:46:45 +00:00
Andreas Schickinger
6b0d9774c5 Merged PR 1407: #3423 TK Kalendar klicks navigieren nicht mehr zur Listenansicht
#3423 TK Kalendar klicks navigieren nicht mehr zur Listenansicht

Related work items: #3423
2022-10-17 11:55:20 +00:00
Lorenz Hilpert
e1720e6023 Merged PR 1405: icon scss 2022-10-14 14:24:12 +00:00
Lorenz Hilpert
3078724ced #3540 Text Änderung Interessen 2022-10-14 15:20:51 +02:00
Lorenz Hilpert
f3eb0a67f6 #3539 Typo Interessen 2022-10-14 15:19:53 +02:00
Lorenz Hilpert
65d7a6f5a4 Merged PR 1404: #3471 Zusätzliche addressen werden nun gespeichert
#3471 Zusätzliche addressen werden nun gespeichert

Related work items: #3471
2022-10-14 11:36:44 +00:00
Lorenz Hilpert
b2b5456400 Merged PR 1403: #3518 Checkbox ist nicht abwählbar bei einer checkbox
#3518 Checkbox ist nicht abwählbar bei einer checkbox
2022-10-14 10:08:29 +00:00
Lorenz Hilpert
a598be069d Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-10-14 10:55:59 +02:00
Andreas Schickinger
bf61f2c982 Merged PR 1402: #3507 Listenbestellung getPickUpAvailability hack
#3507 Listenbestellung getPickUpAvailability hack

Related work items: #3507
2022-10-14 08:49:41 +00:00
Lorenz Hilpert
63225491f1 FIX CUSTOMER CREATE NAVIGATION 2022-10-13 18:37:18 +02:00
Andreas Schickinger
0dbc773775 Merged PR 1400: #3496 HFI Geschenkkarte max Preis
#3496 HFI Geschenkkarte max Preis

Related work items: #3496
2022-10-13 13:10:34 +00:00
Lorenz Hilpert
47b7d42dd3 Merged PR 1399: #3227 Anpassung der Handlungsanweisung
#3227 Anpassung der Handlungsanweisung
2022-10-13 13:06:36 +00:00
Lorenz Hilpert
d713c787e6 Merged PR 1398: #3515 Added Newsletter Text to webshop and fix navigation
#3515 Added Newsletter Text to webshop and fix navigation
2022-10-13 13:05:56 +00:00
Lorenz Hilpert
68a2eab425 Merged PR 1396: #3502 Guard bei navigation auf P4M Anlage angepasst
#3502 Guard bei navigation auf P4M Anlage angepasst
2022-10-12 15:02:17 +00:00
Andreas Schickinger
886f063d1b Fix für Anzeigefehler im SectionToggle 2022-10-12 16:40:29 +02:00
Andreas Schickinger
ed6ee36509 Merged PR 1395: #3481 Remission Filter zwischenspeichern bei Wechsel zwischen Pflicht- und Ab...
#3481 Remission Filter zwischenspeichern bei Wechsel zwischen Pflicht- und Abteilungsremission

Related work items: #3481
2022-10-12 13:57:28 +00:00
Andreas Schickinger
ab345dae0d Merged PR 1393: #3514 TK Fehlermeldung fix
#3514 TK Fehlermeldung fix

Related work items: #3514
2022-10-12 13:39:29 +00:00
Lorenz Hilpert
fbb1e6c4a2 Merged PR 1394: #3511 Addressvalidierung für Onlinekonto aktiviert
#3511 Addressvalidierung für Onlinekonto aktiviert
2022-10-12 10:38:35 +00:00
Lorenz Hilpert
4ede9226b4 Merged PR 1392: #3484 Keep Userstates on Tab Changes
#3484 Keep Userstates on Tab Changes
2022-10-11 15:05:04 +00:00
Andreas Schickinger
fbfecbd8ae Merged PR 1391: TK Suche Timespan Fallback angepasst
TK Suche Timespan von 6 Monate Vergangenheit/Zukunft auf 6 Wochen Vergangenheit, 2 Wochen Zukunft geändert. Wird verwendet, wenn kein Timespan Filter gesetzt ist

Related work items: #3422
2022-10-11 14:32:30 +00:00
Lorenz Hilpert
3c4612d15c Merged PR 1389: #3307 Filter Wird Nicht Gerendert
#3307 Filter Wird Nicht Gerendert
2022-10-11 13:33:10 +00:00
Andreas Schickinger
7fa2e7862d Merged PR 1388: #3508 Bestellbestätigung "zur Warenausgabe": Prüfung auf enabled bei CustomerFeature B2B entfernt
#3508 Prüfung auf enabled bei CustomerFeature B2B entfernt

Related work items: #3508
2022-10-11 12:16:07 +00:00
Andreas Schickinger
114267362c Merged PR 1384: #3503 TK Sortierung umgedreht, #3504 Scroll Fix
#3503 TK Sortierung umgedreht, #3504 Scroll Fix

Related work items: #3503, #3504
2022-10-11 11:06:01 +00:00
Lorenz Hilpert
4050e9605d FIX Routing Kundenalage 2022-10-11 10:41:25 +02:00
Andreas Schickinger
fdd5373aaf Merged PR 1385: #3493 TK Modal Header Abstand erhöht
#3493 TK Modal Header Abstand erhöht

Related work items: #3493
2022-10-10 15:59:04 +00:00
Andreas Schickinger
2dfe7ec05b Merged PR 1386: #3492 TK Drucken in der Trefferliste fix
#3492 TK Drucken in der Trefferliste fix

Related work items: #3492
2022-10-10 15:58:42 +00:00
Lorenz Hilpert
82513b5dde Merged PR 1387: Kubi Kundenanlage und Kundenkarte
Related work items: #3230, #3233
2022-10-10 15:57:50 +00:00
Lorenz Hilpert
14d1bb6ac8 Merged PR 1383: HFI Geschnakkarte
Related work items: #3496
2022-10-07 14:20:05 +00:00
Lorenz Hilpert
d589c94681 Fix Kundendatenerfassen - added modifier add-loyality-card 2022-10-06 12:42:45 +02:00
Lorenz Hilpert
eca19bb507 Updateing Customer for P4M 2022-10-06 10:47:10 +02:00
Lorenz Hilpert
282ff30b3e #3494 Upgrade Ava API auf v6 2022-10-05 13:58:02 +02:00
Lorenz Hilpert
5d0b810674 Upgrade catsearch API auf V6 2022-10-05 13:54:12 +02:00
Lorenz Hilpert
e32482c634 Type Kundendaten erfassen speichern aufruf 2022-10-05 13:25:43 +02:00
Lorenz Hilpert
650026b0c0 Es existiert bereits ein Onlinekonto 2022-10-04 17:48:15 +02:00
Lorenz Hilpert
cd25d6da38 #3489 fonts 2022-10-04 12:10:17 +02:00
Andreas Schickinger
9dd0954967 Merged PR 1381: #3326 Tätigkeitskalender Suchfunktion und neues Design
Tätigkeitskalender Suchfunktion und neues Design

Zusätzliche Änderungen im PR:
- Anpassungen für GitHub package Zugriff
- UiModalRef um ein afterChanged$ erweitert, um nach dem schließen zu erkennen ob ein reload notwendig ist
- ui-loader funktionierte nicht bei verwendung von ui-scroll-container mit useLoadAnimation false
- ui-skeleton-loader um Template für TK Listenitem erweitert

Related work items: #3419, #3420, #3421, #3422, #3423
2022-10-04 09:42:49 +00:00
Lorenz Hilpert
fdaceb9bf8 Merged PR 1382: Kubi
Related work items: #3228, #3230, #3289, #3467, #3471, #3478
2022-09-30 13:48:19 +00:00
Lorenz Hilpert
4ab3a3b3cf #3307 Fixed With Filter 2022-09-30 11:19:17 +02:00
Lorenz Hilpert
eb8b54dc63 Fix Unit Test 2022-09-29 18:05:43 +02:00
Lorenz Hilpert
4703aee60c Interveptor Unit Test Fix 2022-09-29 16:26:43 +02:00
Lorenz Hilpert
93b0d43bd7 #3307 Anzeige des backdrops bei Filtern 2022-09-29 14:20:41 +02:00
Lorenz Hilpert
1029310e0d #3483 Neuanmeldung bei 401 Antworten 2022-09-29 14:11:59 +02:00
Michael Auer
c083684db2 Merge tag '3452-Autocomplete-Abbrechen-Bei-Suche' into develop 2022-09-28 22:19:03 +02:00
Michael Auer
d6775aad69 Merge branch 'hotfix/3452-Autocomplete-Abbrechen-Bei-Suche' 2022-09-28 22:19:02 +02:00
Lorenz Hilpert
3eff10bbb4 Merged PR 1380: Upgrade der API auf V6
Upgrade der API auf V6

Related work items: #3466
2022-09-20 16:14:50 +00:00
Lorenz Hilpert
e4cbab8365 Merged PR 1379: #3428 Aktivierung der Buttons ohne Raio button aktivieren wenn nur ein artikel
#3428 Aktivierung der Buttons ohne Raio button aktivieren wenn nur ein artikel
2022-09-15 16:05:12 +00:00
Lorenz Hilpert
18212e7a4c Merged PR 1378: Update CRM API V6
Update CRM API V6
2022-09-14 15:13:14 +00:00
Lorenz Hilpert
0cd0b1abfd Merged PR 1377: Update CRM API
Related work items: #3464
2022-09-14 13:48:25 +00:00
Lorenz Hilpert
a66137873c Merged PR 1376: #3448 Anzeige Sonderinfo
#3448 Anzeige Sonderinfo
2022-09-14 08:26:29 +00:00
Andreas Schickinger
469110eabf Merged PR 1375: #3455 AHF Frist immer für gesamten Warenkorb festlegen
#3455 AHF Frist immer für gesamten Warenkorb festlegen

Related work items: #3455
2022-09-13 13:08:59 +00:00
Lorenz Hilpert
55474fa4e3 Merged PR 1374: #3451 nach löschen des Browser-Verlauf kommt Fehler
#3451 nach löschen des Browser-Verlauf kommt Fehler
2022-09-13 12:56:17 +00:00
Lorenz Hilpert
3bdcdee031 #3452 Autocomplete wird nicht abgebrochen, wenn Suche ausgelöst wurde 2022-09-12 14:34:24 +02:00
Lorenz Hilpert
246c5a61dd Merged PR 1373: #3428 bei Teilabholung ohne ausgewählten Radio-Button wirf Fehler
#3428 bei Teilabholung ohne ausgewählten Radio-Button wirf Fehler
2022-09-08 13:20:45 +00:00
Andreas Schickinger
0c8bfba515 Merged PR 1372: #3340 Quantity Dropdown um Suffix erweitert
#3340 Quantity Dropdown um Suffix erweitert

Related work items: #3340
2022-09-01 08:23:20 +00:00
Michael Auer
3c8d9bb1e5 Merge tag '2.0' into develop 2022-08-24 10:33:19 +02:00
Michael Auer
da2c1c8316 Merge branch 'release/2.0' 2022-08-24 10:33:18 +02:00
Lorenz Hilpert
0334b2dd33 Merge branch 'release/2.0' into develop 2022-08-23 14:24:21 +02:00
Lorenz Hilpert
96356042af Remission - Anpassung HTML fuer E2E Tests 2022-08-23 14:02:50 +02:00
Lorenz Hilpert
21adff8d0c #3140 Button "Nicht-Clickbar"-Icon nur wenn disabled 2022-08-22 16:11:51 +02:00
Lorenz Hilpert
35def2a7c7 #3405 Kalender -Speichern-Button verschwindet 2022-08-19 17:07:30 +02:00
Lorenz Hilpert
e3d82794a3 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-08-19 15:55:10 +02:00
Lorenz Hilpert
20cbac8f17 #3140 Ausgrauen des Auswaehlen Buttons fur
Zuruecklegen bis
2022-08-19 15:55:01 +02:00
Lorenz Hilpert
6067e02729 #3400 Uebergabe 0 Eur wenn kein Preis existiert 2022-08-18 16:57:06 +02:00
Lorenz Hilpert
eb77664ea1 #3387 - Auswertung der Kapazitaeten angepasst 2022-08-18 15:38:24 +02:00
Michael Auer
8b1baf9ebd Merge tag '2.0.531' into develop 2022-08-18 13:47:13 +02:00
Michael Auer
12fb774b73 Merge branch 'release/2.0' 2022-08-18 13:44:03 +02:00
Lorenz Hilpert
d79dbb11fe #2162 - Warnung eingebaut und Anzeigefehler behoben 2022-08-17 17:08:09 +02:00
Lorenz Hilpert
19ccb29248 #2162 - WA - Auf der Details Seite werden nur items mit dem gleichen Kunden angezeigt. 2022-08-16 15:29:33 +02:00
Lorenz Hilpert
199c4f30e7 #3139 Loder angepasst 2022-08-11 17:23:20 +02:00
Lorenz Hilpert
732c0d4e35 #3139 Load Spinner für Abholfrist 2022-08-10 16:50:29 +02:00
Lorenz Hilpert
fa1769da9f 2022-08-08 12:10:19 +02:00
Lorenz Hilpert
029997d624 #3338 - Uebergabe Filter angepasst 2022-08-08 11:56:46 +02:00
Andreas Schickinger
d2546409cb Merged PR 1370: #3139 Abholfachfrist: Für alle festlegen Button in Bestellbestätigung
#3139 Abholfachfrist: Für alle festlegen Button in Bestellbestätigung

Related work items: #3139
2022-08-08 08:46:00 +00:00
Andreas Schickinger
cb2bc8d65b Merged PR 1369: #3332 AHFFrist DisplayOrderItemSubsetDTO verwendet
#3332 AHFFrist DisplayOrderItemSubsetDTO verwendet

Related work items: #3332
2022-08-04 13:38:39 +00:00
Andreas Schickinger
57bd8d4dd4 Merged PR 1368: #3337 Hotfix E-Mail Adresse wird nur noch angehakt, wenn auch eine hinterlegt ist
#3337 E-Mail Adresse wird nur noch angehakt, wenn auch eine hinterlegt ist

Related work items: #3337
2022-08-04 09:45:59 +00:00
Andreas Schickinger
cc1e210799 Merged PR 1367: #3139, #3140, #3328 AHFFrist auf Bestellbestätigung- und Bestellpostenseite
Related work items: #3139, #3140, #3328
2022-08-03 13:51:25 +00:00
Lorenz Hilpert
4bee08d483 Merged PR 1366: Merge release => develop
Related work items: #3180, #3203, #3245, #3293, #3299, #3312, #3320, #3322
2022-08-02 12:30:08 +00:00
Lorenz Hilpert
8cfb160989 Merged PR 1365: #3322 Leseproben - Link geht über Rand
#3322 Leseproben - Link geht über Rand

Related work items: #3322
2022-08-01 13:06:19 +00:00
Lorenz Hilpert
6325167eda Merged PR 1364: changed query from qss to customer_name
changed query from qss to customer_name

Related work items: #3320
2022-08-01 12:10:58 +00:00
Lorenz Hilpert
8925eae4c5 Merged PR 1362: Merge develop => release/2.0
Related work items: #3180, #3203, #3245, #3293, #3299, #3312
2022-07-29 11:58:46 +00:00
Andreas Schickinger
9282bcd779 Merged PR 1361: #3312 NotificationChannel Auswertung angepasst
#3312 NotificationChannel Auswertung angepasst

Related work items: #3312
2022-07-29 11:55:29 +00:00
Lorenz Hilpert
5aa6499598 #3313 Nachbestellen auf der Wareneingangsliste wirft Fehler 2022-07-29 11:47:03 +02:00
Andreas Schickinger
f766781928 Merged PR 1360: Merge release 2.0 -> develop
Related work items: #3180, #3203, #3245, #3293, #3299
2022-07-28 14:05:13 +00:00
Andreas Schickinger
02834b7102 Merged PR 1359: Merge develop -> release 2.0
Merge develop -> release 2.0

Related work items: #3180, #3203, #3245, #3299
2022-07-28 13:48:10 +00:00
Andreas Schickinger
a9e3430505 Merged PR 1358: #3180 getTakeAwayAvailability angepasst
#3180 getTakeAwayAvailability angepasst

Related work items: #3180
2022-07-28 13:30:06 +00:00
Nino Righi
4b9a23001a Merged PR 1357: #3267 Email Validator Regex updated, Notification Channel Control Logic modified
#3267 Email Validator Regex updated, Notification Channel Control Logic modified
2022-07-28 13:25:55 +00:00
Nino Righi
8de7ec9124 Merged PR 1356: #3267 Bugfix If Both Communication Details are Valid update Customer correctly
#3267 Bugfix If Both Communication Details are Valid update Customer correctly
2022-07-27 16:30:18 +00:00
Andreas Schickinger
19a0a3c7c3 Merged PR 1355: #3180 Lupe wird erst angezeigt, wenn das Bild erfolgreich geladen wurde
#3180 Lupe wird erst angezeigt, wenn das Bild erfolgreich geladen wurde

Related work items: #3180
2022-07-27 16:21:55 +00:00
Nino Righi
42a7d6e4b7 Merged PR 1352: #3267 Checkout Cart Fix Notification Channel disable Order CTA if communication details missing
#3267 Checkout Cart Fix Notification Channel disable Order CTA if communication details missing
2022-07-27 15:21:52 +00:00
Nino Righi
66818b1647 Merged PR 1354: #3304 Customer Search Message Fix
#3304 Customer Search Message Fix
2022-07-27 14:06:07 +00:00
Andreas Schickinger
bc8ba9adc8 Merged PR 1353: #3180 Entkoppelte Ladebereiche für Verfügbarkeiten
#3180 Entkoppelte Ladebereiche für Verfügbarkeiten

Related work items: #3180
2022-07-27 13:16:35 +00:00
Nino Righi
4ae5759361 Merged PR 1351: #3304 Fix WA Autocomplete Dropdown closing after queryParams change
#3304 Fix WA Autocomplete Dropdown closing after queryParams change
2022-07-26 14:57:11 +00:00
Andreas Schickinger
b5cfcf8036 Merged PR 1350: #3245 Zubuchen disabled fixes
#3245 Zubuchen disabled fixes

Related work items: #3245
2022-07-26 14:47:46 +00:00
Lorenz Hilpert
061982cf2c Merged PR 1349: Dashboard // nicht alle Infos werden angezeigt
Related work items: #3299
2022-07-26 12:00:09 +00:00
Nino Righi
0e1422c2c4 Merged PR 1348: #3267 Checkout Cart Notification Disable Order Button if Checkbox is Active b...
#3267 Checkout Cart Notification Disable Order Button if Checkbox is Active but E-Mail or Mobilenumber is missing
2022-07-26 11:09:43 +00:00
Nino Righi
3e534029a0 Merged PR 1347: #3167 Fix Reorder Modal Styling Stock Column Text Centered
#3167 Fix Reorder Modal Styling Stock Column Text Centered
2022-07-25 15:44:42 +00:00
Nino Righi
8d9ee9fe5c Merged PR 1343: #3297 Fix Reorder Modal takes now the correct Quantity
#3297 Fix Reorder Modal takes now the correct Quantity
2022-07-25 15:44:10 +00:00
Lorenz Hilpert
675aa04564 Added Generated package-lock.json - npm version 6 2022-07-25 17:42:30 +02:00
Lorenz Hilpert
88c8885a81 Build Test 2022-07-25 17:26:14 +02:00
Andreas Schickinger
151760aef9 Merged PR 1346: #2303 WA AHF // Zusatz bei Gruppierung in Trefferliste beachten
#3203 WA AHF // Zusatz bei Gruppierung in Trefferliste beachten

Related work items: #3203
2022-07-25 15:15:02 +00:00
Nino Righi
6c89969b60 Merged PR 1345: #3214 Price Diff Modal Styling Adjustments
#3214 Price Diff Modal Styling Adjustments
2022-07-25 14:57:13 +00:00
Nino Righi
0fd5e66c33 Merged PR 1344: #3287 Notification Channel preselect E-Mail if E-Mail and SMS is available
#3287 Notification Channel preselect E-Mail if E-Mail and SMS is available
2022-07-25 14:55:08 +00:00
Lorenz Hilpert
c8aa526e4d Fix Toaster Component => onSlideFinished 2022-07-25 16:29:38 +02:00
Andreas Schickinger
f2c492c6ea Merged PR 1342: #3245 Zubuchen disabled wenn ein Zusatz ausgewählt ist
#3245 Zubuchen disabled wenn ein Zusatz ausgewählt ist

Related work items: #3245
2022-07-25 14:24:21 +00:00
Lorenz Hilpert
11cf845235 Update ToastComponent.timeoutRef to any 2022-07-25 15:25:00 +02:00
Lorenz Hilpert
ae6fbc7c64 update packages 2022-07-25 15:23:45 +02:00
Andreas Schickinger
71eda539f6 Merged PR 1341: Merged PR 1340: #3293 Filtereinstellungen bei Tabwechsel
Merged PR 1340: #3293 Filtereinstellungen bei Tabwechsel

#3293 Filtereinstellungen bei Tabwechsel

Related work items: #3293

Related work items: #3293
2022-07-21 13:51:09 +00:00
Andreas Schickinger
f43b948ac9 Merged PR 1340: #3293 Filtereinstellungen bei Tabwechsel
#3293 Filtereinstellungen bei Tabwechsel

Related work items: #3293
2022-07-21 09:58:55 +00:00
Andreas Schickinger
1b77020b6a Merge branch 'develop' into release/2.0 2022-07-20 13:38:46 +02:00
Andreas Schickinger
1f62040560 Merged PR 1339: #3265 Warenausgabe Scrolling und SilentReload Bugfix
#3265 Warenausgabe Scrolling und SilentReload Bugfix

Related work items: #3265
2022-07-19 15:17:11 +00:00
Nino Righi
cc5c3167b1 Merged PR 1338: #3292 Process Guards Breadcrumbs Fix
#3292 Process Guards Breadcrumbs Fix
2022-07-19 15:01:37 +00:00
Andreas Schickinger
b9b79b949f Merged PR 1337: #3291 Warenausgabe Caching Verhalten und Scrolling angepasst
#3291 Warenausgabe Caching Verhalten und Scrolling angepasst

Related work items: #3291
2022-07-19 13:06:05 +00:00
Nino Righi
a0d729fe6d Merged PR 1336: #3272 Revert WA Tab Naming changes back to current production version
#3272 Revert WA Tab Naming changes back to current production version
2022-07-19 12:31:10 +00:00
Andreas Schickinger
f618dd3865 Merged PR 1335: #3291 WA Listenansicht Statusänderung cleared Cache
#3291 WA Listenansicht Statusänderung cleared Cache

Related work items: #3291
2022-07-18 15:58:59 +00:00
Nino Righi
3fd3f972db Merged PR 1334: #3287 Notifications Deactivate Other Channels except SMS and EMail
#3287 Notifications Deactivate Other Channels except SMS and EMail
2022-07-18 15:32:07 +00:00
Andreas Schickinger
2311655e5e Merged PR 1333: #3285 TK Artikelbilder verzerrt Dashboard fix
#3285 TK Artikelbilder verzerrt Dashboard fix
2022-07-18 14:40:29 +00:00
Nino Righi
c589836097 Merged PR 1332: #3286 Remission Fix Filter Settings change to default after Source Changed
#3286 Remission Fix Filter Settings change to default after Source Changed
2022-07-18 14:34:52 +00:00
Andreas Schickinger
dbc641cfce Merged PR 1331: #3285 TK Bilder verzerrt
#3285 TK Bilder verzerrt

Related work items: #3285
2022-07-18 13:53:01 +00:00
Andreas Schickinger
f13bc58925 Merged PR 1330: #3276 Remission Filter Button nicht mehr disabled
#3276 Remission Filter Button nicht mehr disabled

Related work items: #3276
2022-07-18 13:08:07 +00:00
Andreas Schickinger
94d5892cf1 Merged PR 1328: #3272 Beim Wechsel zwischen WA und Artikelrecherche den Warenkorb nicht mehr...
#3272 Beim Wechsel zwischen WA und Artikelrecherche den Warenkorb nicht mehr verwerfen

Related work items: #3272
2022-07-18 10:18:10 +00:00
Andreas Schickinger
8e32b15f26 Merged PR 1329: #3265 Warenausgabe Tabwechsel fixes
#3265 Warenausgabe Tabwechsel fixes
- Fehlermeldung ScrollPosition
- Suche wird trotz Cache ausgeführt
- Scroll Top bei erneuter Suche im gleichen Tab oder über Filter
- Beim Vorgangswechsel wurde der Filter nicht korrekt resetted

Related work items: #3265
2022-07-18 09:37:27 +00:00
Andreas Schickinger
fe5f0ef2eb Merged PR 1327: #3283 Fallback URL für einen Vorgang von Dashboard auf Artikelsuche geändert
#3283 Fallback URL für einen Vorgang von Dashboard auf Artikelsuche geändert. Dadurch kommt es nicht mehr dazu, dass ein Tab nicht selektierbar "hängen bleibt" und zum Dashboard navigiert. Die Ursache wie es zu dem Problem kam ist noch unbekannt

Related work items: #3283
2022-07-18 09:18:13 +00:00
Andreas Schickinger
daa27d5f2d Merged PR 1326: #3282 Fehlerdialog und Logout bei zu langer Inaktivität
#3282 Fehlerdialog und Logout bei zu langer Inaktivität - PR für Test

Related work items: #3282
2022-07-18 09:14:05 +00:00
Nino Righi
bb7626609e Merged PR 1325: #3272 Prozess Tab Bugfixes
#3272 Prozess Tab Bugfixes
2022-07-14 15:59:36 +00:00
Nino Righi
9ed58b685b Merged PR 1323: #3272 #3275 Tab Process Management Updated, Cart, CheckoutCart, WA
#3272 #3275 Tab Process Management Updated, Cart, CheckoutCart, WA
2022-07-14 14:12:21 +00:00
Andreas Schickinger
4eb81ad30a Merged PR 1324: #3276 Remission Starten Button disabled, wenn Liste läd
#3276 Remission Starten Button disabled, wenn Liste läd

Related work items: #3276
2022-07-14 13:49:26 +00:00
Nino Righi
a1f2cb57b3 Merged PR 1322: #3275 Bestellbestätigungs Prozess Bugfixes
#3275 Bestellbestätigungs Prozess Bugfixes
2022-07-13 15:03:40 +00:00
Andreas Schickinger
62b8e387ca Merged PR 1321: #3270 Listenbestellung B2B Preis wird richtig übernommen
#3270 Listenbestellung B2B Preis wird richtig übernommen

Related work items: #3270
2022-07-13 14:59:36 +00:00
Andreas Schickinger
07498db711 Merged PR 1316: #3270 Listenbestellung Popup Preis wird bei Wechsel der Filteroption aktualis...
#3270 Listenbestellung Popup Preis wird bei Wechsel der Filteroption aktualisiert

Related work items: #3270
2022-07-12 15:33:29 +00:00
Nino Righi
2adc8c6f5d Merged PR 1320: #3275 Made Cart Checkout Process reusable
#3275 Made Cart Checkout Process reusable
2022-07-12 15:31:56 +00:00
Lorenz Hilpert
f15a43f303 Merged PR 1319: #3274 Warenausgabe - Filter
#3274 Warenausgabe - Filter
2022-07-12 13:12:59 +00:00
Nino Righi
e35aea5a7e Merged PR 1318: #3273 #3271 Notifications Cart Show Toggle and Bugfix
#3273 #3271 Notifications Cart Show Toggle and Bugfix
2022-07-12 09:02:00 +00:00
Lorenz Hilpert
0e1ed9d8cc Merge branch 'feature/#3265-Scroll-Position-Bug' into develop 2022-07-11 16:13:05 +02:00
Lorenz Hilpert
f62ef06e51 Remove Process Tabs in Goods Out 2022-07-11 16:06:47 +02:00
Andreas Schickinger
30f4d4588f Merged PR 1315: #3269 Bestellbestaetigung fehlerhafte Anzeige
#3269 Bestellbestaetigung fehlerhafte Anzeige

Related work items: #3269
2022-07-11 12:59:22 +00:00
Lorenz Hilpert
e102396dab #3265 Scroll Position Bug 2022-07-11 12:03:10 +02:00
Andreas Schickinger
f60815ef63 Merged PR 1314: #3268 Artikelformat wird überall auf undefined geprüft. Fehlendes FormatIcon...
#3268 Artikelformat wird überall auf undefined geprüft. Fehlendes FormatIcon in PurchasingOptions implementiert

Related work items: #3268
2022-07-08 13:59:37 +00:00
Andreas Schickinger
7b11b53774 Merged PR 1313: #3267 Warenkorb NotificationChannels nur speichern, wenn Haken und Value gese...
#3267 Warenkorb NotificationChannels nur speichern, wenn Haken und Value gesetzt wurden

Related work items: #3267
2022-07-08 08:11:35 +00:00
Nino Righi
abff7715ee Merged PR 1312: #3256 Fix Display Toast Notification
#3256 Fix Display Toast Notification
2022-07-08 08:09:07 +00:00
Andreas Schickinger
83c0a20d61 Warenausgabe Tabwechsel Bugfix 2022-07-06 17:47:39 +02:00
Andreas Schickinger
a4de2391e9 Merged PR 1310: #3262 WA Loader wird nicht angezeigt
#3262 WA Loader wird nicht angezeigt

Related work items: #3262
2022-07-06 14:58:22 +00:00
Andreas Schickinger
732566eacd Merged PR 1311: #3263 WA Details API calls angepasst
#3263 WA Details API calls angepasst

Related work items: #3263
2022-07-06 14:48:37 +00:00
Andreas Schickinger
2c98128531 Merged PR 1309: #3264 WA QueryParam aktualisieren mit debounce
#3264 WA QueryParam aktualisieren mit debounce

Related work items: #3264
2022-07-06 14:38:56 +00:00
Nino Righi
9a45823bdb Merged PR 1308: #3256 Abholfachremissionsvorschau Create Toas with Dialog Text or Fallback Me...
#3256 Abholfachremissionsvorschau Create Toas with Dialog Text or Fallback Message if Dialog is not available
2022-07-06 14:38:35 +00:00
Andreas Schickinger
fa43a08831 Merged PR 1305: Warenbegleitscheine Rechtschreibfehler fix
Warenbegleitscheine Rechtschreibfehler fix
2022-07-04 11:25:51 +00:00
Nino Righi
6fb8bdaff1 Merged PR 1304: Merge Develop -> Release/2.0
Merge Develop -> Release/2.0

Related work items: #905, #2737, #2790, #3040, #3150, #3157, #3158, #3175, #3179, #3189, #3212, #3234
2022-06-29 12:48:45 +00:00
Andreas Schickinger
35e6d60ac0 Merged PR 1301: #3234 Remission Artikel hinzufügen Teilmengen Bugfix
#3234 Remission Artikel hinzufügen Teilmengen Bugfix

Related work items: #3234
2022-06-29 08:37:58 +00:00
Nino Righi
ecfc241fb5 Merged PR 1303: #2953 Fix Zubuchen CompartmentCode
#2953 Fix Zubuchen CompartmentCode
2022-06-29 08:37:25 +00:00
Nino Righi
866a5100b9 Merged PR 1299: #2953 Updated QR Code Print Data
#2953 Updated QR Code Print Data
2022-06-28 13:31:47 +00:00
Andreas Schickinger
3d972fd740 Merged PR 1298: #3234 Bugfix Remission Artikel hinzufügen Menge falsch
#3234 Bugfix Remission Artikel hinzufügen Menge falsch

Related work items: #3234
2022-06-28 08:14:39 +00:00
Nino Righi
59c9275cc4 Merged PR 1297: #2953 Updated PRINT_PRICEDIFFQRCODELABEL compartmentCode and compartmentInfo
#2953 Updated PRINT_PRICEDIFFQRCODELABEL compartmentCode and compartmentInfo
2022-06-27 15:33:10 +00:00
Lorenz Hilpert
3ada83efff #3091 - Meldung bei nicht remittierbaren Artikel 2022-06-27 14:46:12 +02:00
Lorenz Hilpert
e263048a35 gen:swagger:remi - Regenerate remi api 2022-06-27 10:24:41 +02:00
Lorenz Hilpert
63980298b6 #3149 Query Filter Keep Changes Whitput Applying 2022-06-27 10:19:04 +02:00
Lorenz Hilpert
b904e94156 Merged PR 1296: Merge Release into Develop
Related work items: #905, #2737, #2790, #3040, #3150, #3157, #3158, #3175, #3179, #3189, #3212
2022-06-24 15:06:23 +00:00
Lorenz Hilpert
78f91b937f Merged PR 1295: Merge Develop into Release2.0
Related work items: #905, #3040, #3175, #3179, #3189, #3212
2022-06-24 14:54:23 +00:00
Andreas Schickinger
1ecd08d053 Merged PR 1293: #3212 Remission Stapel aktualisieren bugfix
#3212 Remission Stapel aktualisieren bugfix

Related work items: #3212
2022-06-24 14:06:41 +00:00
Andreas Schickinger
8c03accae7 Merged PR 1294: #3224 Remission Artikel hinzufügen Breadcrumb
#3224 Remission Artikel hinzufügen Breadcrumb
2022-06-24 14:05:51 +00:00
Andreas Schickinger
456d3f2f3a Merged PR 1290: #905 Remission WBS Leistung Dummy entfernt
#905 Remission WBS Leistung Dummy entfernt

Related work items: #905
2022-06-24 09:05:39 +00:00
Andreas Schickinger
fa2838ea5c Merged PR 1289: #3212 Remission Stapel aktualisieren fix
#3212 Remission Stapel aktualisieren fix
2022-06-24 09:04:58 +00:00
Andreas Schickinger
e228490812 Merged PR 1288: #3212 Remission Stapel Stock aktualisieren anhand EAN
#3212 Remission Stapel Stock aktualisieren anhand EAN

Related work items: #3212
2022-06-23 15:38:44 +00:00
Nino Righi
13d0ac0cbd Merged PR 1287: #3222 Remission Fix Trigger Init Search after Filter gets loaded, relocated u...
#3222 Remission Fix Trigger Init Search after Filter gets loaded, relocated update Cache function
2022-06-23 15:38:10 +00:00
Nino Righi
09bed1456e Merged PR 1284: #3216 Customer Order Details Display All Subset Items
#3216 Customer Order Details Display All Subset Items
2022-06-23 15:34:11 +00:00
Andreas Schickinger
c6827e499e Merged PR 1286: #3040 Logik zum Entfernen von Duplikaten angepasst
#3040 Logik zum Entfernen von Duplikaten angepasst

Related work items: #3040
2022-06-23 13:03:34 +00:00
Nino Righi
d54cc7a2fd Merged PR 1278: #3204 Platform Detection and Scrollbars
#3204 Platform Detection and Scrollbars
2022-06-23 07:28:14 +00:00
Andreas Schickinger
67dae94524 Merged PR 1283: #3040 Remission SilentReload entfernt und Ladelogik angepasst
#3040 Remission SilentReload entfernt und Ladelogik angepasst

Related work items: #3189
2022-06-22 14:05:11 +00:00
Nino Righi
3273a21246 Merged PR 1282: #3215 Config Produktbilder Changes
#3215 Config Produktbilder Changes
2022-06-22 13:18:40 +00:00
Nino Righi
b40b61a46c Merged PR 1281: #3215 Hotfix Update Configs Production Staging
#3215 Hotfix Update Configs Production Staging
2022-06-22 12:46:57 +00:00
Nino Righi
813f611843 Merged PR 1279: #3206 Hide Supplier if Supplier Count is <= 1 and Disable Logic if click on a...
#3206 Hide Supplier if Supplier Count is <= 1 and Disable Logic if click on already activated Supplier or Source
2022-06-21 13:12:16 +00:00
Lorenz Hilpert
1abacb75be debugger entfernt 2022-06-21 15:11:31 +02:00
Lorenz Hilpert
42028a2777 #3040 Remission - Fehler bei nicht gefunden stehen 2022-06-21 15:11:07 +02:00
Lorenz Hilpert
0a25eeadbe Merged PR 1277: #3149 Process Change and Caching
#3149 Process Change and Caching
2022-06-20 15:39:00 +00:00
Lorenz Hilpert
70a4451f90 #3189 Remission - Artikel entfernen von WBS landen nicht wieder auf Remi-Liste 2022-06-20 12:21:11 +02:00
Lorenz Hilpert
d859395f50 #3160 Spelling 2022-06-20 11:44:02 +02:00
Andreas Schickinger
97948df14e Merged PR 1276: #3175 Remission kein Refresh bei Wechsel von Warenbegleitschein
#3175 Remission kein Refresh bei Wechsel von Warenbegleitschein
#3189 Remission Artikel entfernen Refresh

Related work items: #3175
2022-06-17 09:20:16 +00:00
Lorenz Hilpert
dc84efb3ef #3160 Remission - im Abteilungremission Ladeanimation ohne Filter 2022-06-15 11:26:21 +02:00
Andreas Schickinger
12676a4314 Merged PR 1275: #3179 Refactoring Remission Warenbegleitschein eröffnen Rechtschreibfehler
#3179 Refactoring Remission Warenbegleitschein eröffnen Rechtschreibfehler

Related work items: #3179
2022-06-13 14:05:18 +00:00
Lorenz Hilpert
3aafb9f8e7 #3173 Remission - Single-Selection bei Abteilungsremission - Abteilungen 2022-06-13 16:04:32 +02:00
Lorenz Hilpert
4518db2bdd Merged PR 1274: Merge Dev => Release
Related work items: #2737, #2790, #3150, #3157, #3158
2022-06-10 13:16:11 +00:00
Andreas Schickinger
2cb161b62e Merged PR 1272: #3150 Scroll Arrows in UiSlider nur anzeigen wenn Scrollbar
#3150 Scroll Arrows in UiSlider nur anzeigen wenn Scrollbar

Related work items: #3150
2022-06-10 09:22:34 +00:00
Lorenz Hilpert
9d052284be #3040 - Remission - Fehler bei nicht gefunden stehen 2022-06-10 11:21:43 +02:00
Nico Hanus
98d9029dde remove single build for develop and enabled batch trigger 2022-06-09 12:41:42 +00:00
Lorenz Hilpert
040c67215e Merged PR 1271: #3040 Remission - Fehler bei nicht gefunden stehen
#3040 Remission - Fehler bei nicht gefunden stehen
2022-06-09 11:47:42 +00:00
Andreas Schickinger
d577312b24 Merged PR 1269: #3158 UiSpinner anstatt leerer Warenkorb Meldung beim Laden
#3158 UiSpinner anstatt leerer Warenkorb Meldung beim Laden

Related work items: #3158
2022-06-09 08:54:31 +00:00
Andreas Schickinger
fa10bc9c30 Merged PR 1268: #3157 AHF Routing und Item wählen anhand OrderItemSubsetId
#3157 AHF Routing und Item wählen anhand OrderItemSubsetId

Related work items: #3157
2022-06-09 08:53:45 +00:00
Andreas Schickinger
055339956a Merged PR 1270: #2790 Benachrichtigungskanäle bei Weiter zum Warenkorb nicht überschreiben
#2790 Benachrichtigungskanäle bei Weiter zum Warenkorb nicht überschreiben, wenn der Kunde bereits ausgewhält ist

Related work items: #2790
2022-06-09 08:34:04 +00:00
Lorenz Hilpert
6cffa53ea9 #3062 Remission Footer 2022-06-08 11:21:12 +02:00
Lorenz Hilpert
fe83ef56ea Fix core-application unit tests 2022-06-07 17:12:22 +02:00
Lorenz Hilpert
abd1cacdc0 #3149 Warenausgabe kann mehrmals in einem Vorgang geöffnet werden 2022-06-07 16:49:58 +02:00
Nino Righi
85b448ab85 Merged PR 1267: #3145 Checkout Summary Changes
#3145 Bugfix Artikellink hat keinen neuen Prozess eröffnet sondern einen bestehenden überschrieben,
Wenn neue Bestellung getätigt wird, wird die alte Bestellbestätigung removed
2022-06-07 08:31:07 +00:00
Nico Hanus
5749f0018c add batching in azurepipeline
https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/azure-repos-git?view=azure-devops&tabs=yaml#batching-ci-runs
2022-06-03 11:42:43 +00:00
Lorenz Hilpert
b65d2c5ff3 #3156 Login Test 2022-06-02 11:45:08 +02:00
Lorenz Hilpert
348b2c4aca #3156 manuelles Login mit Username und Passwort nicht möglich 2022-06-02 10:55:53 +02:00
Nino Righi
dfc3f32086 Merged PR 1266: #3147 Fix IPAD 6 Styling Issue inside Availabilities Modal
#3147 Fix IPAD 6 Styling Issue inside Availabilities Modal
2022-06-02 08:26:33 +00:00
Nino Righi
68d331864d Merged PR 1264: #3145 Updated Order Checkout Process
#3145 Updated Order Checkout Process
2022-06-01 08:19:14 +00:00
Lorenz Hilpert
24a008b20d Merged PR 1263: Cleanup 2022-05-31 12:56:41 +00:00
Nino Righi
0e5c35fae4 Merged PR 1262: #3146 Slide Current Active Process Tab Into View after Activating It
#3146 Slide Current Active Process Tab Into View after Activating It
2022-05-31 08:06:08 +00:00
Nino Righi
4d4b989dcd Merged PR 1261: #3082 Improved Error Handling on PDP
#3082 Improved Error Handling on PDP
2022-05-30 15:38:59 +00:00
Andreas Schickinger
2983d5a068 Merged PR 1260: #2737 Bei Zubuchen kein Abholfachzettel ausdrucken
#2737 Bei Zubuchen kein Abholfachzettel ausdrucken

Related work items: #2737
2022-05-30 08:37:19 +00:00
Nino Righi
efdc365b90 Merged PR 1259: #3022 ISA File Caching Improvements
#3022 ISA File Caching Improvements
2022-05-27 07:51:24 +00:00
Nino Righi
c4a8e3eb96 Merged PR 1258: Merge release into develop
Merge release into develop
2022-05-25 13:48:01 +00:00
Nino Righi
8cb3c98b8d Merged PR 1256: #3133 Changed Service Worker Update Implementation to Angular v12 and Fixed U...
#3133 Changed Service Worker Update Implementation to Angular v12 and Fixed Unit Tests
2022-05-24 16:19:25 +00:00
Nino Righi
9c12eda210 #3133 Changed Service Worker Update Implementation to Angular v12 and Fixed Unit Tests 2022-05-24 18:14:58 +02:00
Lorenz Hilpert
90afcc008d Disable check for update with interval 2022-05-24 17:44:19 +02:00
Lorenz Hilpert
7409d096fe Update Check Disabled 2022-05-24 17:43:24 +02:00
Lorenz Hilpert
a4c4a3c0c8 Merged PR 1255: Merge release 2.0 into develop 2022-05-24 14:29:50 +00:00
Lorenz Hilpert
2148af7b63 Merge branch 'develop' into release/2.0 2022-05-24 16:14:19 +02:00
Andreas Schickinger
d984bc04ec Merged PR 1250: #3109 Produktbilder in der Artikeltrefferliste mit ImageId laden
#3109 Produktbilder in der Artikeltrefferliste mit ImageId laden

Related work items: #3109
2022-05-23 14:46:51 +00:00
Andreas Schickinger
1b7dfcc3ac Merged PR 1249: #3127 iPad Zoom deaktivieren
#3127 iPad Zoom deaktivieren

Related work items: #3127
2022-05-23 14:46:26 +00:00
Andreas Schickinger
c762871cce Merged PR 1248: #2877 Preisunterschied Menge wird pro Item übergeben
#2877 Preisunterschied Menge wird pro Item übergeben

Related work items: #2877
2022-05-23 09:14:24 +00:00
Andreas Schickinger
007ea92bd5 Merged PR 1247: #3128 Wareneingang Warenausgang Breadcrumb wurde nicht immer richtig aktualis...
#3128 Wareneingang Warenausgang Breadcrumb wurde nicht immer richtig aktualisiert

Related work items: #3128
2022-05-23 09:13:44 +00:00
Nino Righi
688b758da2 Merged PR 1245: #3022 Unit Test Fix
#3022 Unit Test Fix
2022-05-19 08:38:09 +00:00
Nino Righi
39147d7afa Merged PR 1244: #3022 ISA File Caching
#3022 ISA File Caching
2022-05-19 08:29:30 +00:00
Andreas Schickinger
50cc17a44b Merged PR 1243: #2877 Preisunterschied Popup: Bei Close/Backdrop Click nicht mehr die Sekundä...
#2877 Preisunterschied Popup: Bei Close/Backdrop Click nicht mehr die Sekundär Action ausführen

Related work items: #2877
2022-05-19 08:29:00 +00:00
Andreas Schickinger
73f592df74 Merged PR 1241: #3116 Bei B2B Kunden war der Weiter Button immer disabled
#3116 Bei B2B Kunden war der Weiter Button immer disabled

Related work items: #3116
2022-05-17 14:18:49 +00:00
Lorenz Hilpert
821042d8b6 App Start - leistung verbessert und statusanzeige 2022-05-17 16:17:26 +02:00
Nino Righi
7123f6cc15 Merged PR 1242: #3124 Toast Message Adjusted Width and Height Values
#3124 Toast Message Adjusted Width and Height Values
2022-05-17 12:56:36 +00:00
Andreas Schickinger
6c2e9906b0 Merged PR 1240: #3117 Prozess Scrollpfeile sollte am iPad nicht sichtbar sein
#3117 Prozess Scrollpfeile sollte am iPad nicht sichtbar sein

Related work items: #3117
2022-05-16 13:59:18 +00:00
Andreas Schickinger
37648b79c3 Merged PR 1238: #3116 Weiter Button in den Kundendetails disabled, wenn noch keine Adressen geladen wurden
#3116 Weiter Button in den Kundendetails disabled, wenn noch keine Adressen geladen wurden

Related work items: #3116
2022-05-16 13:55:06 +00:00
Nino Righi
6b00c2c81a Merged PR 1239: #3093 ISA Offline Message Fix
#3093 ISA Offline Message Fix#3093 ISA Offline Message Fix
2022-05-16 13:24:22 +00:00
Andreas Schickinger
cd5599ff1c Merged PR 1237: #2981 Preisunterschied Action und Popup
#2981 Preisunterschied Action und Popup

Related work items: #2877, #2981
2022-05-16 09:51:40 +00:00
Andreas Schickinger
e870eb241b Merged PR 1236: #3122 Warenausgabe Endpoints angepasst
#3122 Warenausgabe Endpoints angepasst

Related work items: #3122
2022-05-16 09:32:52 +00:00
Andreas Schickinger
fbf8c282e8 Merged PR 1235: #3108 Remission Remi Grund nur anzeigen, wenn vor dem remittieren schon vorha...
#3108 Remission Remi Grund nur anzeigen, wenn vor dem remittieren schon vorhanden

Related work items: #3108
2022-05-16 08:19:23 +00:00
Nico Hanus
811e363dd4 increase cpu and ram limits for better performance 2022-05-13 10:55:36 +02:00
Nino Righi
d206ba1606 Merged PR 1234: #3118 Fixed Process nummeration
#3118 Fixed Process nummeration
2022-05-12 14:56:23 +00:00
Nino Righi
c529134cd2 Merged PR 1233: #3093 Improved Offline Handling
#3093 Improved Offline Handling
2022-05-12 14:21:43 +00:00
Andreas Schickinger
dafb1d335e Merged PR 1232: #3113 Bei Klick auf Abbrechen auf der Login Seite erneut zur Login Seite leiten
#3113 Bei Klick auf Abbrechen auf der Login Seite erneut zur Login Seite leiten

Related work items: #3113
2022-05-12 12:48:37 +00:00
Nino Righi
445899e731 Merged PR 1231: #3115 Fix WE WA Multi Search Request
#3115 Fix WE WA Multi Search Request
2022-05-12 08:18:05 +00:00
Andreas Schickinger
b21fbc974c Merged PR 1230: #2995 Kundensuche doppelter Request im Filter behoben
#2995 Kundensuche doppelter Request im Filter behoben

Related work items: #2995
2022-05-11 15:14:29 +00:00
Andreas Schickinger
4c98a73204 Merged PR 1229: #3108 Remission Restmenge nach dem remittieren angepasst
#3108 Remission Restmenge nach dem remittieren angepasst

Related work items: #3108
2022-05-11 14:41:08 +00:00
Nino Righi
e99d669086 Merged PR 1228: #3104 Improved Error Handling of Removing Items from Shipping Document
#3104 Improved Error Handling of Removing Items from Shipping Document
2022-05-10 15:12:34 +00:00
Andreas Schickinger
913ffbda97 Merged PR 1227: #1058 Remission abschließen Breadcrumb wird entfernt
#1058 Remission abschließen Breadcrumb wird entfernt

Related work items: #1058
2022-05-10 13:31:26 +00:00
Nino Righi
ec2bd0bd5d Merged PR 1226: #3061 Remission List Performance
#3061 Remission List Performance
2022-05-09 15:31:47 +00:00
Andreas Schickinger
08fefb1c4b Merged PR 1225: #3094 Remission mehrfach abschließen Fehlermeldung angepasst
#3094 Remission mehrfach abschließen Fehlermeldung angepasst

Related work items: #3094
2022-05-09 15:18:36 +00:00
Andreas Schickinger
e7f20bc553 Merged PR 1224: #3088 Remission Fehlermeldung bei gleichzeitigem entfernen und Liste Reload a...
#3088 Remission Fehlermeldung bei gleichzeitigem entfernen und Liste Reload auch bei Fehler

Related work items: #3088
2022-05-09 15:17:39 +00:00
Andreas Schickinger
f5993ca5c4 Merged PR 1223: #3087 Bei Error Status 409 Custom Fehlermeldung und Liste auch bei Fehler neu...
#3087 Bei Error Status 409 Custom Fehlermeldung und Liste auch bei Fehler neu laden

Related work items: #3087
2022-05-09 15:17:15 +00:00
Nino Righi
9f0c81c20f Merged PR 1215: #3062 #3051 Remission Breadcrumbs contain the correct queryParams, Remission Process Remembers Filters if Remission is started
#3062 #3051 Remission Breadcrumbs contain the correct queryParams, Remission Process Remembers Filters if Remission is started. Always load available Remission
2022-05-09 11:41:50 +00:00
Nino Righi
42199c8cda Merged PR 1222: #3097 #3089 Shell Process Tabs UI Changes
#3097 #3089 Shell Process Tabs UI Changes
2022-05-09 10:02:51 +00:00
Nino Righi
bc525fbffc Merged PR 1218: #3067 #3056 #2685 Toast Notifications
#3067 #3056 #2685 Toast Notifications
2022-05-09 09:45:54 +00:00
Nino Righi
dd6821642f Merged PR 1220: #3092 Remission Empty List Message
#3092 Remission Empty List Message
2022-05-09 09:43:20 +00:00
Nino Righi
b2dd96f044 Merged PR 1219: #3041 If no supplier selected inside create remission, Blank gets selected an...
#3041 If no supplier selected inside create remission, Blank gets selected and changed navigation inside goods in remission preview
2022-05-09 09:33:49 +00:00
Nino Righi
0ca8a1fabf Merged PR 1221: #3095 Remission Disable Remit Button if Quantity < 1
#3095 Remission Disable Remit Button if Quantity < 1
2022-05-09 09:23:14 +00:00
Nino Righi
d46643cf8c Merged PR 1217: #3084 Remission Added Loader to WBS on deleting Items
#3084 Remission Added Loader to WBS on deleting Items
2022-05-09 08:59:59 +00:00
Nino Righi
fc3bea28e8 Merged PR 1216: #2967 Remission Remit PopUp Wording Fix
#2967 Remission Remit PopUp Wording Fix
2022-05-09 08:57:05 +00:00
Nino Righi
b29323864e Updated Isa-App Config Files 2022-05-03 11:38:41 +02:00
Michael Auer
c4cad5d56f Merge branch 'develop' into release/2.0 2022-05-03 10:52:36 +02:00
Nino Righi
1d83c82919 Merged PR 1214: #3083 Adjusted File Memory Budgets for Production Build
#3083 Adjusted File Memory Budgets for Production Build
2022-05-02 12:05:51 +00:00
Andreas Schickinger
1228698fcf Merged PR 1212: #3069 Fehlende Icons in der Remission
#3069 Fehlende Icons in der Remission

Related work items: #3069
2022-05-02 08:26:38 +00:00
Andreas Schickinger
d1eba5f1e2 Merged PR 1213: #2575 AHF Remi Buttons
#2575 AHF Remi Buttons

Related work items: #2575
2022-05-02 08:24:20 +00:00
Michael Auer
08ac71dc1b Merge tag '1.7' into develop 2022-05-02 10:10:39 +02:00
Michael Auer
da579ecc3a Merge branch 'release/1.7' 2022-05-02 09:37:27 +02:00
Andreas Schickinger
f286dd1e1b Merged PR 1211: #3080 Bei Remittieren mit Menge 0 wird nun "Nicht gefunden" ausgelöst
#3080 Bei Remittieren mit Menge 0 wird nun "Nicht gefunden" ausgelöst

Related work items: #3080
2022-04-28 14:39:28 +00:00
Nino Righi
0c5aedfee8 Merged PR 1210: #3081 #3051 Remember Filter Settings on continuing Remission and Remission start
#3081 #3051 Remember Filter Settings on continuing Remission and Remission start
2022-04-28 14:24:24 +00:00
Andreas Schickinger
b7d7c88fc6 Merged PR 1209: #3069 Fehlende Icons hinzugefügt. Anzeige nur, wenn Icon vorhanden
#3069 Fehlende Icons hinzugefügt. Anzeige nur, wenn Icon vorhanden

Related work items: #3069
2022-04-28 14:12:29 +00:00
Nico Hanus
8c2671e2fb limit unittests build for develop 2022-04-28 14:08:29 +00:00
Nico Hanus
b281f7c25b limit builds for develop branch 2022-04-28 13:59:47 +00:00
Nino Righi
750caa522e Merged PR 1208: #3074 Added Spacer inside WBS View
#3074 Added Spacer inside WBS View
2022-04-28 12:56:45 +00:00
Nino Righi
62ed8affb1 Merged PR 1207: #3076 Changed PopUp Wording and Form Validation Error Message
#3076 Changed PopUp Wording and Form Validation Error Message
2022-04-28 12:33:18 +00:00
Nino Righi
92e0e90120 Merged PR 1206: #3075 Remission Option to open Filter Overlay during a search
#3075 Remission Option to open Filter Overlay during a search
2022-04-28 12:32:33 +00:00
Andreas Schickinger
9b0dea213e Merged PR 1205: #3070 TK Fotoabschluss Spinner
#3070 TK Fotoabschluss Spinner

Related work items: #3070
2022-04-28 11:56:13 +00:00
Andreas Schickinger
a73acfa4e8 Merged PR 1204: #3063 Remission unnötiger Return Aufruf bei Wechsel zu gestarteter Remi über...
#3063 Remission unnötiger Return Aufruf bei Wechsel zu gestarteter Remi über den Footer

Related work items: #3063
2022-04-28 11:55:44 +00:00
Nino Righi
833542f303 Merged PR 1203: #3062 Clear Items Cache If Navigate to Remission
#3062 Clear Items Cache If Navigate to Remission
2022-04-27 14:05:53 +00:00
Nino Righi
b666e4b38c Merged PR 1202: #3051 Fix Remission Routing after Remission Completed
#3051 Fix Remission Routing after Remission Completed
2022-04-27 13:51:21 +00:00
Nino Righi
32f2fd0754 Merged PR 1201: #3058 Fix Show Start Remission CTA only if Hits > 0
#3058 Fix Show Start Remission CTA only if Hits > 0
2022-04-27 12:41:15 +00:00
Nino Righi
04cd5e9437 Merged PR 1196: #3028 #3040 #3049 Bugfixes Remission
#3028 #3040 #3049 Bugfixes Remission
2022-04-27 10:53:48 +00:00
Nino Righi
3785ad614f Merged PR 1200: #3050 Customer Online Email Adress Validation Fix
#3050 Customer Online Email Adress Validation Fix
2022-04-27 10:39:01 +00:00
Nino Righi
4e9b4064a6 Merged PR 1199: #3053 Fix Reservieren In Andere Filiale
#3053 Fix Reservieren In Andere Filiale
2022-04-27 09:45:06 +00:00
Nino Righi
319d8b96bb Merged PR 1197: #3054 Hotfix Release 1.7 TK PDF Viewer Removed Zoom Scaling to fit the page c...
#3054 Hotfix Release 1.7 TK PDF Viewer Removed Zoom Scaling to fit the page correctly
2022-04-26 13:58:02 +00:00
Nino Righi
272824e236 Merged PR 1198: #3036 Fix NativeContainer
#3036 Fix NativeContainer
2022-04-26 13:31:18 +00:00
Nino Righi
4b3e80cadb #3036 Added Try Catch 2022-04-26 15:27:31 +02:00
Nino Righi
f6675b67e8 #3036 Fix NativeContainer 2022-04-26 15:22:24 +02:00
Nino Righi
6974324c9b #3054 Hotfix Release 1.7 TK PDF Viewer Removed Zoom Scaling to fit the page correctly 2022-04-26 14:21:39 +02:00
Andreas Schickinger
c805106759 Merged PR 1194: #2774 AHF Coveranzeige Abfrage ohne alle Filialen und Archiv
#2774 AHF Coveranzeige Abfrage ohne alle Filialen und Archiv

Related work items: #2774
2022-04-25 10:55:49 +00:00
Andreas Schickinger
5448ac034b Merged PR 1195: #3049 Remission beim Wechsel zwischen Remi Liste und Warenbegleitscheine blei...
#3049 Remission beim Wechsel zwischen Remi Liste und Warenbegleitscheine bleiben die Filter erhalten

Related work items: #3049
2022-04-25 10:55:10 +00:00
Nino Righi
79667ae4b6 Merged PR 1192: #2983 Remission List Trigger Loading instantly After Filter, Source or Suppli...
#2983 Remission List Trigger Loading instantly After Filter, Source or Supplier changes
2022-04-22 08:26:37 +00:00
Andreas Schickinger
336a98e576 Merged PR 1193: #3035 AHF Coveranzeige Refresh bei Statuswechsel
#3035 AHF Coveranzeige Refresh bei Statuswechsel

Related work items: #3035
2022-04-21 13:41:46 +00:00
Andreas Schickinger
4e4dc47ad6 Merged PR 1190: #3024 Links in der Bestellbestätigung verwenden nicht die aktive Prozess ID
#3024 Links in der Bestellbestätigung verwenden nicht die aktive Prozess ID

Related work items: #3024
2022-04-21 13:40:46 +00:00
Andreas Schickinger
ee02e89fa7 Merged PR 1191: #3030 AHF Zubuchen - letzter Zusatz wird übernommen
#3030 AHF Zubuchen - letzter Zusatz wird übernommen

Related work items: #3030
2022-04-21 13:35:28 +00:00
Nino Righi
7e6f5a7837 Merged PR 1189: #2982 Remission Resul List Design Changes
#2982 Remission Resul List Design Changes
2022-04-21 12:54:05 +00:00
Nino Righi
7b824bd13b Merged PR 1188: #3033 Check if Process is available
#3033 Check if Process is available
2022-04-21 12:51:37 +00:00
Andreas Schickinger
146ad7b20a Merged PR 1186: #3032 AHF Routing Fix
#3032 AHF Routing Fix

Related work items: #3032
2022-04-20 16:54:11 +00:00
Nino Righi
f657a088d4 Merged PR 1185: #2982 #2983 #3028 #3031 Remission Liste Caching, Scrollposition, Loader, Virtual Scroll Viewport
#2982 #2983 #3028 #3031 Remission Liste Caching, Scrollposition, Loader, Virtual Scroll Viewport
2022-04-20 16:36:27 +00:00
Nino Righi
c4ed8d0648 Merged PR 1187: #3033 Fix TK Article List Search Routing and changed EAN Copy Seperator
#3033 Fix TK Article List Search Routing and changed EAN Copy Seperator
2022-04-20 14:24:01 +00:00
Andreas Schickinger
810a7d0a8f Merged PR 1184: #2992 TK PDF Viewer kein horizontales Scrollen von Hochformat Dokumenten auf...
#2992 TK PDF Viewer kein horizontales Scrollen von Hochformat Dokumenten auf dem iPad

Related work items: #2992
2022-04-19 13:46:41 +00:00
Andreas Schickinger
25d5f183c5 Merged PR 1183: #3030 AHF Zubuchen mit Zusatz
#3030 AHF Zubuchen mit Zusatz

Related work items: #3030
2022-04-19 13:32:04 +00:00
Andreas Schickinger
9052fe25db Merged PR 1182: #2756 WE WA Edit Anmerkungsfeld mehrzeilig
#2756 WE WA Edit Anmerkungsfeld mehrzeilig

Related work items: #2756
2022-04-14 08:26:45 +00:00
Andreas Schickinger
776115fbed Merged PR 1181: #3023 Remission Required Capacities Department wird mitgegeben
#3023 Remission Required Capacities Department wird mitgegeben

Related work items: #3023
2022-04-13 15:29:13 +00:00
Andreas Schickinger
962f0bc2c6 Merged PR 1180: #3005 AHF Zubuchen innerhalb einer Kundennummer
#3005 AHF Zubuchen innerhalb einer Kundennummer

Related work items: #3005
2022-04-12 15:36:44 +00:00
Lorenz Hilpert
c184df717d #3021 - Remission offene WBS werden nicht angezeigt 2022-04-12 16:07:38 +02:00
Lorenz Hilpert
26a7348d25 Dashboard Styling 2022-04-12 14:55:59 +02:00
Lorenz Hilpert
cf5052cbe5 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2022-04-12 14:48:02 +02:00
Lorenz Hilpert
be848123a1 Dashboard Product Navigation 2022-04-12 14:47:53 +02:00
Lorenz Hilpert
04232b85a7 Dasboard Product Navigation 2022-04-12 14:47:39 +02:00
Nino Righi
09bb84c34e Merged PR 1173: #2992 TK Fix PDF Viewer Content Sizing on Mobile
#2992 TK Fix PDF Viewer Content Sizing on Mobile
2022-04-12 08:21:36 +00:00
Lorenz Hilpert
4449992442 Scanner Fix Test 2022-04-11 17:06:45 +02:00
Andreas Schickinger
39c40f2e13 Merged PR 1179: #2742 AHF Zubuchen Button mit Zusatz anzeigen
#2742 AHF Zubuchen Button mit Zusatz anzeigen

Related work items: #2742
2022-04-11 13:37:50 +00:00
Nino Righi
9813575584 Merged PR 1178: #3004 Fix Ui Slider Show Scroll Arrow
#3004 Fix Ui Slider Show Scroll Arrow
2022-04-11 13:35:53 +00:00
Andreas Schickinger
b0af718cbc Merged PR 1176: #3001 Remission Grund Dropdown über Popup legen
#3001 Remission Grund Dropdown über Popup legen

Related work items: #3001
2022-04-11 06:53:51 +00:00
Andreas Schickinger
550544cbe4 Merged PR 1177: #972 Vorgang schließen Styling angepasst und Rechtschreibfehler behoben
#972 Vorgang schließen Styling angepasst und Rechtschreibfehler behoben

Related work items: #972
2022-04-11 06:53:22 +00:00
Andreas Schickinger
3ec3cf0e5b Merged PR 1175: Merge release in develop
Merge release in develop

Related work items: #2666, #2927, #2928, #2979, #2996
2022-04-07 14:06:57 +00:00
Nino Righi
0b79464e52 Merged PR 1174: #2999 Fix Customer Search Box Display Hint
#2999 Fix Customer Search Box Display Hint
2022-04-07 14:05:10 +00:00
Andreas Schickinger
a1642c5749 Merged PR 1172: #2996 Hotfix Listenbestellung Checkboxen bei Filialwechsel
#2996 Hotfix Listenbestellung Checkboxen bei Filialwechsel

Related work items: #2996
2022-04-06 16:22:41 +00:00
Andreas Schickinger
148aab1495 Merged PR 1171: #2928 Listenbestellung Download CanAdd Prüfung
#2928 Listenbestellung Download CanAdd Prüfung

Related work items: #2928
2022-04-06 14:18:20 +00:00
Lorenz Hilpert
2f78f2685f Prozessid aus Navigation für Artikelsuche und Kunden entfernt 2022-04-06 15:59:30 +02:00
Nino Righi
6dde5682a9 Merged PR 1170: #2995 Build Error Fix
#2995 Build Error Fix
2022-04-06 11:59:57 +00:00
Lorenz Hilpert
af8a3d89af Merged PR 1167: #2989 Scanner Refactoring
#2989  Scanner Refactoring
2022-04-06 10:18:20 +00:00
Lorenz Hilpert
ec97d1e84a CI Fix 2022-04-06 11:12:36 +02:00
Lorenz Hilpert
eea412abd3 #2993 WA WE - ORD: in Breadcrumb 2022-04-06 09:58:03 +02:00
Nino Righi
cf65ba3e6b Merged PR 1168: #2988 Fix Remission Close Add Product Modal if quantity changed to 0
#2988 Fix Remission Close Add Product Modal if quantity changed to 0
2022-04-06 07:39:00 +00:00
Nino Righi
3d4445bb46 Merged PR 1169: #2990 Fix Customer Search Cache Filter Settings
#2990 Fix Customer Search Cache Filter Settings
2022-04-06 07:37:12 +00:00
Andreas Schickinger
94753ceac4 Merged PR 1166: #2666 Hotfix Listenbestellung CanAddItems angepasst
#2666 Hotfix Listenbestellung CanAddItems angepasst

Related work items: #2666
2022-04-05 15:12:34 +00:00
Nino Righi
af16542ce5 Merged PR 1165: #2971 Fix Remission unique WBS
#2971 Fix Remission unique WBS
2022-04-05 15:12:08 +00:00
Lorenz Hilpert
e4c82441b8 #2987 Remission - Fehler bei Artikel hinzufügen 2022-04-05 16:05:00 +02:00
Lorenz Hilpert
8783802483 #1025 Schatten um Action-Button 2022-04-05 08:45:37 +02:00
Nino Righi
8ad28a16b0 Merged PR 1164: #2974 Fix CanSetCustomer - Customer Search Setting Filter from Route
#2974 Fix CanSetCustomer - Customer Search Setting Filter from Route
2022-04-04 16:14:21 +00:00
Andreas Schickinger
f9403649e6 Merged PR 1163: #626 Remission Hinweis Farbe bei Artikel hinzufügen
#626 Remission Hinweis Farbe bei Artikel hinzufügen

Related work items: #626
2022-04-04 15:51:18 +00:00
Andreas Schickinger
698af2ecc3 Merged PR 1162: #2666 Listenbestellung Sichtbarkeit der Radio-Buttons angepasst
#2666 Listenbestellung Sichtbarkeit der Radio-Buttons angepasst

Related work items: #2666
2022-04-04 14:39:53 +00:00
Nino Righi
c92649a8d4 Merged PR 1157: #2977 Fix Clear Cart after Process gets closed and reopened via Footer Proces...
#2977 Fix Clear Cart after Process gets closed and reopened via Footer Process generation
2022-04-04 12:30:41 +00:00
Nino Righi
dfd1847a2d Merged PR 1160: #2984 Added Card Feature To Navigation
#2984 Added Card Feature To Navigation
2022-04-04 12:30:03 +00:00
Andreas Schickinger
eeaafec80a Merged PR 1161: #2979 Hotfix Listenbestellung Fehlermeldung und Anpassungen
#2979 Listenbestellung Fehlermeldung und Anpassungen

Related work items: #2979
2022-04-04 12:19:37 +00:00
Nino Righi
896e91d4d9 Merged PR 1159: #2954 Fix Remission Result List no longer horizontally scrollable
#2954 Fix Remission Result List no longer horizontally scrollable
2022-04-04 11:46:06 +00:00
Nino Righi
d6507b428f Merged PR 1158: #2976 Added Option to Reset Filter Settings to TK, Customer and Remission Area
#2976 Added Option to Reset Filter Settings to TK, Customer and Remission Area
2022-04-04 11:44:39 +00:00
Lorenz Hilpert
6ff4d204c2 #2962 IPAd Login Fix 2022-04-04 13:43:17 +02:00
Nino Righi
8145436d1d Merged PR 1156: #2972 Fix Remission Start Remission Popup Updated if supplier is ZL
#2972 Fix Remission Start Remission Popup Updated if supplier is ZL
2022-03-30 11:34:09 +00:00
Nino Righi
25f22b46c5 Merged PR 1155: #2967 Fix Remission Placementtype Wording inside remit Popup
#2967 Fix Remission Placementtype Wording inside remit Popup
2022-03-30 11:33:42 +00:00
Nino Righi
558d846812 Merged PR 1154: #2969 Fix Remission IPAD Scan Popup Navigation
#2969 Fix Remission IPAD Scan Popup Navigation
2022-03-30 10:37:48 +00:00
Nino Righi
05916031ad Merged PR 1153: #2970 Fix Remission Display CTAs on List Elements
#2970 Fix Remission Display CTAs on List Elements
2022-03-30 10:08:51 +00:00
Andreas Schickinger
ffad6aa939 Merged PR 1152: #2755 OLA Nachbestellen Grund
#2755 OLA Nachbestellen Grund

Related work items: #2755
2022-03-30 10:02:35 +00:00
Nino Righi
cb22a39ffc Merged PR 1151: #2912 Ipad Reset Focus Changes
#2912 Ipad Reset Focus Changes
2022-03-29 16:21:20 +00:00
Nino Righi
c6130dcffb Merged PR 1150: #2912 Focus
#2912 Focus
2022-03-29 15:49:30 +00:00
Nino Righi
c9f4143204 Merged PR 1149: #2912 IPADs Fix Autofocus Searchbox
#2912 IPADs Fix Autofocus Searchbox
2022-03-29 15:19:11 +00:00
Nino Righi
fa0e1d7d60 Merged PR 1148: Code auskommentiert der zur Anmelde Dauerschleife auf den Ipads führt
Code auskommentiert der zur Anmelde Dauerschleife auf den Ipads führt
2022-03-29 15:04:09 +00:00
Andreas Schickinger
621b545e34 Merged PR 1143: #2666 Hotfix Listenbestellung Hindernismeldung
#2666 Hotfix Listenbestellung Hindernismeldung

Related work items: #2666, #2927
2022-03-29 14:59:34 +00:00
Nino Righi
53e3d90064 Merged PR 1147: #2962 #2956 Ipad Keycard Login Fix
#2962 #2956 Ipad Keycard Login Fix
2022-03-29 14:09:44 +00:00
Nino Righi
c175826fd3 Merged PR 1146: #2962 Keycard Ipad Login Fix
#2962 Keycard Ipad Login Fix
2022-03-29 13:42:20 +00:00
Nino Righi
c6b584d637 Merged PR 1145: #2962 Fix Keycard
#2962 Fix Keycard
2022-03-29 13:26:54 +00:00
Nino Righi
d992ce87a9 Merged PR 1144: #2962 Keycard Login Fix
#2962 Keycard Login Fix
2022-03-29 13:11:25 +00:00
Nino Righi
a87072e542 Merged PR 1142: #2962 Zwischencommit
#2962 Zwischencommit
2022-03-29 12:32:54 +00:00
Nino Righi
eff0388b8f Merged PR 1141: #2962 2956 Keycard Login IPAD Fix
#2962 2956 Keycard Login IPAD Fix
2022-03-29 12:02:34 +00:00
Nino Righi
9c517810ba Merged PR 1140: #2963 Remission Close Filter Overlay After Hitting Apply Filter Settings
#2963 Remission Close Filter Overlay After Hitting Apply Filter Settings
2022-03-29 11:21:47 +00:00
Nino Righi
882cbddec0 Merged PR 1139: #2912 Autofocus on Input
#2912 Autofocus on Input
2022-03-28 16:03:54 +00:00
Nino Righi
d188272cbf Merged PR 1138: #2912 setTimeout on focus event
#2912 setTimeout on focus event
2022-03-28 15:46:44 +00:00
Nino Righi
72b3688365 Merged PR 1137: #2951 Fix Scanner PopUp
#2951 Fix Scanner PopUp
2022-03-28 14:48:35 +00:00
Andreas Schickinger
0f81914875 Merged PR 1135: #2774 AHF Cover Zusatz
#2774 AHF Cover Zusatz

Related work items: #2774
2022-03-28 13:04:37 +00:00
Nino Righi
e8e895d7b1 Merged PR 1136: #2951 Updated Test Config files and disabled login scanner popup
#2951 Updated Test Config files and disabled login scanner popup
2022-03-28 12:44:59 +00:00
Nino Righi
f0cc76f180 Merged PR 1134: Merge ISA 2.0 into Develop
Merge ISA 2.0 into Develop

Related work items: #1098, #2592, #2630, #2633, #2635, #2639, #2706, #2707, #2813, #2818, #2825, #2843, #2846, #2847, #2848, #2851, #2852, #2853, #2897, #2900
2022-03-28 10:12:12 +00:00
Lorenz Hilpert
91b3f44c1e Merge branch 'release/1.7' into develop 2022-03-28 09:14:12 +08:00
Lorenz Hilpert
43859599f0 Merge branch 'develop' into release/1.7 2022-03-28 09:13:33 +08:00
Andreas Schickinger
4dff0b1e6a Merged PR 1133: #2931 DIG Lieferzeitfenster Punkt fehlt
#2931 DIG Lieferzeitfenster Punkt fehlt

Related work items: #2931
2022-03-25 09:44:33 +00:00
Andreas Schickinger
f5fcee4e4a Merged PR 1132: Merge release in develop
Merge release in develop

Related work items: #2756, #2864, #2872, #2878, #2889, #2890, #2901, #2903, #2904, #2910
2022-03-24 13:21:09 +00:00
Andreas Schickinger
9ffb0b9a97 Merged PR 1131: Merge develop in release
Merge develop in release

Related work items: #2756, #2901, #2903, #2904, #2910
2022-03-24 13:06:34 +00:00
Andreas Schickinger
34698aca5e Merged PR 1130: #2910 Listenbestellung WK iPad Layout
#2910 Listenbestellung WK iPad Layout

Related work items: #2910
2022-03-23 12:57:13 +00:00
Lorenz Hilpert
4fcf9fabbf #2915 Trefferliste - klickbarer Bereich um Bullet-Checkbox 2022-03-23 20:09:47 +08:00
Nino Righi
fd907cf0cc Merged PR 1128: #2921 Listenbestellung B2B Orders Fix availabilities null for canAdd Request
#2921 Listenbestellung B2B Orders Fix availabilities null for canAdd Request
2022-03-23 11:49:34 +00:00
Nino Righi
cb543c7c98 Merged PR 1129: #2054 Checkout Summary Enable Print Button on B2B Order
#2054 Checkout Summary Enable Print Button on B2B Order
2022-03-23 11:44:09 +00:00
Andreas Schickinger
02ee730080 Merged PR 1126: #2901 Listenbestellung Sortierung
#2901 Listenbestellung Sortierung

Related work items: #2901
2022-03-22 14:25:55 +00:00
Nino Righi
5cccc5fedd Merged PR 1125: #2911 Bugfix Cart Font Size on Action CTAs
#2911 Bugfix Cart Font Size on Action CTAs
2022-03-21 17:33:55 +00:00
Andreas Schickinger
9b6f4d1ecf Merged PR 1124: #2756 Anmerkungsfeld mehrzeilig
#2756 Anmerkungsfeld mehrzeilig

Related work items: #2756
2022-03-21 16:57:15 +00:00
Nino Righi
022e8e9e73 Merged PR 1121: #2744 WA WE Order Item Details Display ssc and sscText
#2744 WA WE Order Item Details Display ssc and sscText
2022-03-21 14:43:07 +00:00
Andreas Schickinger
a81581e67f Merged PR 1119: #2904 Listenbestellung ipad 6 Mengen Dropdown Styling
#2904 Listenbestellung ipad 6 Mengen Dropdown Styling

Related work items: #2904
2022-03-21 12:58:25 +00:00
Andreas Schickinger
5823f57e03 Merged PR 1118: #2903 Listenbestellung Preis verschwindet bei Mengenänderung
#2903 Listenbestellung Preis verschwindet bei Mengenänderung

Related work items: #2903
2022-03-21 12:54:50 +00:00
Nico Hanus
96f2233421 add resource limits to helm files 2022-03-18 14:01:32 +01:00
Andreas Schickinger
ac1a772b21 Merged PR 1116: Merge develop into release/1.7
Merge develop into release

Related work items: #2864, #2872, #2878, #2889, #2890
2022-03-18 11:39:56 +00:00
Andreas Schickinger
04851dbe39 Merged PR 1114: #2890 Listenbestellung ipad Anpassungen
#2890 Listenbestellung ipad Anpassungen

Related work items: #2890
2022-03-17 14:44:56 +00:00
Andreas Schickinger
29181469db Merged PR 1113: #2872 Listenbestellung Warenkorb Abhol- und Lieferdatum anzeigen
#2872 Listenbestellung Warenkorb Abhol- und Lieferdatum anzeigen

Related work items: #2872
2022-03-17 13:13:39 +00:00
Andreas Schickinger
cb447e13f9 Merged PR 1112: #2889 Listenbestellung weitere ipad fixes
#2889 Listenbestellung weitere ipad fixes

Related work items: #2889
2022-03-17 12:27:52 +00:00
Andreas Schickinger
04a3b1767a Merged PR 1111: Listenbestellung ipad Modal Layout
Listenbestellung ipad Modal Layout
2022-03-17 10:59:51 +00:00
Andreas Schickinger
20f1a5c77e Merged PR 1110: #2878 Listenbestellung Bugfix endlos Loading, Spinner bei Übernehmen, Caching...
#2878 Listenbestellung Bugfix endlos Loading, Spinner bei Übernehmen, Caching für Logistician Request

Related work items: #2878
2022-03-16 16:36:37 +00:00
Andreas Schickinger
c979b48592 Merged PR 1108: #2846 Bei requestStatusCode 32 wird nun altAt angezeigt
#2846 Bei requestStatusCode 32 wird nun altAt angezeigt

Related work items: #2864
2022-03-15 17:09:45 +00:00
Michael Auer
88ebc39d65 Merge tag '1.6' into develop 2022-03-15 17:05:53 +01:00
Michael Auer
9aa3820e95 Merge branch 'release/1.6' 2022-03-15 17:05:46 +01:00
Andreas Schickinger
722ed6ade6 Merged PR 1105: #2773 Listenbestellung derzeit nicht bestellbar Farbe angepasst
#2773 Listenbestellung derzeit nicht Bestellbar Farbe angepasst

Related work items: #2773
2022-03-15 10:17:02 +00:00
Andreas Schickinger
8f7448a095 Merged PR 1102: #2643 DIG Lieferzeitfenster Kaufoptionen
#2643 DIG Lieferzeitfenster Kaufoptionen

Related work items: #2643
2022-03-15 10:12:22 +00:00
Andreas Schickinger
5e9b3b56d4 Merged PR 1101: #2843 Listenbestellung Autorenlink schwarz
#2843 Listenbestellung Autorenlink schwarz

Related work items: #2843
2022-03-15 09:48:19 +00:00
Andreas Schickinger
95656b20d7 Merged PR 1103: #2793 Listenbestellung QuantityDropdown für Rücklage begrenzen
#2793 Listenbestellung QuantityDropdown für Rücklage begrenzen

Related work items: #2793
2022-03-15 09:45:21 +00:00
Andreas Schickinger
12fe8b46c3 Merged PR 1104: #2662 Listenbestellung Download OLA im Warenkorb bei Bestellen Klick
#2662 Listenbestellung Download OLA im Warenkorb bei Bestellen Klick

Related work items: #2662
2022-03-15 09:00:12 +00:00
Nino Righi
92958f4b22 Merged PR 1097: #2782 TK Remove Color Indicator inside Calendar and List View for Items with...
#2782 TK Remove Color Indicator inside Calendar and List View for Items with an Updated Item
2022-03-10 14:39:50 +00:00
Andreas Schickinger
05a3bbef7a Merged PR 1096: #2843 Listenbestellung Warenkorb Verlinkung für Artikeldetails und Autorsuche
#2843 Listenbestellung Warenkorb Verlinkung für Artikeldetails und Autorsuche

Related work items: #2843
2022-03-10 14:33:15 +00:00
Nino Righi
03467fcb83 Merged PR 1091: #2841 TK removed hours and minutes inside task info taskDate range
#2841 TK removed hours and minutes inside task info taskDate range
2022-03-09 13:29:03 +00:00
Nino Righi
e96c98e344 Merged PR 1089: #2796 #2795 List Order Changed Order of displayed purchasing options and show...
#2796 #2795 List Order Changed Order of displayed purchasing options and show instock if take away is available
2022-03-08 14:08:49 +00:00
Michael Auer
c660c5626d ~ Version Bump: 1.7 2022-03-08 14:18:57 +01:00
Nino Righi
b443c7a5de Merged PR 1088: Merge Listenbestellung into Develop
Merge Listenbestellung into Develop

Related work items: #2560, #2655, #2656, #2699, #2745, #2746, #2747, #2749, #2752, #2760, #2789
2022-03-08 12:25:32 +00:00
Lorenz Hilpert
578f3fee7a Merge branch 'release/1.6' into develop 2022-03-01 10:45:56 +01:00
Lorenz Hilpert
caddcd0e2b Merge branch 'develop' into release/1.6 2022-03-01 10:45:02 +01:00
Michael Auer
cce810d4e3 ~ Version Bump: 1.6 2022-03-01 10:27:31 +01:00
Lorenz Hilpert
2f060e6209 #2783 Nullabfrage auf quantity 2022-02-28 17:25:06 +01:00
Lorenz Hilpert
df94c1ab59 #2783 Teilabholung - mehrere Exemplare von einem Artikel nicht nacheinander abholbar 2022-02-28 13:15:22 +01:00
Nino Righi
9c2ed96331 Merged PR 1075: #2729 Article Details Show Archiv Article Badge with matching text if article...
#2729 Article Details Show Archiv Article Badge with matching text if article is Available or not
2022-02-24 17:45:49 +00:00
Andreas Schickinger
b462e39a51 Merged PR 1073: #2628 HFI Lieferschein drucken
#2628 HFI Lieferschein drucken

Related work items: #2628
2022-02-23 14:01:36 +00:00
Nino Righi
8340649292 Merged PR 1059: #2733 Bugfix WK Notification, select checkbox SMS after input of mobilenumber
#2733 Bugfix WK Notification, select checkbox SMS after input of mobilenumber
2022-02-17 17:02:18 +00:00
Nino Righi
1d2df695d3 Merged PR 1056: #2696 Upgrade of p4mUser is now possible
#2696 Upgrade of p4mUser is now possible
2022-02-15 00:26:58 +00:00
Nino Righi
f46ef394d9 Merged PR 1054: #2671 Article Negative Price
#2671 Article Negative Price
2022-02-15 00:24:11 +00:00
Nino Righi
fcf016ea85 Merged PR 1053: #2689 Take RetailPrice if no catalog Price available for take-away option. Sh...
#2689 Take RetailPrice if no catalog Price available for take-away option. Show RetailPrice in Article Details View for the same case
2022-02-15 00:23:09 +00:00
Andreas Schickinger
e2ebba9f9f Merged PR 1051: #2668 Hotfix - Kubi leere Trefferliste bei Dialog
#2668 Hotfix - Kubi leere Trefferliste bei Dialog

Related work items: #2668
2022-02-09 16:20:57 +00:00
Nino Righi
d9460df0ca Merged PR 1045: #2688 WK Updated Show Custom Price Function
#2688 WK Updated Show Custom Price Function
2022-02-08 14:40:05 +00:00
Nino Righi
9d988e18be Merged PR 1044: #2604 ipad detection
#2604 ipad detection
2022-02-07 17:02:56 +00:00
Nino Righi
949ee7da6e Merged PR 1043: #2604 Hotfix ipad mini 6 detection
#2604 Hotfix ipad mini 6 detection
2022-02-07 16:53:19 +00:00
Nino Righi
736f402179 Merged PR 1042: #2604 Hotfix ipad mini 6 detection
#2604 Hotfix ipad mini 6 detection
2022-02-07 16:45:02 +00:00
Nino Righi
e5c4eb6a8e Merged PR 1041: #2604 Hotfix ipad 6
#2604 Hotfix ipad 6
2022-02-07 16:33:04 +00:00
Nino Righi
c93233674b Merged PR 1040: #2604 Hotfix Ipad 6 Remission Artikel Hinzufügen CTA
#2604 Hotfix Ipad 6 Remission Artikel Hinzufügen CTA
2022-02-07 16:29:29 +00:00
Nino Righi
02abf0852e Merged PR 1039: #2619 Customer Searchbox Placeholder Wording and Resizing
#2619 Customer Searchbox Placeholder Wording and Resizing
2022-02-07 14:58:57 +00:00
Nino Righi
cf3e5ce9a3 Merged PR 1038: #2604 Hotfix Ipad 6 Remission Artikel Hinzufügen CTA
#2604 Hotfix Ipad 6 Remission Artikel Hinzufügen CTA
2022-02-07 14:24:06 +00:00
Lorenz Hilpert
da71454070 Merged PR 1035: #2504 Remivorschau-ChangeStatus-removed
#2504 Remivorschau-ChangeStatus-removed
2022-02-02 15:52:23 +00:00
Lorenz Hilpert
08a8575025 Benamung von tags fue unit tests 2022-02-01 13:45:33 +01:00
Lorenz Hilpert
a99494b6ea Data Attribute für e2e tests hinzugefuegt 2022-01-28 11:00:33 +01:00
Andreas Schickinger
52ab4fccbd Merged PR 1024: #2504 Remissionsvorschau Navigation in Details
#2504 Remissionsvorschau Navigation in Details

Related work items: #2504
2022-01-19 09:39:09 +00:00
Nino Righi
2ab1599fa3 Merged PR 1021: #2504 AHF Remissionsvorschau
#2504 AHF Remissionsvorschau
2022-01-13 15:21:07 +00:00
Michael Auer
f220dde3b2 Merge tag '1.5' into develop 2021-12-22 11:26:38 +01:00
Michael Auer
d027df8856 Merge branch 'release/1.5' 2021-12-22 11:26:36 +01:00
Michael Auer
1dc979baaf merge branch 'release/1.5' 2021-12-22 11:24:24 +01:00
Michael Auer
f9908eaa57 merge branch 'release/1.5' 2021-12-22 11:23:09 +01:00
Michael Auer
8e8150e246 merge branch 'release/1.5' 2021-12-22 11:21:34 +01:00
Andreas Schickinger
19fe83ed25 Merged PR 1018: #2555 Hotfix Historie und Print Dialog doppelte Scrollbar
#2555 Hotfix Historie und Print Dialog doppelte Scrollbar

Related work items: #2555
2021-12-20 12:06:44 +00:00
Lorenz Hilpert
3c033a1f0d Merged PR 1017: #2556 Fehlermeldung - scrollPos
#2556 Fehlermeldung  - scrollPos

Related work items: #2556
2021-12-20 09:57:50 +00:00
Andreas Schickinger
be031fb702 Merged PR 1016: #2543 Hotfix PDP SSC Fehlermeldung
#2543 Hotfix PDP SSC Fehlermeldung

Related work items: #2543
2021-12-16 13:24:06 +00:00
Lorenz Hilpert
34a6c6d997 Merged PR 1015: #2542 bei leere Liste wirf klick auf Abholfach Fehler
#2542 bei leere Liste wirf klick auf Abholfach Fehler

Related work items: #2542
2021-12-15 16:33:34 +00:00
Lorenz Hilpert
fa2c0d101f Merged PR 1014: #2541 Load-Ansicht dauerhaft bei leere Liste
#2541 Load-Ansicht dauerhaft bei leere Liste

Related work items: #2541
2021-12-15 15:01:00 +00:00
Lorenz Hilpert
c3f6cef14e Merged PR 1013: #2533 Reservierungsliste - bei leerer Liste wirf klick auf Abholfach Fehler
#2533  Reservierungsliste - bei leerer Liste wirf klick auf Abholfach Fehler

Related work items: #2533
2021-12-15 14:56:41 +00:00
Andreas Schickinger
67bcb25106 Merged PR 1012: #2534 Hotfix - WA WE Meldenummern ändern Item wird vor Patch Aufruf aktualisiert
#2534 Hotfix - WA WE Meldenummern ändern Item wird vor Patch Aufruf aktualisiert

Related work items: #2534
2021-12-14 12:33:06 +00:00
Lorenz Hilpert
6cfbce4f16 Merge branch 'release/1.5' into develop 2021-12-10 10:50:36 +01:00
Lorenz Hilpert
cc65a29b05 Merge branch 'develop' into release/1.5 2021-12-10 10:50:10 +01:00
Nino Righi
79d1cb7e87 Merged PR 1008: #2503 Fix Undefined query Params
#2503 Fix Undefined query Params
2021-12-09 10:33:18 +00:00
Lorenz Hilpert
925b0e75db #2454 Suchfeld bei Remi abschluss auf IPad 6 ausblenden 2021-12-09 11:17:22 +01:00
Nino Righi
85b6439d5f Merged PR 1007: #2122 Patch Request - CTA Positioning
#2122 Patch Request - CTA Positioning
2021-12-08 13:11:27 +00:00
Nino Righi
8d75d2e9c9 Merged PR 1006: #2503 #2514 Kundenkarte Kundendaten Erfassen
#2503 #2514 Kundenkarte Kundendaten Erfassen
2021-12-08 09:54:41 +00:00
Lorenz Hilpert
af7e2298b5 #2475 - Button anzeige - bei Nullbestand CTA anzeigen 2021-12-08 10:49:20 +01:00
Andreas Schickinger
11fd851f21 Merged PR 1005: #2122 WA/WE Erneut senden Button Scroll Verhalten fix
#2122 WA/WE Erneut senden Button Scroll Verhalten fix

Related work items: #2122
2021-12-07 14:59:02 +00:00
Andreas Schickinger
2360a63fcb Merged PR 1004: #2501 WE WA Vormerker änderbar
#2501 WE WA Vormerker änderbar

Related work items: #2501
2021-12-07 13:39:52 +00:00
Andreas Schickinger
20e8433963 Merged PR 1003: #2507 Reservieren in andere Filiale Hotfix
#2507 Reservieren in andere Filiale Hotfix
Wenn für die zugeordnete Filiale die InStock und Store Availability nichts zurückliefern, wurden die Branches nicht geladen. Wird dem Purchasing Modal von außen als vorausgewählte Option "Take-Away" oder "Pick-Up" mitgegeben, werden die Branches nun auch geladen.

Related work items: #2507
2021-12-07 12:27:37 +00:00
Andreas Schickinger
c655c1b90b Merged PR 1002: #2502 Kundensuche Dialog
#2502 Kundensuche Dialog

Related work items: #2502
2021-12-07 12:27:03 +00:00
Nino Righi
215e542516 Merged PR 1001: #2122 WA/WE Kunde erneut benachrichtigen Implementierung
#2122 WA/WE Kunde erneut benachrichtigen Implementierung
2021-12-07 12:26:25 +00:00
Michael Auer
680ab2d92a Merge branch 'master' into develop 2021-12-07 11:11:33 +01:00
Michael Auer
c162c00c8d Merge branch 'release/1.5' 2021-12-07 11:08:37 +01:00
Lorenz Hilpert
e5dfc2484b Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-12-06 14:33:59 +01:00
Lorenz Hilpert
1962f47f81 #2475 - Abholfach - bei Nullbestand CTA anzeigen 2021-12-06 14:33:51 +01:00
Andreas Schickinger
6b9ea288d1 Merged PR 1000: #2069 WE WA Archiv Filter Detailseite anzeigen
#2069 WE WA Archiv Filter Detailseite anzeigen

Related work items: #2069
2021-12-06 13:29:18 +00:00
Nino Righi
baeaec54c5 Merged PR 999: #2484 AHF Routing to Details After Clicking an Item
#2484 AHF Routing to Details After Clicking an Item
2021-12-03 12:07:29 +00:00
Nino Righi
7272415ed4 Merged PR 998: #2496 PDP Fix Display No Supplier Available if No Ssc and SscText is available
#2496 PDP Fix Display No Supplier Available if No Ssc and SscText is available
2021-12-02 17:02:26 +00:00
Andreas Schickinger
c75d956c52 Merged PR 996: #2373 Scroll Position Handling
#2373 Wareneingang, Warenausgang, Reservierungen, Abholfachbereinigungsliste Scroll Position Handling

Related work items: #2373
2021-12-02 16:24:45 +00:00
Lorenz Hilpert
99d8084fe3 Merged PR 997: #2137 Übernahme der Email und des Nachnamens zu Kundendaten erfassen
#2137 Übernahme der Email und des Nachnamens zu Kundendaten erfassen
2021-12-02 16:24:01 +00:00
Lorenz Hilpert
e61601fca2 Merged PR 994: #2383 WE // Sortierung auf der Wareneingangsliste
Related work items: #2383
2021-12-02 16:20:44 +00:00
Andreas Schickinger
0cfeabb0f2 Merged PR 995: #2486 Erscheinungsdatum führende Null bei Format
#2486 Erscheinungsdatum führende Null bei Format

Related work items: #2486
2021-12-02 13:11:52 +00:00
Lorenz Hilpert
d059646ebe #2450 ui fehler - WE Titel Breite 2021-12-02 11:29:05 +01:00
Andreas Schickinger
553c5cd1c1 Merged PR 993: #2446 Erscheinungsdatum Bugfix wenn kein publicationDate existiert
#2446 Erscheinungsdatum Bugfix wenn kein publicationDate existiert

Related work items: #2446
2021-12-01 16:14:28 +00:00
Nino Righi
ba0a4f1bf9 Merged PR 991: #2383 Sortierung Wareneingangsliste
#2383 Sortierung Wareneingangsliste
2021-12-01 14:59:52 +00:00
Lorenz Hilpert
614e8f0ccc #2450 Lesealter breite ipad 6 2021-12-01 15:57:58 +01:00
Andreas Schickinger
428a905caa Merged PR 992: #2373 UiScrollContainer ScrollTo Methode
#2373 UiScrollContainer ScrollTo Methode

Related work items: #2373
2021-12-01 14:09:37 +00:00
Andreas Schickinger
6193306255 Merged PR 990: #2446 Artikelsuche Artikeldetails Erscheinungsdatum angepasst
#2446 Artikelsuche Artikeldetails Erscheinungsdatum angepasst

Related work items: #2446
2021-11-29 16:54:40 +00:00
Andreas Schickinger
b2913f9fa0 Merged PR 989: #2455 Warenkorb undefined wird nicht angezeigt
#2455 Warenkorb undefined wird nicht angezeigt

Related work items: #2455
2021-11-29 14:15:27 +00:00
Lorenz Hilpert
ce5ec1d961 #2454 ipad6 - Remission Scan Button wird nicht angezeigt 2021-11-29 14:23:04 +01:00
Lorenz Hilpert
96725d1730 #2290 Remi Screens am Desktop verschoben 2021-11-29 14:16:22 +01:00
Lorenz Hilpert
eec018de3c Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-11-29 14:06:55 +01:00
Lorenz Hilpert
f753d33731 #2328 AHF Status versendet und zugestellt leeres Blatt 2021-11-29 14:06:42 +01:00
Lorenz Hilpert
ffd69fbc75 Merged PR 933: Checkout Dummy Modal Implementation
Related work items: #2315
2021-11-29 12:56:51 +00:00
Lorenz Hilpert
5997e67322 Merged PR 988: #2364 - dashboard book tile - overflow set to y - hidden and line-break auto
#2364 - dashboard book tile - overflow set to y - hidden and line-break auto
2021-11-26 13:42:20 +00:00
Lorenz Hilpert
fe60370c0a Merge branch 'release/1.5' into develop 2021-11-26 14:06:17 +01:00
Lorenz Hilpert
cfee8e571e Merge branch 'develop' into release/1.5 2021-11-26 14:05:04 +01:00
Nino Righi
b4a7d3c879 Merged PR 987: #2456 Checkout Review Fix Setting Initial Notification Channel correctly
#2456 Checkout Review Fix Setting Initial Notification Channel correctly
2021-11-26 12:11:11 +00:00
Lorenz Hilpert
9c1565dfcc Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-11-26 13:10:41 +01:00
Lorenz Hilpert
a8b8573734 #2452 Abholung auf Lieferschein - Schritte zusammenfassen 2021-11-26 13:10:34 +01:00
Andreas Schickinger
c09e559430 Merged PR 985: #2449 WA WE Benachrichtigungen Take auf 4 gesetzt
#2449 WA WE Benachrichtigungen Take auf 4 gesetzt

Related work items: #2449
2021-11-25 16:53:10 +00:00
Lorenz Hilpert
cbc1b85d92 #2454 scanner fix test 2021-11-25 17:22:49 +01:00
Lorenz Hilpert
d6f3ae7179 #2454 Remi Scan Button 2021-11-25 17:14:47 +01:00
Andreas Schickinger
12c87aaa25 Merged PR 986: #2450 Artikelsuche Filter Button ipad Klasse entfernt
#2450 Artikelsuche Filter Button ipad Klasse entfernt

Related work items: #2450
2021-11-25 16:07:05 +00:00
Lorenz Hilpert
67a0230b7b #2450 piad6 - ui fehler - remission scan button 2021-11-25 15:20:55 +01:00
Lorenz Hilpert
539a6d420e #2450 piad6 ui fehler - Filter Groeße 2021-11-25 15:09:33 +01:00
Nino Righi
f1baa7c0d2 Merged PR 984: #129 Checkout Bugfixes - Näheres steht im Ticket in den Kommentaren
#129 Checkout Bugfixes - Näheres steht im Ticket in den Kommentaren
2021-11-24 15:41:23 +00:00
Andreas Schickinger
36ac3776b7 Merged PR 983: #2452 WA WE COLLECT_ON_DELIVERYNOTE Action
#2452 WA WE COLLECT_ON_DELIVERYNOTE Action

Related work items: #2452
2021-11-24 15:26:16 +00:00
Lorenz Hilpert
a6b50631dc #2382 iPad 6 - Wareneingangsliste verschiebbar 2021-11-24 15:49:25 +01:00
Lorenz Hilpert
71fdedb2d9 Merge branch 'release/1.5' into develop 2021-11-24 15:38:26 +01:00
Lorenz Hilpert
f4be47a0d7 Merge branch 'develop' into release/1.5 2021-11-24 15:38:09 +01:00
Lorenz Hilpert
295400892a #2440 ipad 6 - Vorgangszeichen 2021-11-24 15:37:02 +01:00
Lorenz Hilpert
5c3d28033f #2450 piad6 ui fehler 2021-11-24 15:36:25 +01:00
Andreas Schickinger
229cb55b46 Merged PR 982: #2419, #2426, #2413 IconBadgeComponent und Anzeige des Prämienkatalog Badge
#2419, #2426, #2413 IconBadgeComponent und Anzeige des Prämienkatalog Badge

Related work items: #2413, #2419, #2426
2021-11-23 16:32:04 +00:00
Lorenz Hilpert
99fea8c2df Merge branch 'release/1.5' into develop 2021-11-22 17:18:02 +01:00
Andreas Schickinger
1d7fd4fab1 Merged PR 981: #2444 HFI Kundensuche B2B Typ bei Menü Routing entfernt
#2444 HFI Kundensuche B2B Typ bei Menü Routing entfernt

Related work items: #2444
2021-11-22 15:31:38 +00:00
Lorenz Hilpert
76e1b7d320 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-11-22 16:22:54 +01:00
Lorenz Hilpert
0d4ca1b6a6 #2426 Icon Gift and Baookmark bg 2021-11-22 16:22:45 +01:00
Andreas Schickinger
9050f33fcc Merged PR 979: #2413 PDP IsPrebooked Badge wieder entfernt
#2413 PDP IsPrebooked Badge wieder entfernt

Related work items: #2413
2021-11-22 14:31:32 +00:00
Lorenz Hilpert
8a1b151740 #2434 ipad 6 - breadcrumb funktioniert nicht 2021-11-22 15:15:58 +01:00
Andreas Schickinger
f088098159 Merged PR 978: #2413 PDP IsPrebooked Badge anzeigen
#2413 PDP IsPrebooked Badge anzeigen

Related work items: #2413
2021-11-19 08:31:13 +00:00
Andreas Schickinger
d9462a2d17 Merged PR 977: #2418 Aktuelleste Benachrichtigung wird angezeigt und Anzeige mehrerer Benach...
#2418 Aktuelleste Benachrichtigung wird angezeigt und Anzeige mehrerer Benachrichtigungen vorbereitet

Related work items: #2418
2021-11-18 15:28:49 +00:00
Nino Righi
eec72499e7 Merged PR 976: #2408 Customer Orders added History inside Order Details on every item
#2408 Customer Orders added History inside Order Details on every item
2021-11-18 12:20:44 +00:00
Andreas Schickinger
93016af766 Merged PR 975: #2413 Bookmark Tooltips angepasst, Page-Tooltip durch UI-Tooltip ersetzt
#2413 Bookmark Tooltips angepasst, Page-Tooltip durch UI-Tooltip ersetzt

Related work items: #2413
2021-11-18 11:18:48 +00:00
Nino Righi
5d699dff8f Merged PR 973: #2412 Neue Ola Availability Service Update
#2412 Neue Ola Availability Service Update
2021-11-18 10:25:03 +00:00
Nino Righi
12e4f48460 Merged PR 974: #2140 WA WE Display EstimatedShippingDate on Details Page
#2410 WA WE Display EstimatedShippingDate on Details Page
2021-11-17 17:09:40 +00:00
Andreas Schickinger
68ad3cd407 Merged PR 972: #2372 AHF Wareneingangsliste Bestelldatum anzeigen
#2372 AHF Wareneingangsliste Bestelldatum anzeigen

Related work items: #2372
2021-11-17 12:30:04 +00:00
Nino Righi
c19c4d471d Merged PR 971: #2379 TK Pdf Viewer Broad Content Fix
#2379 TK Pdf Viewer Broad Content Fix
2021-11-16 14:56:57 +00:00
Andreas Schickinger
9cf5f23b5a Merged PR 970: #2397 Update-Notiz Label zu Kommentar geändert
#2397 Update-Notiz Label zu Kommentar geändert

Related work items: #2397
2021-11-16 14:31:54 +00:00
Andreas Schickinger
b71d383c74 Merged PR 968: #129 WK Versand günstigsten Preis verwenden
#129 WK Versand günstigsten Preis verwenden

Related work items: #129
2021-11-16 13:37:36 +00:00
Nino Righi
5086c3c82d Merged PR 969: #2379 TK Pdf Viewer Scrolling Fix
#2379 TK Pdf Viewer Scrolling Fix
2021-11-16 13:37:07 +00:00
Andreas Schickinger
d98c30506e Merged PR 967: #2374 Reorder Button disabled, wenn keine Availability ausgewählt ist
#2374 Reorder Button disabled, wenn keine Availability ausgewählt ist

Related work items: #2374
2021-11-15 16:56:52 +00:00
Andreas Schickinger
6a4e5a121f Merged PR 966: #2378 Abholfrist Dropdown durch Datepicker ersetzt
#2378 Abholfrist Dropdown durch Datepicker ersetzt

Related work items: #2378
2021-11-15 16:55:56 +00:00
Nino Righi
15a8d2151e Merged PR 965: #129 Checkout PurchasingOptionsModal Price Fix
#129 Checkout PurchasingOptionsModal Price Fix
2021-11-15 12:41:05 +00:00
Nino Righi
025672bd91 Merged PR 964: #2379 TK Pdf Scrolling Fix
#2379 TK Pdf Scrolling Fix
2021-11-15 10:06:41 +00:00
Nino Righi
a925050912 Merged PR 961: #2375 PDP Added Timeout for Shipping Availability Requests
#2375 PDP Added Timeout for Shipping Availability Requests
2021-11-15 08:48:36 +00:00
Nino Righi
a4a4fc344a Merged PR 962: #2374 Reorder Modal Fix Disable Order Button if Store And TakeAway Availabili...
#2374 Reorder Modal Fix Disable Order Button if Store And TakeAway Availabilites don't exist
2021-11-15 08:25:55 +00:00
Nino Righi
bc1fc27a5d Merged PR 963: #2379 TK PDF Scrolling Ipad Fix
#2379 TK PDF Scrolling Ipad Fix
2021-11-15 08:15:37 +00:00
Nino Righi
acfd88ec55 Merged PR 960: #129 Checkout Options Modal Shipping Take Cheapest Price
#129 Checkout Options Modal Shipping Take Cheapest Price
2021-11-11 17:35:23 +00:00
Nino Righi
3745583e1c Merged PR 958: #2371 Customer Search Filter Fix
#2371 Customer Search Filter Fix
2021-11-11 15:50:48 +00:00
Andreas Schickinger
60f1a89984 Merged PR 959: #2336 WK DIG Versand Grouping fix
#2336 WK DIG Versand Grouping fix

Related work items: #2336
2021-11-11 15:48:12 +00:00
Andreas Schickinger
cbfa2fc98c Merged PR 957: #2370 Zubuchen Button disabled, wenn Zusatz abweicht
#2370 Zubuchen Button disabled, wenn Zusatz abweicht

Related work items: #2370
2021-11-11 11:52:55 +00:00
Nino Righi
7c37a0bb05 Merged PR 956: #2329 WE WA Date Range Filter Fix if no date gets selected
#2329 WE WA Date Range Filter Fix if no date gets selected
2021-11-11 10:58:04 +00:00
Michael Auer
699745526e Merge branch 'master' into develop 2021-11-11 11:03:12 +01:00
Michael Auer
ef9573a74d Merge branch 'release/1.5' 2021-11-11 10:58:04 +01:00
Michael Auer
7efe8196a5 Merge commit 'e2d78ff89ed1c60320967cd7660b40b753b7da0b' 2021-11-11 09:49:59 +01:00
Michael Auer
f1ed3f7438 Merge commit '1260d2932413e79a02bc558beac7af810509470d' 2021-11-11 09:45:23 +01:00
Michael Auer
30bdc0ee54 Merge branch 'master' into develop 2021-11-11 09:19:00 +01:00
Nino Righi
8c7217ad56 Merged PR 955: #2329 WE WA Date Range Filter Stop Value Update
#2329 WE WA Date Range Filter Stop Value Update
2021-11-10 15:43:06 +00:00
Nino Righi
4f15bc257d Merged PR 954: #2324 Added Backdrop to UiSelect Dropdowns
#2324 Added Backdrop to UiSelect Dropdowns
2021-11-10 12:22:00 +00:00
Andreas Schickinger
4c25c5769a Merged PR 950: #1965 Kundendaten erfassen Validierungslogik angepasst
#1965 Kundendaten erfassen Validierungslogik angepasst
- Speichern Button ist immer aktiv
- Validierung wird bei Klick auf Speichern ausgeführt
- Cursor springt automatisch ins erste Feld mit Validierungsfehler

Related work items: #1965
2021-11-10 12:21:05 +00:00
Nino Righi
30a9225227 Merged PR 948: #2336 WK Change Wording of DIG-Versand to Versand
#2336 WK Change Wording of DIG-Versand to Versand
2021-11-10 09:22:00 +00:00
Nino Righi
4a0d79b138 Merged PR 953: #2364 Fix Dashboard Artikelanzeige
#2364 Fix Dashboard Artikelanzeige
2021-11-10 08:14:35 +00:00
Nino Righi
8856c984dc Merged PR 952: Merge release/1.5 into develop
Merge release/1.5 into develop

Related work items: #882, #1985, #2244, #2331
2021-11-09 16:05:43 +00:00
Nino Righi
0198e635b3 Merged PR 951: Merge Develop into release/1.5
Merge Develop into release/1.5

Related work items: #882, #1985, #2244
2021-11-09 16:03:43 +00:00
Nino Righi
f477411667 Merged PR 949: #1967 WK Notification Channel Dont Tick SMS Checkbox if Email and Mobile Numb...
#1967 WK Notification Channel Dont Tick SMS Checkbox if Email and Mobile Number exist
2021-11-09 15:32:26 +00:00
Andreas Schickinger
963aaa974e Merged PR 947: #1985 Kundentyp-Checkbox nicht mehr abwählbar
#1985 Kundentyp-Checkbox nicht mehr abwählbar

Related work items: #1985
2021-11-09 15:00:32 +00:00
Andreas Schickinger
49bb23805e Merged PR 946: #2244 Preiseingabe bei Archivartikeln nur noch anzeigen, wenn keine der avail...
#2244 Preiseingabe bei Archivartikeln nur noch anzeigen, wenn keine der availabilities einen Preis besitzt

Related work items: #2244
2021-11-08 16:41:17 +00:00
Andreas Schickinger
a1dea02498 Merged PR 944: #2244 Archivartikel Preis übernehmen, wenn vorhanden
#2244 Archivartikel Preis übernehmen, wenn vorhanden

Related work items: #2244
2021-11-08 13:24:59 +00:00
Nino Righi
e7eef7f169 Merged PR 943: #2342 #2358 Autocomplete Adjust DebounceTime Values based on current Section
#2342 #2358 Autocomplete Adjust DebounceTime Values based on current Section
2021-11-08 12:56:27 +00:00
Nino Righi
072045ed59 Merged PR 942: #2343 WE, WA Fix ProcessingStatusName Mapping
#2343 WE, WA Fix ProcessingStatusName Mapping
2021-11-08 11:21:28 +00:00
Nino Righi
9078c57909 Merged PR 940: #2342 Autocomplete Requests Delay Hotfix
#2342 Autocomplete Requests Delay Hotfix
2021-11-04 06:09:47 +00:00
Nino Righi
abb15a9e28 Merged PR 941: #2331 Hotfix WA WE Edit Navigation after Status Change due to changeStockStatusCode request
#2331 Hotfix WA WE Edit Navigation after Status Change due to changeStockStatusCode request
2021-11-03 06:38:25 +00:00
Andreas Schickinger
2766751c79 Merged PR 937: #882 Filialkürzel im Header anzeigen
#882 Filialkürzel im Header anzeigen

Related work items: #882
2021-10-28 15:37:56 +00:00
Andreas Schickinger
d9df337ff0 Merged PR 939: #2331 WE/WA Bearbeiten: changeStockStatusCode Aufruf vor patch
#2331 WE/WA Bearbeiten: changeStockStatusCode Aufruf vor patch

Related work items: #2331
2021-10-28 14:03:42 +00:00
Lorenz Hilpert
5d2cfaf269 Revert "#2333 Erstellung einer Remission abbrechen"
This reverts commit e475ab6047.
2021-10-27 15:18:02 +02:00
Nino Righi
4a9b5ace01 Merged PR 936: #2334 WA Fix Routing to Details Page if Search Result Hits is 1
#2334 WA Fix Routing to Details Page if Search Result Hits is 1
2021-10-27 13:09:06 +00:00
Lorenz Hilpert
e475ab6047 #2333 Erstellung einer Remission abbrechen 2021-10-27 14:56:31 +02:00
Lorenz Hilpert
e2d78ff89e #2332 Navigation mit slash 2021-10-26 14:29:09 +02:00
Lorenz Hilpert
1260d29324 Merge branch 'develop' into release/1.5 2021-10-25 15:51:13 +02:00
Lorenz Hilpert
bed12304c0 #2319 Artikel nicht gefunden bei Abteilungsremission 2021-10-25 14:33:35 +02:00
Nino Righi
c2ede383dd Merged PR 934: #2326 Checkout Dummy Scan Console Logs
#2326 Checkout Dummy Scan Console Logs
2021-10-25 10:40:19 +00:00
Lorenz Hilpert
0e6f56230a #2319 Artikel nicht gefunden bei Abteilungsremission 2021-10-25 11:34:20 +02:00
Nino Righi
ac7705442f Merged PR 932: #2265 DoNotTrack Search History
#2265 DoNotTrack Search History
2021-10-25 09:08:40 +00:00
Nino Righi
b5a3ee19a4 Revert "Merged PR 931: #2315 Checkout Dummy Modal Implementation"
This reverts commit 29c8cc2062.
2021-10-25 11:05:03 +02:00
Nino Righi
29c8cc2062 Merged PR 931: #2315 Checkout Dummy Modal Implementation
#2315 Checkout Dummy Modal Implementation
2021-10-25 09:00:40 +00:00
Lorenz Hilpert
098f314b83 #2323 Wannennummer muß zweimal geklickt werden 2021-10-25 10:49:40 +02:00
Nino Righi
5885aa759d Merged PR 930: #2318 Checkout Dummy Changed Search Endpoint and Update Validator, Sort Suppl...
#2318 Checkout Dummy Changed Search Endpoint and Update Validator, Sort Suppliers alphabetically
2021-10-22 09:19:19 +00:00
Nino Righi
c0dec7729c Merged PR 929: #2316 WK Gruppierung Fix
#2316 WK Gruppierung Fix
2021-10-21 16:02:03 +00:00
Andreas Schickinger
8d26d94b9f Merged PR 927: #2312 AHF Bestellung bei Lieferant ausführen
#2312 AHF Bestellung bei Lieferant ausführen

Related work items: #2312
2021-10-21 15:59:31 +00:00
Andreas Schickinger
a207fc90dc Merged PR 928: #2310 AHF Nachbestellen Vormerker
#2310 AHF Nachbestellen Vormerker

Related work items: #2310
2021-10-21 15:57:38 +00:00
Nino Righi
13e0e4b5fa Merged PR 926: Fix Checkout Review
Fix Checkout Review
2021-10-21 15:33:46 +00:00
Nino Righi
4c95bb8354 Merged PR 925: #2265 Dummy Anlage Update
#2265 Dummy Anlage Update
2021-10-21 15:19:39 +00:00
Lorenz Hilpert
a4a39f643c #2314 Vorgangs ID im Bearbeiten Ansicht falsch 2021-10-21 16:30:10 +02:00
Lorenz Hilpert
744ee451cf #2313 iPadOS 15 - Farben anpassen 2021-10-21 16:26:58 +02:00
Lorenz Hilpert
c44af0d61e Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-21 14:41:00 +02:00
Lorenz Hilpert
6cf385a6f0 #2311 laden der Notifications schlägt fehl 2021-10-21 14:40:52 +02:00
Andreas Schickinger
c30d81dfa5 Merged PR 923: #2121 WE Anzeige wenn keine Benachrichtigung konfiguriert
#2121 WE Anzeige wenn keine Benachrichtigung konfiguriert

Related work items: #2121
2021-10-21 12:25:52 +00:00
Nino Righi
77a645bfe9 Merged PR 924: #2272 TK Hide Old Tasks before Update inside List View
#2272 TK Hide Old Tasks before Update inside List View
2021-10-21 12:25:23 +00:00
Lorenz Hilpert
c6a0e87fdd WE/WA Details Bearbeiten - Wenn result leer ist dann wird die form nicht mehr initialisiert 2021-10-21 11:13:47 +02:00
Lorenz Hilpert
990927d9d5 Update SSC Text für Rücklage 2021-10-21 11:08:05 +02:00
Lorenz Hilpert
342db106fe Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-20 17:48:21 +02:00
Andreas Schickinger
43b56351ad Merged PR 922: #2308 Artikelsuche Hint margin fix
#2308 Artikelsuche Hint margin fix

Related work items: #2308
2021-10-20 15:48:13 +00:00
Lorenz Hilpert
a212a4fa90 #2274 Mobilnummer Validierung 2021-10-20 17:47:30 +02:00
Andreas Schickinger
1c7c79451d Merged PR 921: #2288 TK Updatenotiz Anzeigelogik angepasst
Related work items: #2288
2021-10-20 15:29:29 +00:00
Andreas Schickinger
27a9d446ef Merged PR 918: #2244 WK Preis kann bei Archivartikeln vergeben werden
#2244 WK Preis kann bei Archivartikeln vergeben werden

Related work items: #2244
2021-10-20 15:28:49 +00:00
Lorenz Hilpert
0115e235c2 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-20 17:26:51 +02:00
Lorenz Hilpert
e838964860 #2302 - Remi - Platzierung ändern Button Artikel nicht gefunden 2021-10-20 17:26:33 +02:00
Andreas Schickinger
8c2862cc80 Merged PR 919: #2303 Artikeldetails Beschreibung nicht mehr zentriert
#2303 Artikeldetails Beschreibung nicht mehr zentriert

Related work items: #2303
2021-10-20 14:32:52 +00:00
Nino Righi
445ba6ba20 Merged PR 920: #2304 Customer Order Details Display Dummy Orders
#2304 Customer Order Details Display Dummy Orders
2021-10-20 14:32:15 +00:00
Lorenz Hilpert
5793094187 Benachrichtigung - UpdateOrder durch PatchOrder ersetzt 2021-10-20 16:30:20 +02:00
Nino Righi
861333d748 Merged PR 917: #2265 Manuelle Dummy Anlage
#2265 Manuelle Dummy Anlage
2021-10-20 11:23:45 +00:00
Lorenz Hilpert
75a45de060 Update only required communicationDetails 2021-10-20 11:03:13 +02:00
Lorenz Hilpert
b87485a56f Benachrichtigungskanal bei änderung auf dirty setzen 2021-10-20 10:50:47 +02:00
Lorenz Hilpert
8612f335ac #2121 Benachrichtigungen 2021-10-19 18:04:54 +02:00
Lorenz Hilpert
cd56bc1fc0 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-19 16:02:15 +02:00
Lorenz Hilpert
bf768b970f #2274 Benachrichtigungskanal hinzufügen 2021-10-19 16:02:03 +02:00
Andreas Schickinger
1e083d0e64 Merged PR 910: #2295 Leere Notifications können nicht mehr geöffnet werden
Leere Notifications können nicht mehr geöffnet werden

Related work items: #2295
2021-10-19 08:45:04 +00:00
Andreas Schickinger
2dc8141bbc Merged PR 912: #2292 Reservieren Popup Scrollbar fix
#2292 Reservieren Popup Scrollbar fix

Related work items: #2292
2021-10-19 08:44:36 +00:00
Andreas Schickinger
a9bbc672c9 Merged PR 913: #2289 WK Download ändern entfernt
#2289 WK Download ändern entfernt

Related work items: #2289
2021-10-19 08:44:01 +00:00
Andreas Schickinger
b51590e374 Merged PR 914: #2287 TK Update-Notiz
#2287 TK Update-Notiz

Related work items: #2287
2021-10-19 08:43:39 +00:00
Andreas Schickinger
21f609053a Merged PR 915: #2288 TK Update-Notiz immer anzeigen, wenn vorhanden
#2288 TK Update-Notiz immer anzeigen, wenn vorhanden

Related work items: #2288
2021-10-19 08:43:10 +00:00
Andreas Schickinger
0fe3e324cb Merged PR 916: #2293 WE Lieferdatum Filter
#2293 WE Lieferdatum Filter

Related work items: #2293
2021-10-19 08:42:41 +00:00
Nino Righi
921144c1f9 Merged PR 911: Hotfix Config SignalR
Hotfix Config SignalR
2021-10-18 07:39:11 +00:00
Lorenz Hilpert
af2ab8f104 Merge branch 'develop' into release/1.5 2021-10-13 18:30:38 +02:00
Lorenz Hilpert
5c3539c820 FIX Remi Abschließen Dialog 2021-10-13 18:15:54 +02:00
Lorenz Hilpert
6bdb758bc6 Update Remi Finish Template 2021-10-13 18:10:08 +02:00
Lorenz Hilpert
1d36c1b55d Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-13 18:09:36 +02:00
Lorenz Hilpert
a4daa8b36d #2284 - Packstück Id scannen ausblenden wenn ZL 2021-10-13 17:30:50 +02:00
Lorenz Hilpert
dd91b7c023 #2284 Packstück Id generieren ausblenden wenn ZL 2021-10-13 17:09:51 +02:00
Lorenz Hilpert
472716d06d #2283 Remission starten 2021-10-13 16:52:54 +02:00
Nino Righi
5f34fa811c Merged PR 904: #2266 Reservations always generates a new compartmentCode for each selected r...
#2266 Reservations always generates a new compartmentCode for each selected reservation inside the list, bugfix reloading list
2021-10-12 15:23:20 +00:00
Lorenz Hilpert
9538c364d4 #2280 Update-Infos soll nicht anzeigen bis freigegeben 2021-10-12 17:21:42 +02:00
Andreas Schickinger
b3f0c08e2c Merged PR 909: #2271 WE Edit Zusatz
#2271 WE Edit Zusatz

Related work items: #2271
2021-10-12 14:51:42 +00:00
Nino Righi
406ec89625 Merged PR 908: #2278 Always Show Printer Selection Modal on iPad
#2278 Always Show Printer Selection Modal on iPad
2021-10-12 14:50:32 +00:00
Lorenz Hilpert
d0c930c080 #2279 - abgeholt und Lieferschein drucken erscheint nicht 2021-10-12 16:49:17 +02:00
Lorenz Hilpert
85b3636cee Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-12 15:16:35 +02:00
Andreas Schickinger
d3a477425e Merged PR 901: #2080 Suchbegriff bei Filter zurücksetzen beibehalten
Related work items: #2080
2021-10-11 15:36:32 +00:00
Lorenz Hilpert
62439f9e7d Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-10-11 15:32:26 +02:00
Lorenz Hilpert
b0581c2f2b #2264 Fehler bei hinzufügen von exotischen Artikeln 2021-10-11 15:32:15 +02:00
Nino Righi
9dd7da7630 Merged PR 907: #2268 TK Show Update Symbol on old and new Task
#2268 TK Show Update Symbol on old and new Task
2021-10-11 12:17:30 +00:00
Lorenz Hilpert
0e9edf0aba Merge branch 'develop' into feature/signalr 2021-10-11 11:45:32 +02:00
Nino Righi
42583d306b Merged PR 906: #2249 Catalog Result List Fix Font Size for large Titles
#2249 Catalog Result List Fix Font Size for large Titles
2021-10-11 08:39:40 +00:00
Nino Righi
11593091fd Merged PR 905: #2273 TK Display CTA "Zur neuen Aufgabe" fixed
#2273 TK Display CTA "Zur neuen Aufgabe" fixed
2021-10-11 08:39:21 +00:00
Nino Righi
947da3d647 Merged PR 903: #2267 Checkout Add To Cart Modal removed branch availability text for downloa...
#2267 Checkout Add To Cart Modal removed branch availability text for download items
2021-10-08 12:58:50 +00:00
Nino Righi
a6502a23af Merged PR 902: #2263 Checkout Pickup, select branches Dropdown, updated input placeholder
#2263 Checkout Pickup, select branches Dropdown, updated input placeholder
2021-10-08 12:57:50 +00:00
Lorenz Hilpert
abeb6ea5a2 SignalR Hub Service ctahc errors 2021-10-07 16:13:59 +02:00
Lorenz Hilpert
ff749f8892 SignalR Websocket Connection IOS 2021-10-07 16:11:50 +02:00
Andreas Schickinger
2c3115dc47 Merged PR 896: #2253 UiOverlayTrigger erstellt und UiTooltip angepasst
#2253 UiOverlayTrigger erstellt und UiTooltip angepasst

Related work items: #2253
2021-10-07 12:08:10 +00:00
Nino Righi
d96729fb89 Merged PR 900: #2209 TK Ongoing Tasks fixed Filter settings and styling issue
#2209 TK Ongoing Tasks fixed Filter settings and styling issue
2021-10-07 12:07:36 +00:00
Andreas Schickinger
7b49fbc85c Merged PR 895: #2254 UI Datepicker ausgewählter Tag
#2254 UI Datepicker ausgewählter Tag

Related work items: #2254
2021-10-06 15:05:18 +00:00
Lorenz Hilpert
436936ff41 scanbox autofocus 2021-10-06 17:04:39 +02:00
Lorenz Hilpert
0f4c2c84d2 #2248 WBS am Desktop abschliessen 2021-10-06 16:26:21 +02:00
Andreas Schickinger
02f8f747e1 Merged PR 899: Modalfenster Basis erweitert
Modalfenster Basis um Close Button, Title und ScrollX/ScrollY erweitert
2021-10-06 13:53:07 +00:00
Nino Righi
26d538adf2 Merged PR 898: #1966 Customer Area made Select Dropdowns clearable
#1966 Customer Area made Select Dropdowns clearable
2021-10-06 13:52:41 +00:00
Lorenz Hilpert
ba3618d58a #1997 Wannennummer scannen 2021-10-06 11:56:56 +02:00
Lorenz Hilpert
72568c3ae2 #2103 Warenbegleitschein auf dem Desktop eröffnen 2021-10-06 11:39:43 +02:00
Nino Righi
3f6b0447b9 Merged PR 891: #2251 TK Fix Editing tasks on todays date
#2251 TK Fix Editing tasks on todays date
2021-10-06 08:43:23 +00:00
Nino Righi
be81bdf0b4 Merged PR 890: #2233 WE Details Fix Routing For OrderAtSupplier Action
#2233 WE Details Fix Routing For OrderAtSupplier Action
2021-10-06 08:42:51 +00:00
Nino Righi
19340905db Merged PR 894: #2252 Filter iPad Styling Fixes, Reading-Age, Goods-In, Goods-Out padding
#2252 Filter iPad Styling Fixes, Reading-Age, Goods-In, Goods-Out padding
2021-10-06 08:42:22 +00:00
Andreas Schickinger
1f5cbd8579 Merged PR 897: #2259 Artikeldetails - Fehler beim Hinzufügen zum Warenkorb
Related work items: #2259
2021-10-06 08:41:24 +00:00
Nino Righi
bd0535fdc4 Merged PR 892: #2249 Articlesearch Results Updated Styling and Sizing
#2249 Articlesearch Results Updated Styling and Sizing
2021-10-04 08:37:56 +00:00
Nino Righi
343bed6a6b Merged PR 893: #2250 TK Selected and Displayed Date queryParams Update
#2250 TK Selected and Displayed Date queryParams Update
2021-10-04 08:34:19 +00:00
Lorenz Hilpert
816232d993 Merge branch 'release/1.5' into develop 2021-09-30 17:27:57 +02:00
Nino Righi
2ab8faa9eb Merged PR 889: #2239 PDP Availabilities Modal updated styling
#2239 PDP Availabilities Modal updated styling
2021-09-30 14:37:07 +00:00
Nino Righi
144d105a13 Merged PR 888: #2242 #2243 Goods-In-List Display BuyerNumber and Implemented Routing to Details
#2242 #2243 Goods-In-List Display BuyerNumber and Implemented Routing to Details
2021-09-30 14:36:44 +00:00
Lorenz Hilpert
f35b83368d #2247 UNKNOWN Format 2021-09-30 16:33:18 +02:00
Lorenz Hilpert
00fb992f23 #2247 UNKNOWN SVG 2021-09-30 16:03:19 +02:00
Andreas Schickinger
fec1f1ef43 Merge branch 'feature/signalr' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/signalr 2021-09-29 17:36:32 +02:00
Andreas Schickinger
83c36aff02 #2109 Notification Popup Scrollverhalten angepasst 2021-09-29 17:36:05 +02:00
Nino Righi
5f477f2665 Merged PR 885: #2238 TK Disable Edit Button for Tasks in the future
#2238 TK Disable Edit Button for Tasks in the future
2021-09-29 15:06:32 +00:00
Andreas Schickinger
ca74eea880 Merged PR 886: #2237 WE Coveranzeige Navigation
#2237 WE Coveranzeige Navigation

Related work items: #2237
2021-09-29 14:55:47 +00:00
Andreas Schickinger
5808cbd0d9 Merged PR 887: #2240 Reorder bugfix wenn es keine StoreAvailabilities gibt
#2240 Reorder bugfix wenn es keine StoreAvailabilities gibt

Related work items: #2240
2021-09-29 14:55:01 +00:00
Lorenz Hilpert
50f9cb7405 Notifications ShareReplay BufferSize = 1 2021-09-29 16:53:34 +02:00
Nino Righi
b9e28dfdcd Merged PR 883: #2235 WE WA History Updated Headline
#2235 WE WA History Updated Headline
2021-09-28 15:06:21 +00:00
Nino Righi
288f2fc920 Merged PR 884: #2236 WE, WA Result lists, added Scroll Arrow and Fixed Spacer Gap
#2236 WE, WA Result lists, added Scroll Arrow and Fixed Spacer Gap
2021-09-28 15:06:01 +00:00
Andreas Schickinger
1d42a2cf6c Merge branch 'feature/signalr' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/signalr 2021-09-28 17:03:56 +02:00
Andreas Schickinger
4fda2a4770 #2109 Reservieren Popup 2021-09-28 17:02:21 +02:00
Nino Righi
39169b338a Merged PR 882: #2193 Goods In added Header to cleanup, list, reservations and result list
#2193 Goods In added Header to cleanup, list, reservations and result list
2021-09-27 15:39:06 +00:00
Nino Righi
d67a05b71d Merged PR 880: #2163 WE Wareneingangsliste Handlungsanweisung
#2163 WE Wareneingangsliste Handlungsanweisung
2021-09-27 13:27:19 +00:00
Nino Righi
cdcf90c4c3 Merged PR 881: #2205 Reservations Empty List Updated Message
#2205 Reservations Empty List Updated Message
2021-09-27 13:26:03 +00:00
Lorenz Hilpert
9fef39924e Glocke Styling 2021-09-27 15:20:25 +02:00
Lorenz Hilpert
2f1584436a Notifications caching + DTOs 2021-09-27 14:06:42 +02:00
Lorenz Hilpert
5041be7831 #2108 - Notifications Glocke 2021-09-27 13:36:55 +02:00
Lorenz Hilpert
df19fc5ace Hub Configs 2021-09-24 18:33:56 +02:00
Lorenz Hilpert
9ce527aa3b Added SignalR lib and created Notifications Hub 2021-09-24 18:27:29 +02:00
Lorenz Hilpert
ac27bb1fde Merge branch 'release/1.5' into develop 2021-09-24 16:22:15 +02:00
Lorenz Hilpert
d311dab698 #2227 - error dialog + abgeholt und Lieferschein drucken fix 2021-09-24 16:21:40 +02:00
Lorenz Hilpert
5ab8c2b4f5 #2231 zubuchen aktiv wenn readyforpickup das heutige datum ist 2021-09-24 10:41:40 +02:00
Lorenz Hilpert
3729e81005 #2214 - CTA Zur Bestellpostensuche 2021-09-23 18:06:59 +02:00
Lorenz Hilpert
c3d0ead801 Merge branch 'develop' into release/1.5 2021-09-23 17:33:29 +02:00
Andreas Schickinger
2658ef19a5 Merged PR 878: #2230 WE Meldenummern aus Zwischenablage einfügen - Speichern Button enabled
#2230 WE Meldenummern aus Zwischenablage einfügen - Speichern Button enabled

Related work items: #2230
2021-09-23 15:32:36 +00:00
Nino Righi
34e66e6a49 Merged PR 879: #2218 WE, WA Details Special Comment ipad color fix
#2218 WE, WA Details Special Comment ipad color fix
2021-09-23 15:32:08 +00:00
Lorenz Hilpert
e9881fa9c5 #2231 Zubuchen auf Abholfachnummer von abgeholten Bestellposten 2021-09-23 17:31:27 +02:00
Andreas Schickinger
da92de1990 Merged PR 873: #2227 AHF Status Lieferantenbestellung ausführen umbenannt
#2227 AHF Status Lieferantenbestellung ausführen umbenannt

Related work items: #2227
2021-09-23 13:53:55 +00:00
Nino Righi
1e2b527a80 Merged PR 874: #2223 WE Filter estimatedShippingDate queryParams Fix
#2223 WE Filter estimatedShippingDate queryParams Fix
2021-09-23 13:53:18 +00:00
Andreas Schickinger
7b71c0e343 Merged PR 875: #2228 ErrorModalComponent und ErrorHandling in AHF
#2228 ErrorModalComponent und ErrorHandling in AHF

Related work items: #2228
2021-09-23 13:52:29 +00:00
Nino Righi
658e64cbbc Merged PR 876: #2229 WE WA Display Message if Result List is Empty
#2229 WE WA Display Message if Result List is Empty
2021-09-23 13:51:59 +00:00
Nino Righi
eabf8838c7 Merged PR 877: #2216 WE Reorder PopUp Disabled Horizontal Scrolling
#2216 WE Reorder PopUp Disabled Horizontal Scrolling
2021-09-23 13:51:31 +00:00
Lorenz Hilpert
d3d4ef5e4d Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-09-23 15:50:57 +02:00
Lorenz Hilpert
8239e553e7 #2190 keine Positionen auf der Remiliste 2021-09-23 15:50:25 +02:00
Lorenz Hilpert
83a24045be #2219 Styling Bestellpostendetailseite 2021-09-23 14:12:02 +02:00
Lorenz Hilpert
54b87db9c6 #2217 WE - Panel Size 2021-09-23 13:47:09 +02:00
Andreas Schickinger
4961e580c5 Merged PR 871: #1662 TK gelöschte Beiträge
#1662 TK gelöschte Beiträge

Related work items: #1662
2021-09-23 09:10:45 +00:00
Lorenz Hilpert
a07be1ffd4 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-09-22 17:51:26 +02:00
Nino Righi
7c10dde089 Merged PR 872: #2226 WE Reorder Pop Up Routing Fix if Modal Gets Closed without Action
#2226 WE Reorder Pop Up Routing Fix if Modal Gets Closed without Action
2021-09-22 15:41:34 +00:00
Nino Righi
04f74b6628 Merged PR 870: #1860 Pipe Replace all Occurences and make it case-insensitive
#1860 Pipe Replace all Occurences and make it case-insensitive
2021-09-22 15:39:02 +00:00
Nino Righi
898374cdeb Merged PR 869: #2209 TK Ongoing Tasks Implementation
#2209 TK Ongoing Tasks Implementation
2021-09-22 15:38:36 +00:00
Nino Righi
0db8688f19 Merged PR 868: #2208 WE Goods In List Empty List Page
#2208 WE Goods In List Empty List Page
2021-09-22 15:37:03 +00:00
Lorenz Hilpert
286024739f Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-09-22 17:36:06 +02:00
Lorenz Hilpert
771fb802ec #2103 Warenbegleitschein auf dem Desktop eröffnen 2021-09-22 17:35:56 +02:00
Lorenz Hilpert
9e34b35888 Merge branch 'develop' into release/1.5 2021-09-22 15:10:51 +02:00
Lorenz Hilpert
08a2abb773 @swagger-eis update 2021-09-22 14:41:35 +02:00
Nino Righi
dd904a863e Merged PR 867: #1860 TK Display Category Replace String
#1860 TK Display Category Replace String
2021-09-22 09:35:29 +00:00
Nino Righi
15f5aa7d10 Merged PR 858: #2204 WE Reorder Modal Breadcrumb Fix and Display Correct Item after Action C...
#2204 WE Reorder Modal Breadcrumb Fix and Display Correct Item after Action Click
2021-09-22 09:34:22 +00:00
Lorenz Hilpert
647f5a06be UI Fix - Icon Format ausblenden wenn nicht verfügabr 2021-09-22 11:25:37 +02:00
Lorenz Hilpert
f501bab5d2 #2221 Detailansicht wird nicht geladen wenn Bestellnummer (slash) enthält 2021-09-22 11:21:43 +02:00
Andreas Schickinger
19539da8aa Merged PR 861: #2211 Reservieren in andere Filiale - Stockabfrage mit Branch
#2211 Reservieren in andere Filiale - Stockabfrage mit Branch

Related work items: #2211
2021-09-21 15:10:36 +00:00
Nino Righi
33173f88f3 Merged PR 862: #1898 Fade Sundays in calendar mode month
#1898 Fade Sundays in calendar mode month
2021-09-21 15:09:34 +00:00
Andreas Schickinger
a75febfeed Merged PR 863: #1661 TK Updatenotiz im Popup anzeigen
#1661 TK Updatenotiz im Popup anzeigen

Related work items: #1661
2021-09-21 15:08:58 +00:00
Andreas Schickinger
d786adb604 Merged PR 864: #1660 TK Updatenotiz Icon in der Liste anzeigen
#1660 TK Updatenotiz Icon in der Liste anzeigen

Related work items: #1660
2021-09-21 15:08:26 +00:00
Andreas Schickinger
96e147d26c Merged PR 865: #2213 Wareneingangsliste Vorname Nachname Reihenfolge
#2213 Wareneingangsliste Vorname Nachname Reihenfolge

Related work items: #2213
2021-09-21 15:08:01 +00:00
Andreas Schickinger
1e66a624ef Merged PR 860: #1898 TK Änderungen in der Kalenderansicht
#1898 TK Änderungen in der Kalenderansicht

Related work items: #1898
2021-09-21 10:21:45 +00:00
Nino Righi
9bc93396d4 Merged PR 859: #2205 Reservations Implemented Notification for Empty Result List
#2205 Reservations Implemented Notification for Empty Result List
2021-09-20 15:30:18 +00:00
Andreas Schickinger
af307b7691 Merged PR 854: #1861 TK - Vergrößerung Teaserbild bei Klick
#1861 TK - Vergrößerung Teaserbild bei Klick

Related work items: #1861
2021-09-20 14:17:01 +00:00
Andreas Schickinger
65c9539e80 Merged PR 857: #2203 Mengendropdown maximal Werte
#2203 Mengendropdown maximal Werte

Related work items: #2203
2021-09-20 14:15:34 +00:00
Nino Righi
16ca761e3d Merged PR 855: #2201 WA Result List Print Shipping Note Fix and Code Improvements inside Act...
#2201 WA Result List Print Shipping Note Fix and Code Improvements inside Action Handlers
2021-09-20 12:44:59 +00:00
Andreas Schickinger
6e9c5a4300 Merged PR 856: #1860 TK Anzeige Abteilung
#1860 TK Anzeige Abteilung

Related work items: #1860
2021-09-20 12:44:07 +00:00
Lorenz Hilpert
7c2b556b0b Update Minor Version 4 => 5 2021-09-20 12:04:24 +02:00
Lorenz Hilpert
4a0c1269cb Merge branch 'release/1.4' 2021-09-20 12:02:10 +02:00
Lorenz Hilpert
7920c8acd1 Merge branch 'release/1.4' into develop 2021-09-20 12:02:05 +02:00
Lorenz Hilpert
4e8b5557fc Navigation auf Artikelsuche => merge conflict behoben 2021-09-20 12:01:40 +02:00
Lorenz Hilpert
50ae31a0b5 Merge branch 'release/1.4' into master 2021-09-20 11:47:01 +02:00
Nino Righi
f6da92ee92 Merged PR 853: #2195 AHF OrderAtSupplier
#2195 AHF OrderAtSupplier
2021-09-17 16:30:00 +00:00
Nino Righi
3482b68f29 Merged PR 852: #2199 WE Reorder Modal Refresh Details
#2199 WE Reorder Modal Refresh Details
2021-09-17 14:35:12 +00:00
Nino Righi
e907784528 Merged PR 851: #2197 Reservations Routing from Details back to Reservation List after Action...
#2197 Reservations Routing from Details back to Reservation List after Action arrived and print
2021-09-17 14:18:18 +00:00
Nino Righi
26dc615a8c Merged PR 850: #2198 Removed edit branch CTA inside Checkout Review
#2198 Removed edit branch CTA inside Checkout Review
2021-09-17 14:17:24 +00:00
Nino Righi
aef54b9f83 Merged PR 849: #2196 Reservieren InStock Loading Spinner and Styling
#2196 Reservieren InStock Loading Spinner and Styling
2021-09-17 12:14:35 +00:00
Nino Righi
f0a4006ef0 Merged PR 848: Merge Release 1.4 into Develop Branch
Merge Release 1.4 into Develop Branch
2021-09-17 10:35:19 +00:00
Nino Righi
ab93bccb00 Merge Release 1.4 into Develop Branch 2021-09-17 12:11:50 +02:00
Nino Righi
20c95a8a26 Merged PR 846: #2189 Action Reorder Modal Implementation
#2189 Action Reorder Modal Implementation
2021-09-16 16:00:29 +00:00
Andreas Schickinger
4adb5f074e Merged PR 844: #2186 Filter zurücksetzen, wenn URL ohne Parameter aufgerufen wird (Menü Klick)
#2186 Filter zurücksetzen, wenn URL ohne Parameter aufgerufen wird (Menü Klick)

Related work items: #2186
2021-09-16 15:55:37 +00:00
Andreas Schickinger
6aa98b8de6 Merged PR 845: #2164 WE Load Spinner für jede Aktion
#2164 WE Load Spinner für jede Aktion

Related work items: #2164
2021-09-16 15:55:23 +00:00
Nino Righi
17214b41d5 Merged PR 843: #2188 Reservieren, AHF, Goods-Out-Results Actions and Select Bullet Improvements
#2188 Reservieren, AHF, Goods-Out-Results Actions and Select Bullet Improvements
2021-09-16 14:11:44 +00:00
Andreas Schickinger
80a75df458 Merged PR 841: #2114 Reservieren in eine andere Filiale
#2114 Reservieren in eine andere Filiale

Related work items: #2114
2021-09-16 13:54:05 +00:00
Andreas Schickinger
d3ac8d3ab5 Merged PR 842: #2192 WE Abholfachbereinigungsliste und Reservieren changeStatus Aufruf fix
#2192 WE Abholfachbereinigungsliste und Reservieren changeStatus Aufruf fix

Related work items: #2192
2021-09-16 13:52:09 +00:00
Nino Righi
9e76cfecfd Merged PR 840: #2179 #2191 WA WE Lieferschein Drucken
#2179 #2191 WA WE Lieferschein Drucken
2021-09-16 12:34:43 +00:00
Nino Righi
f26becc505 Merged PR 839: #2176 #2177 Ipad Styling and Dropdown Scrolling Fix
#2176 #2177 Ipad Styling and Dropdown Scrolling Fix
2021-09-16 07:11:22 +00:00
Andreas Schickinger
09ac9bee7a Merged PR 838: #2169 Bugfix bei der Bestandsabfrage im Fenster weitere Verfügbarkeiten
#2169 Bugfix bei der Bestandsabfrage im Fenster weitere Verfügbarkeiten

Related work items: #2169
2021-09-15 16:13:08 +00:00
Andreas Schickinger
e728860dd4 Merged PR 837: #2169 PDP Weitere Verfügbarkeiten Ladeverhalten angepasst
#2169 PDP Weitere Verfügbarkeiten Ladeverhalten angepasst

Related work items: #2169
2021-09-15 14:26:27 +00:00
Nino Righi
6c52fcd555 Merged PR 836: #2161 Ui Scroll Container Implementation
#2161 Ui Scroll Container Implementation
2021-09-15 11:35:43 +00:00
Andreas Schickinger
7ad7177f89 Merged PR 834: #2174 WE, WA Primärfilter beibehalten
#2174 WE, WA Primärfilter beibehalten

Related work items: #2174
2021-09-15 11:10:34 +00:00
Andreas Schickinger
870b60320f Merged PR 835: #2185 WE Zubuchen Button falscher CompartmentCode
#2185 WE Zubuchen Button falscher CompartmentCode

Related work items: #2185
2021-09-15 11:05:56 +00:00
Andreas Schickinger
df3340afef Merged PR 833: #2171 Breadcrumb anhand des geklickten Items erstellen, anstatt des ersten
#2171 Breadcrumb anhand des geklickten Items erstellen, anstatt des ersten

Related work items: #2171
2021-09-15 11:05:18 +00:00
Andreas Schickinger
b8e409e92b Merged PR 832: #2175 WE Reservieren Refresh fix
#2175 WE Reservieren Refresh fix

Related work items: #2175
2021-09-15 11:03:34 +00:00
Andreas Schickinger
0fa8f36144 Merged PR 831: #2173 Quantity Dropdown Breite und "springen" angepasst
#2173 Quantity Dropdown Breite und "springen" angepasst

Related work items: #2173
2021-09-14 11:41:49 +00:00
Andreas Schickinger
3cdec75079 Merged PR 830: #2172 WE Alle auswählen entfernen
#2172 WE Alle auswählen entfernen

Related work items: #2172
2021-09-14 11:40:38 +00:00
Andreas Schickinger
6d4373ae14 Merged PR 829: #2170 Wareneingang Kartenhöhe auf 60px angepasst
#2170 Wareneingang Kartenhöhe auf 60px angepasst

Related work items: #2170
2021-09-14 11:38:49 +00:00
Nino Righi
0883012a67 Merged PR 828: #2166 Update Remi and Cat Swagger, Domain Services and Reservation Result List
#2166 Update Remi and Cat Swagger, Domain Services and Reservation Result List
2021-09-14 07:29:07 +00:00
Andreas Schickinger
c4a5f21869 Merged PR 826: #2101 Abholfbachbereinigungsliste keine Posten Anzeige
#2101 Abholfbachbereinigungsliste keine Posten Anzeige

Related work items: #2101
2021-09-13 16:32:40 +00:00
Andreas Schickinger
da8bcffd0b Merged PR 825: #2098 Wareneingangsliste Meldetext ohne Meldenummer
#2098 Wareneingangsliste Meldetext ohne Meldenummer

Related work items: #2098
2021-09-13 16:28:16 +00:00
Andreas Schickinger
bf53c30d24 Merged PR 827: #2165 WA Teilabholung fix
#2165 WA Teilabholung fix

Related work items: #2165
2021-09-13 16:24:34 +00:00
Nino Righi
fe1c59607f Merged PR 824: #2111 #2160 Wareneingang Reservieren
#2111 #2160 Wareneingang Reservieren
2021-09-13 09:32:38 +00:00
Andreas Schickinger
5d0915ffd6 Merged PR 823: #2100 Abholfachbereinigungsliste Fixes
#2100 Abholfachbereinigungsliste Fixes

Related work items: #2100
2021-09-09 15:38:53 +00:00
Andreas Schickinger
061b962359 Merged PR 820: #2100 Abholfachbereinigungsliste
#2100 Abholfachbereinigungsliste

Related work items: #2100
2021-09-09 15:04:26 +00:00
Nino Righi
9449a90ec8 Merged PR 822: #2156 Hotfix V2
#2156 Hotfix V2
2021-09-09 14:58:01 +00:00
Nino Righi
7b08134bc7 Merged PR 819: #2156 Hotfix Remission List Card Hide Actions if inStock is 0
#2156 Hotfix Remission List Card Hide Actions if inStock is 0
2021-09-09 14:17:49 +00:00
Nino Righi
d627a263c3 Merged PR 818: #2152 WE WA Search Main Implemented Scan Provider and Fixed Styling inside Re...
#2152 WE WA Search Main Implemented Scan Provider and Fixed Styling inside Result List
2021-09-09 08:26:54 +00:00
Nino Righi
d500bd047a Merged PR 817: #2154 TK Symbol Deactivated
#2154 TK Symbol Deactivated
2021-09-09 08:23:34 +00:00
Andreas Schickinger
590407d04a Merged PR 814: #2148 Wareneingangsliste Anpassungen
Related work items: #2148
2021-09-08 15:27:17 +00:00
Nino Righi
236d81de15 Merged PR 816: #2150 #2151 WA WE Implemented Loading Spinner and Deactivation Logic, Changed...
#2150 #2151 WA WE Implemented Loading Spinner and Deactivation Logic, Changed Wording for Datepicker
2021-09-08 15:14:21 +00:00
Andreas Schickinger
8c3e3ed309 Merged PR 815: #2149 WE Nachbestellen Popup Anpassungen
#2149 WE Nachbestellen Popup Anpassungen

Related work items: #2149
2021-09-08 14:35:08 +00:00
Nino Righi
7cf8201b48 Merged PR 811: #2147 WA Fix Wording for fetched CTA inside results
#2147 WA Fix Wording for fetched CTA inside results
2021-09-08 11:37:52 +00:00
Andreas Schickinger
b34f7ad5f0 Merged PR 813: #2146 Wareneingangsliste veraltete Refresh Logik entfernt und Test fixes
#2146 Wareneingangsliste veraltete Refresh Logik entfernt und Test fixes

Related work items: #2146
2021-09-07 15:31:51 +00:00
Nino Righi
850743e2ee Merged PR 812: #2126 WE History changed API Request
#2126 WE History changed API Request
2021-09-07 15:07:42 +00:00
Andreas Schickinger
e46c6f258a Merged PR 810: OMS API aktualisiert
OMS API aktualisiert
2021-09-07 13:50:40 +00:00
Andreas Schickinger
89cc11d9c5 Merged PR 809: #2143, #2144 Nachbestellen Filialbestand, ErrorHandling und Test fixes
#2143, #2144 Nachbestellen Filialbestand, ErrorHandling und Test fixes

Related work items: #2143, #2144
2021-09-07 13:50:21 +00:00
Nino Righi
355be3bddb Merged PR 808: #2127 WE Navigation to Goods In Landing Page after Action Arrived got executed
#2127 WE Navigation to Goods In Landing Page after Action Arrived got executed
2021-09-07 13:46:38 +00:00
Nino Righi
a7e310b931 Merged PR 807: #2139 Remi Überlauf Added InStock to ReturnAddReturnSuggestion request
#2139 Remi Überlauf Added InStock to ReturnAddReturnSuggestion request
2021-09-07 09:21:50 +00:00
Nino Righi
2b500784c4 Merged PR 806: Merge Wareneingang into Develop
Merge Wareneingang into Develop

Related work items: #1830, #1842, #1843, #2086, #2141
2021-09-06 15:04:18 +00:00
Andreas Schickinger
79a62b4db9 Merged PR 803: #2120 Dashboard Coveranzeige scrollbar
#2120 Dashboard Coveranzeige scrollbar

Related work items: #2120
2021-09-06 13:57:30 +00:00
Lorenz Hilpert
f19df87ba0 #2070 WK Bestellung zur Abholung klappt nicht - Online 2021-08-25 14:53:40 +02:00
Lorenz Hilpert
b0ac76fa36 #2076 Aufgaben in Bearbeitung rot anzeigen, wenn überfällig 2021-08-20 11:09:03 +02:00
Lorenz Hilpert
ec33987f74 #2078 #2077 Artikelliste in Artikelsuche oeffnen 2021-08-18 16:41:53 +02:00
Andreas Schickinger
7de8ae9892 Merged PR 782: TK Hotfix Anpassungen
#2066 Fallback auf taskDate, wenn kein publicationDate vorhanden (duplizierte Vorabinfos)

Related work items: #2066
2021-08-13 08:49:13 +00:00
Andreas Schickinger
ad6d1db28a #2066 Schreibweise geändert 2021-08-12 13:11:34 +02:00
Andreas Schickinger
83bee04e1d #2066 Wenn es kein publicationDate gibt (duplizierte Vorabinfos), dann Prüfung auf taskDate 2021-08-12 13:07:20 +02:00
Andreas Schickinger
be25060134 Merged PR 781: TK Hotfix
Related work items: #1832, #1862, #1970, #1972, #1987, #2065, #2066, #2067
2021-08-12 07:55:49 +00:00
Andreas Schickinger
8cb9fb8ce1 #2067 TK Abstand Heute erhöht 2021-08-11 16:34:07 +02:00
Andreas Schickinger
0d809bef04 #2066 TK Datumsprüfung angepasst 2021-08-11 16:28:25 +02:00
Andreas Schickinger
8b2c115482 #2065 Bei Überfälligkeits Datum eine Sekunde abziehen, wenn 0 Uhr 2021-08-11 12:53:37 +02:00
Andreas Schickinger
80af6a16a4 #1972 Vorabinfos duplizieren und Anzeigelogik angepasst 2021-08-10 15:29:16 +02:00
Andreas Schickinger
7bf85060c5 #2066 Bearbeiten Button disabled Logik angepasst 2021-08-10 12:18:03 +02:00
Andreas Schickinger
1a2960cbde #1832 Listenansicht Uhrzeit linksbündig 2021-08-10 11:30:02 +02:00
Andreas Schickinger
afcc76b8af #2067 Abstand Heute CTA erhöht 2021-08-09 17:53:23 +02:00
Andreas Schickinger
26029defb0 #2065 zu Erledigen bei Vorabinfo angepasst 2021-08-09 17:18:16 +02:00
Andreas Schickinger
e1d19483ba #1987 Status rot für überfällig 2021-08-09 16:55:36 +02:00
Andreas Schickinger
e606d84700 #1862 Sonderinfo Label anzeigen 2021-08-09 16:03:40 +02:00
Andreas Schickinger
19cedb10fc #1970 Sonderinfo nicht als Vorabinfo anzeigen 2021-08-09 16:03:16 +02:00
Andreas Schickinger
2536e6a8ae #1832 Drucken rechtsbündig 2021-08-09 13:50:25 +02:00
Andreas Schickinger
9430b00988 TK Menu Icon enabled 2021-08-09 12:07:53 +02:00
Lorenz Hilpert
d04b93e417 disable print for b2b order 2021-08-05 13:47:56 +02:00
Nino Righi
5c3d8f6d87 Merged PR 778: #2044 Article Search Fix Tab Index to Start Searching after hitting Tab and E...
#2044 Article Search Fix Tab Index to Start Searching after hitting Tab and Enter
2021-08-02 15:56:59 +00:00
Nino Righi
eaab1529ec Merged PR 779: #2045 Bugfix Article Search Autocomplete Select Autocomplete Items correctly...
#2045 Bugfix Article Search Autocomplete Select Autocomplete Items correctly after click
2021-08-02 15:56:34 +00:00
Lorenz Hilpert
1a2ec3d257 Fehlerhandling bei Bestellabschluss
CODE >= 400 Wird abgefangen
CODE 409 Wird abgeschlossen
2021-07-30 16:37:02 +02:00
Nino Righi
83fa71a91d Merged PR 777: #2041 Checkout Update Width and positioning of Branch Pick Up Dropdown
#2041 Checkout Update Width and positioning of Branch Pick Up Dropdown
2021-07-30 09:54:46 +00:00
Lorenz Hilpert
d160d0f3c6 #2040 Drucker aus der Liste setzen wenn kein default drucker verfügbar ist 2021-07-30 11:29:08 +02:00
Lorenz Hilpert
e36f506336 #2040 Print Dialog - Anpassung Dropdown breite - min-width 255 2021-07-29 18:55:55 +02:00
Lorenz Hilpert
d454771c77 Filter - QueryToken - Alle ausgewählten Options übernehmen
Styling Checkbox - padding bottom auf 1 rem
2021-07-29 17:48:25 +02:00
Lorenz Hilpert
4e478f2fc5 IPad Searchbox autocomplete - bg white gesetzt 2021-07-29 17:28:15 +02:00
Nino Righi
e036893436 Merged PR 774: #1955 Article Search Bugfix Autocomplete Dropdown not Overlapping History cor...
#1955 Article Search Bugfix Autocomplete Dropdown not Overlapping History correctly on Ipad
2021-07-29 13:43:41 +00:00
Nino Righi
84bff1aeac Merged PR 775: #2037 Fix Layout Article Search Availabilites Text Heading
#2037 Fix Layout Article Search Availabilites Text Heading
2021-07-29 13:43:00 +00:00
Nino Righi
0a4b7dca0d Merged PR 776: #2038 Fix Routing to Result Page inside Checkout CTA Weiter Einkaufen
#2038 Fix Routing to Result Page inside Checkout CTA Weiter Einkaufen
2021-07-29 13:42:20 +00:00
Lorenz Hilpert
ea1bc51430 Weitere Verfügbarkeiten auf 15 erhöht 2021-07-29 12:19:42 +02:00
Lorenz Hilpert
610d2a171b Merge branch 'develop' into release/1.4 2021-07-29 11:51:27 +02:00
Lorenz Hilpert
a567152580 #2036 Autocomplete löst keine Suche aus 2021-07-28 18:49:00 +02:00
Lorenz Hilpert
932efecd63 #2034 Mehrfachanzeige von Druckern 2021-07-28 18:24:23 +02:00
Nino Righi
61195fa673 Merged PR 772: #2032 Fix Position Filter Button and Close Button on Ipad, Update Filter Active color correctly
#2032 Fix Position Filter Button and Close Button on Ipad, Update Filter Active color correctly
2021-07-28 15:36:22 +00:00
Lorenz Hilpert
a0277b879b Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-07-28 17:35:45 +02:00
Lorenz Hilpert
50f66d2949 Debug Loggin entfernt 2021-07-28 17:35:35 +02:00
Lorenz Hilpert
cfea1a916c #2035 Filter Overlay schließt nicht automatisch nach Suche 2021-07-28 17:35:03 +02:00
Nino Righi
25085eb314 Merged PR 771: #2030 Article Search Fix Autocomplete Type if Filter Chip Author or Title is...
#2030 Article Search Fix Autocomplete Type if Filter Chip Author or Title is active
2021-07-28 14:39:30 +00:00
Lorenz Hilpert
a703be64fc #2034 falscher Drucker ausgewählt 2021-07-28 16:37:48 +02:00
Nino Righi
17eabd6cf4 Merged PR 770: #2032 Article Search Bugfix Positioning Filter Button and Close Overlay Button
#2032 Article Search Bugfix Positioning Filter Button and Close Overlay Button
2021-07-28 11:09:29 +00:00
Lorenz Hilpert
0b5a4fe255 #2031 Artikel hinzufügen - Doppelt in Remi-Liste angezeigt 2021-07-28 11:21:46 +02:00
Lorenz Hilpert
63a8edbced Merge branch 'develop' into release/1.4 2021-07-27 17:26:16 +02:00
Nino Righi
66a1906977 Merged PR 769: #2019 Fix Text Color of Inactive Filter Chip
#2019 Fix Text Color of Inactive Filter Chip
2021-07-27 15:12:58 +00:00
Lorenz Hilpert
913b68f08d #2019 Schriftfarbe im nicht aktiven Primärfilter 2021-07-27 15:51:01 +02:00
Nino Righi
579a5a013a Merged PR 766: #2000 Remission Network Error, changed Wording and Fixed Pipe of Undefined Er...
#2000 Remission Network Error, changed Wording and Fixed Pipe of Undefined Error if no connection is available
2021-07-27 13:29:28 +00:00
Nino Righi
d59b7a9475 Merged PR 767: #2017 Article Search Scanner Emits Search Request
#2017 Article Search Scanner Emits Search Request
2021-07-27 13:29:06 +00:00
Nino Righi
c0da3f0f8c Merged PR 768: #2029 Fix Login OAuthErrorEvent
#2029 Fix Login OAuthErrorEvent
2021-07-27 13:28:30 +00:00
Lorenz Hilpert
658a0615d7 #2023 Remi-Liste laden nach Remi-Start 2021-07-27 15:27:51 +02:00
Lorenz Hilpert
370ee15bdb REMI - Nachladen vorn Produkten verhindern wenn alle bereits geladen wurden 2021-07-27 15:21:46 +02:00
Nino Righi
7b42fd285e Merged PR 764: #2010 Bugfix Customer Set Validation Error
#2010 Bugfix Customer Set Validation Error
2021-07-27 07:13:25 +00:00
Nino Righi
a7b9dce96c Merged PR 765: #2019 Updated Filter Color Scheme for Customer Section
#2019 Updated Filter Color Scheme for Customer Section
2021-07-27 07:13:00 +00:00
Lorenz Hilpert
1dbce8ffd8 IPad Login Fix 2021-07-27 08:47:08 +02:00
Lorenz Hilpert
0fec3a7305 #1998 TK ausgrauen 2021-07-26 21:22:46 +02:00
Lorenz Hilpert
c906d0b423 IPad test 2021-07-26 18:09:14 +02:00
Lorenz Hilpert
dd7f371dc7 IPAD Login FIX 2021-07-26 18:00:54 +02:00
Lorenz Hilpert
e3a164e2fa IPad Login Bug 1 2021-07-26 17:17:48 +02:00
Nino Righi
5232dcbb5a Merged PR 762: #2016 #2004 Dashboard Bugfixes Routing to Details and Initial Route
#2016 #2004 Dashboard Bugfixes Routing to Details and Initial Route
2021-07-26 13:57:09 +00:00
Nino Righi
3a50793b49 Merged PR 763: #2018 Article Search Requeyt Update TTL memorize decorator
#2018 Article Search Requeyt Update TTL memorize decorator
2021-07-26 13:56:50 +00:00
Lorenz Hilpert
255b211688 SCANNER TEST 3 2021-07-26 15:32:20 +02:00
Lorenz Hilpert
aefeceb65f SCAN TEST 2 2021-07-26 15:12:41 +02:00
Lorenz Hilpert
94303230f9 SCANNER TEST 1 2021-07-26 14:22:47 +02:00
Nino Righi
2397f13edf Merged PR 761: #2011 Article Results Reset Scroll Position After Ordering Items
#2011 Article Results Reset Scroll Position After Ordering Items
2021-07-26 10:00:03 +00:00
Lorenz Hilpert
beba077408 #2012 Am Ende der Trefferliste wird weiter gefetcht 2021-07-26 10:43:59 +02:00
Lorenz Hilpert
e76a8299ed #2013 Loader wird nicht angezeigt 2021-07-26 10:32:10 +02:00
Lorenz Hilpert
43ebda6bb2 Merged PR 760: Filter Artikelsuche
Related work items: #2008
2021-07-26 04:40:48 +00:00
Lorenz Hilpert
f38f0954c6 Merge branch 'release/1.4' into develop 2021-07-22 14:37:42 +02:00
Nino Righi
91bf4cbc54 Merged PR 758: #1836 #2006 PDP Überarbeitung Autorenlink, Scroll Top Arrow, Styling
#1836 #2006 PDP Überarbeitung Autorenlink, Scroll Top Arrow, Styling
2021-07-22 12:37:07 +00:00
Lorenz Hilpert
f14937f18f Merge branch 'release/1.4' into develop 2021-07-21 16:16:40 +02:00
Nino Righi
d331eadd33 Merged PR 757: #1836 PDP TrimPipe Fix
#1836 PDP TrimPipe Fix
2021-07-21 14:16:24 +00:00
Lorenz Hilpert
e7fa87f695 Merge branch 'release/1.4' into develop 2021-07-21 16:15:49 +02:00
Nino Righi
30d279ea3d Merged PR 756: #1836 PDP Styling Fix
#1836 PDP Styling Fix
2021-07-21 13:51:51 +00:00
Lorenz Hilpert
4bb2ecdab1 Merge branch 'release/1.4' into develop 2021-07-21 12:01:03 +02:00
Nino Righi
bef79e3a9b Merged PR 755: #1836 #1070 PDP Überarbeitung und Fortsetzungsartikel
#1836 #1070 PDP Überarbeitung und Fortsetzungsartikel
2021-07-21 09:59:12 +00:00
Lorenz Hilpert
ed1d521aa8 Merge branch 'release/1.4' into develop 2021-07-20 18:00:18 +02:00
Lorenz Hilpert
e360a9bc22 Merge branch 'develop' into release/1.4 2021-07-20 17:52:06 +02:00
Lorenz Hilpert
708650cb55 Merged PR 754: REMI - Artikel zur REMI Liste hinzufügen
Related work items: #1999
2021-07-19 16:29:44 +00:00
Nino Righi
6a55b7cdde Merged PR 753: #1995 bugfix online customer invalid domain
#1995 bugfix online customer invalid domain
2021-07-19 15:06:44 +00:00
Lorenz Hilpert
0b29647e9c Merged PR 752: Revert '#1993 PDP Empfehlungen Fallback auf ID wenn digId nicht vorhanden'
#1993 PDP Empfehlungen Fallback auf ID wenn digId nicht vorhanden

Reverts !747
2021-07-15 12:09:35 +00:00
Lorenz Hilpert
aab0f0720b #1975 Print Shipping Note 2021-07-15 13:57:02 +02:00
Lorenz Hilpert
07fb68666a #1975 Abfolger der Commands und Gruppierung der Bestellungen 2021-07-14 17:47:39 +02:00
Andreas Schickinger
93210c35b9 Merged PR 751: #1993 PDP Empfehlungen Fehler
#1993 PDP Empfehlungen Fehler

Related work items: #1993
2021-07-14 11:27:32 +00:00
Nino Righi
075a84ab73 Merged PR 750: #1996 WA Bearbeiten Pflichtfelder markierung
#1996 WA Bearbeiten Pflichtfelder markierung
2021-07-14 11:27:21 +00:00
Andreas Schickinger
3af93ff4a5 Merged PR 747: #1993 PDP Empfehlungen Fallback auf ID wenn digId nicht vorhanden
#1993 PDP Empfehlungen Fallback auf ID wenn digId nicht vorhanden

Related work items: #1993
2021-07-13 16:07:26 +00:00
Andreas Schickinger
679842b624 Merged PR 745: #1991 Dashboard Artikelverlinkung Release
#1991 Artikelverlinkung im Dashboard

Related work items: #1991
2021-07-13 16:05:43 +00:00
Nino Righi
298fb819fb Merged PR 748: #1992 Bugfix Remission Loader and FetchWindow
#1992 Bugfix Remission Loader and FetchWindow
2021-07-13 16:05:22 +00:00
Lorenz Hilpert
f6f3de6e4c Merged PR 749: #1975 WWS Verbuchung bei bezahlter Bestellung in Filiale, wenn Lieferschein n...
#1975 WWS Verbuchung bei bezahlter Bestellung in Filiale, wenn Lieferschein nicht gedruckt
2021-07-13 16:04:49 +00:00
Andreas Schickinger
70ec7ad4a5 Merged PR 744: #1978 Trefferliste Autorenlinks Ellipsis
#1978 Trefferliste Autorenlinks Ellipsis

Related work items: #1978
2021-07-09 08:27:33 +00:00
Lorenz Hilpert
1fc4030b6d Merged PR 743: Merge Into Realease 1.4
Related work items: #1937, #1942, #1944, #1952
2021-07-08 10:20:58 +00:00
Nino Righi
ebf40bfe3a Merged PR 742: #1981 Fix Checkout Review Changed Printer Type to Label
#1981 Fix Checkout Review Changed Printer Type to Label
2021-07-08 09:14:37 +00:00
Lorenz Hilpert
cd7f371e46 FIX: Bestellung DIG - Fehlende PayerReference 2021-07-08 11:12:48 +02:00
Lorenz Hilpert
691d18f296 #1982 Artikellink => Fehler 2021-07-07 14:53:37 +02:00
Lorenz Hilpert
0b5cdd7e19 Merge branch 'release/1.4' into develop 2021-07-07 12:02:52 +02:00
Lorenz Hilpert
0e10a40bc9 Update Config Inv API 2021-07-07 12:01:36 +02:00
Lorenz Hilpert
bdf3e5a5fe #1963 Rechnungsadresse wird nicht angezeigt 2021-07-07 11:25:48 +02:00
Lorenz Hilpert
83e3da58c7 Merge branch 'release/1.4' into develop 2021-07-07 10:49:46 +02:00
Lorenz Hilpert
ce4a09d2f8 Merged PR 741: Merge develop into release/1.4
Related work items: #1937, #1942, #1944, #1952
2021-07-07 08:46:23 +00:00
Andreas Schickinger
4497b78b03 Merged PR 740: #1942 Zu erledigen wird nun auch bei Aufgaben angezeigt
#1942 Zu erledigen wird nun auch bei Aufgaben angezeigt

Related work items: #1942
2021-07-07 08:42:36 +00:00
Andreas Schickinger
800ebb94f0 Merged PR 739: #1942 Bearbeitungszeitraum nur anzeigen, wenn vorhanden
#1942 Bearbeitungszeitraum nur anzeigen, wenn vorhanden

Related work items: #1942
2021-07-06 07:25:02 +00:00
Nino Righi
afc7165fe8 Merged PR 737: #1960 Bugfix Remove Process if Process gets closed and implemented versioning
#1960 Bugfix Remove Process if Process gets closed and implemented versioning
2021-07-02 13:19:02 +00:00
Nino Righi
4f5a98eed1 Merged PR 736: #1959 Fix Breadcrumb for Payer and Shipping Create/Edit and Customer Data Edit
#1959 Fix Breadcrumb for Payer and Shipping Create/Edit and Customer Data Edit
2021-07-02 11:59:52 +00:00
Nino Righi
19c4632605 Merged PR 735: #1008 Fix WA show tooltip triangle on details page
#1008 Fix WA show tooltip triangle on details page
2021-07-02 08:25:04 +00:00
Nino Righi
d375b7abf6 Merged PR 733: #1958 TK Vorabinfo Links ausgerichtet
#1958 TK Vorabinfo Links ausgerichtet
2021-07-01 14:42:32 +00:00
Nino Righi
d9cc58c332 Merged PR 734: #1949 Fix TK Printer Loading Spinner
#1949 Fix TK Printer Loading Spinner
2021-07-01 14:42:03 +00:00
Lorenz Hilpert
1e68fe7c3c #1954 Abstand zwischen Element zwar verkleiner 2021-07-01 16:41:29 +02:00
Lorenz Hilpert
84025f9879 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-07-01 13:33:02 +02:00
Lorenz Hilpert
120c44e6ab #1954 Abstand zwischen Element zwar verkleiner 2021-07-01 13:32:52 +02:00
Andreas Schickinger
85a90aba48 Merged PR 731: #1942 TK Bearbeitungszeitraum angepasst
#1942 TK Bearbeitungszeitraum angepasst

Related work items: #1942
2021-07-01 11:17:58 +00:00
Andreas Schickinger
efadbeedf9 Merged PR 732: #1952 PCL Drucken Fehlermeldung
#1952 Wenn der Service nicht erreichbar ist, öffnet sich der Druckdialog mit Fehlermeldung

Related work items: #1952
2021-07-01 11:16:50 +00:00
Lorenz Hilpert
fd31b20ab9 #1951 Anzeige des Status Ueberfaellig 2021-07-01 13:14:32 +02:00
Lorenz Hilpert
81553b0065 Update Swagger API 2021-07-01 13:06:33 +02:00
Lorenz Hilpert
28ba2bddd7 #1946 Fehlermeldung bei Filialkunden 2021-07-01 13:03:30 +02:00
Lorenz Hilpert
608833e2f4 #1941 Bestellstatus für nicht vorgemerkte Titel 2021-07-01 10:27:33 +02:00
Lorenz Hilpert
909945b3f2 #1955 Autovervollständigungsbox - Überdeckungseffekt 2021-07-01 10:18:36 +02:00
Andreas Schickinger
f23d6ae634 Merged PR 729: #1937 Warenausgabe Radio klickbaren Bereich vergrößern
#1937 Warenausgabe Radio klickbaren Bereich vergrößern

Related work items: #1937
2021-06-30 08:27:12 +00:00
Andreas Schickinger
b0bb686a35 Merged PR 730: #1944 Kundendetails Bestellungen Breadcrumb
#1944 Kundendetails Bestellungen Breadcrumb

Related work items: #1944
2021-06-30 08:26:21 +00:00
Lorenz Hilpert
43876e2ceb Customer eagerLoading set to 1 2021-06-30 10:00:44 +02:00
Nino Righi
c748bb8f50 Merged PR 727: #1938 Bugfix PDP take downloadAvailability if isDownload is true and supplier...
#1938 Bugfix PDP take downloadAvailability if isDownload is true and supplier is S
2021-06-29 11:34:01 +00:00
Lorenz Hilpert
80cda4960e #1940 Grosse Pdf-Dateien können nicht gedruckt werden 2021-06-29 13:33:14 +02:00
Lorenz Hilpert
52ccdd9dd0 #1921 PDF-Viewer nicht links-rechts scrollbar 2021-06-29 13:27:54 +02:00
Lorenz Hilpert
8c018be9e6 Merge branch 'develop' into release/1.4 2021-06-28 14:05:38 +02:00
Lorenz Hilpert
fc9805d43e #1425 Kundendetails Menge der Rechnungs- und Lieferadressen auf 5 begrenzen 2021-06-28 11:41:42 +02:00
Nino Righi
77d8b10062 Merged PR 725: #1930 #1931 #1932 Bugfix Availability PDP and check if item has S-Sigel
#1930 #1931 #1932 Bugfix Availability PDP and check if item has S-Sigel
2021-06-28 08:15:35 +00:00
Nino Righi
2475d8810a Merged PR 726: #1925 TK Fix PDF Close Button Position
#1925 TK Fix PDF Close Button Position
2021-06-28 08:14:16 +00:00
Lorenz Hilpert
a2e706ef07 #1556 Versand ins Ausland nicht erlauben 2021-06-25 16:42:50 +02:00
Lorenz Hilpert
fff90e5bc7 HttpErrorHandlerInterceptor abfangen der HttpErrors mit Black- und Whitelists 2021-06-25 16:18:01 +02:00
Nino Righi
6fba3b3a10 Merged PR 724: #1926 Bugfixes Breadcrumb and Caching in PDP and HFI. Styling changes (Displa...
#1926 Bugfixes Breadcrumb and Caching in PDP and HFI. Styling changes (Displaying Hits)
2021-06-25 13:43:50 +00:00
Andreas Schickinger
b545d48d68 Merged PR 723: #1924 Breadcrumb für Kundensuche erstellen
#1924 Breadcrumb für Kundensuche erstellen

Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>

Related work items: #1924
2021-06-25 13:43:35 +00:00
Lorenz Hilpert
b66fc7e1fd #1556 Versand ins Ausland nicht erlauben 2021-06-24 14:04:35 +02:00
Lorenz Hilpert
eb73359281 #15 Styling Vorabinfo 2021-06-24 13:24:52 +02:00
Lorenz Hilpert
341cf4fad2 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-06-24 13:19:22 +02:00
Lorenz Hilpert
d7dfeb8774 #15 PopUp Vorabinfo 2021-06-24 13:19:05 +02:00
Andreas Schickinger
131cc0a40a Merged PR 717: #1762 Warenausgabe Kundennummer in Listenansicht
#1762 Warenausgabe Kundennummer in Listenansicht

Related work items: #1762
2021-06-23 11:50:48 +00:00
Nino Righi
f40d93f178 Merged PR 718: #1899 HFI Trefferliste Bugfixes Scrollposition, Breadcrumb, Prozesse
#1899 HFI Trefferliste Bugfixes Scrollposition, Breadcrumb, Prozesse
2021-06-23 11:50:22 +00:00
Nino Righi
f1065e8592 Merged PR 720: #1919 Bugfix Reading Age Filter should contain only numbers
#1919 Bugfix Reading Age Filter should contain only numbers
2021-06-23 11:49:49 +00:00
Andreas Schickinger
4422a62f92 Merged PR 721: #1911 TK erledigte Aufgaben immer am Listenende anzeigen
#1911 TK erledigte Aufgaben immer am Listenende anzeigen

Related work items: #1911
2021-06-23 11:49:13 +00:00
Andreas Schickinger
19ec8dae4d Merged PR 722: #1920 Anlage Online Kunde E-Mail Validierung fix
#1920 Anlage Online Kunde E-Mail Validierung fix

Related work items: #1920
2021-06-23 11:48:29 +00:00
Andreas Schickinger
196276aa04 Merged PR 719: #1912 PDP Status nicht lieferbar prüfen
#1912 PDP Status nicht lieferbar prüfen

Related work items: #1912
2021-06-23 11:48:14 +00:00
Lorenz Hilpert
59e789603f #1556 Versand ins Ausland nicht erlauben 2021-06-21 17:38:38 +02:00
Lorenz Hilpert
a22d8e3aa8 Update Checkout API 2021-06-21 14:32:07 +02:00
Andreas Schickinger
9d11211cf2 Merged PR 716: #1902 Warenkorb Versandoptionen Filiale vorbelegt
#1902 Warenkorb Versandoptionen Filiale vorbelegt

Related work items: #1902
2021-06-21 12:20:40 +00:00
Lorenz Hilpert
fa9a034a9f #1879 Fallback auf Buyer entfernt 2021-06-21 14:18:53 +02:00
Nino Righi
4bf59eeffa Merged PR 715: #1905 Bugfix Printer Selection Checkout Summary
#1905 Bugfix Printer Selection Checkout Summary
2021-06-18 09:57:14 +00:00
Lorenz Hilpert
0d640f307c #1906 überfallige Aufgabe nicht in Vergangenheit anzeigen 2021-06-18 11:56:41 +02:00
Andreas Schickinger
aed47402c6 Merged PR 713: #1892 Warenkorb Abholung Filialanzeige
#1892 Warenkorb Abholung Filialanzeige

Related work items: #1892
2021-06-18 06:49:51 +00:00
Nino Righi
531bd3dad2 Merged PR 712: #1893 PDP Fix Print Button Position
#1893 PDP Fix Print Button Position
2021-06-17 14:45:04 +00:00
Lorenz Hilpert
b29f34f4a8 #1896 Weitere Medien werden über Rand angezeigt 2021-06-17 15:33:40 +02:00
Lorenz Hilpert
68a877eff5 web-view modal iframe size stylings 2021-06-16 15:44:45 +02:00
Lorenz Hilpert
b34babc622 #1881 Task Calendar Updating View Correctly and Fetching Weeks and Months 2021-06-16 15:32:04 +02:00
Lorenz Hilpert
407d2b0c1c Anpassung Configs 2021-06-16 11:30:26 +02:00
Lorenz Hilpert
f4a317228b #1887 Navigation auf Hauptseite wenn hits 0 ist 2021-06-16 09:04:41 +02:00
Lorenz Hilpert
18e017419b #1879 Fallback auf buyer wenn billing daten nicht verfügbar sind 2021-06-16 08:47:52 +02:00
Lorenz Hilpert
67bd078c4c Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-06-15 16:45:03 +02:00
Lorenz Hilpert
109e2c4d59 TK - List and Modal Styling Update 2021-06-15 16:44:37 +02:00
Andreas Schickinger
7f439573b3 Merged PR 711: #1883 WA - Routing nach Klick auf abgeholt und Lieferschein drucken
#1883 WA - Routing nach Klick auf abgeholt und Lieferschein drucken

Related work items: #1883
2021-06-15 14:21:24 +00:00
Nino Righi
b61ea10fe3 Merged PR 710: #1870 Article Search Autocomplete Mouse Hover on Option changes its Backgroun...
#1870 Article Search Autocomplete Mouse Hover on Option changes its Background Color
2021-06-15 14:20:52 +00:00
Andreas Schickinger
e0be3f1948 Merged PR 708: #1882 PromoPoints fallback auf 0
#1882 PromoPoints fallback auf 0

Related work items: #1882
2021-06-15 14:19:43 +00:00
Andreas Schickinger
beda3ffe44 Merged PR 707: #1411 Unerledigte Aufgaben an Folgetagen anzeigen
#1411 Unerledigte Aufgaben an Folgetagen anzeigen

Related work items: #1411
2021-06-15 14:19:10 +00:00
Nino Righi
720fe3e5c0 Merged PR 706: #1878 Task Calendar Fix, changes Status correctly if click on button Erneut B...
#1878 Task Calendar Fix, changes Status correctly if click on button Erneut Bearbeiten
2021-06-14 12:15:10 +00:00
Michael Auer
fdc9093466 Merge branch 'develop' into release/1.4 2021-06-11 11:00:56 +02:00
Nino Righi
16e3a4c0d6 Merged PR 704: #1873 HFI Loading Spinner Customer Orders List
#1873 HFI Loading Spinner Customer Orders List
2021-06-10 13:53:13 +00:00
Nino Righi
12c4f2e77b Merged PR 705: #1865 Fix Remission Quantity Value
#1865 Fix Remission Quantity Value
2021-06-10 13:52:51 +00:00
Nino Righi
d825e3cf10 Merged PR 703: #1867 Fix Article Search and Details Correctly Display Items without Category
#1867 Fix Article Search and Details Correctly Display Items without Category
2021-06-10 12:15:17 +00:00
Lorenz Hilpert
ed572de3ce product catalog img alt text 2021-06-10 11:23:23 +02:00
Nino Righi
1404be4cf6 Merged PR 702: #1865 Remission Limit Quantity 1000
#1865 Remission Limit Quantity 1000
2021-06-10 08:26:43 +00:00
Nino Righi
d7c65efdc4 Merged PR 701: #1850 Default Filter Active Button Styling
#1850 Default Filter Active Button Styling
2021-06-09 12:31:01 +00:00
Lorenz Hilpert
7dcb279a6b #334 Listenansicht 2021-06-09 14:30:04 +02:00
Lorenz Hilpert
7783f41d19 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-06-09 14:15:09 +02:00
Lorenz Hilpert
cca13d0b03 #21 Drucken 2021-06-09 14:14:59 +02:00
Nino Righi
93abeb0693 Merged PR 700: #1863 Added Filter Checkbox Styling Theme to Customer and Task Calendar Section
#1863 Added Filter Checkbox Styling Theme to Customer and Task Calendar Section
2021-06-09 11:31:24 +00:00
Lorenz Hilpert
22b80d5d32 #1858 Drucken-Button in PDF-Anhang fest auf Seite 1 2021-06-09 13:29:04 +02:00
Nino Righi
5a26a67dff Merged PR 694: #1809 Warengruppenfilter Hierarchisch
#1809 Warengruppenfilter Hierarchisch
2021-06-08 13:47:07 +00:00
Lorenz Hilpert
4a669c284f #1855 Länge der angezeigten Breadcrumb-Texte begrenzen 2021-06-08 12:58:18 +02:00
Lorenz Hilpert
c22deb8967 #1819 Verweis auf das Tablet 2021-06-08 12:49:35 +02:00
Lorenz Hilpert
19fb5718aa #1697 Scrollen im Notizbereich funktioniert nicht 2021-06-08 11:40:04 +02:00
Lorenz Hilpert
8aa0a21d86 Fix - Error Message Print Dialog 2021-06-07 13:53:58 +02:00
Lorenz Hilpert
a7177df37f #1295 Tshirtgrößen - XS 2021-06-07 11:30:19 +02:00
Lorenz Hilpert
223520f35e Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-06-02 13:19:35 +02:00
Lorenz Hilpert
665618490a #1812 Filter "Lesealter" - von/bis 2021-06-02 13:19:09 +02:00
Andreas Schickinger
43f1bfa49f Merged PR 699: #1808 Fehlermeldung behoben und Buch Icon für "PP" hinzugefügt
#1808 Fehlermeldung behoben und Buch Icon für "PP" hinzugefügt

Related work items: #1808
2021-06-01 11:12:58 +00:00
Andreas Schickinger
e0ecf7a871 Merged PR 698: #1826 Artikelsuche Breadcrumb setzt Filter zurück
#1826 Artikelsuche Breadcrumb setzt Filter zurück

Related work items: #1826
2021-06-01 11:11:54 +00:00
Lorenz Hilpert
fa73631441 #1833 Sync Status 5 in Beeline > ISA 2021-06-01 10:47:55 +02:00
Lorenz Hilpert
4d57191a6a #1849 Autovervollständigungsbox wird überdeckt 2021-06-01 10:40:33 +02:00
Lorenz Hilpert
79a0199234 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-05-31 16:15:11 +02:00
Lorenz Hilpert
22e77f7fd0 #1835 ISA Vormerkkennzeichen wird nicht gesetzt 2021-05-31 16:14:56 +02:00
Andreas Schickinger
eb07edaa8f Merged PR 695: #1846 PDP Fehler wenn kein Beschreibungstext existiert
#1846 PDP Fehler wenn kein Beschreibungstext existiert

Related work items: #1846
2021-05-31 13:56:03 +00:00
Andreas Schickinger
b76b23ed51 Merged PR 696: #1837 Dipl.-Ing. Label angepasst
#1837 Dipl.-Ing. Label angepasst

Related work items: #1837
2021-05-31 13:55:42 +00:00
Andreas Schickinger
76b68e7c8a Merged PR 697: #458 Query beim Filter schließen zurücksetzen
#458 Query beim Filter schließen zurücksetzen

Related work items: #458
2021-05-31 13:55:22 +00:00
Nino Righi
58536ef3f7 Merged PR 693: Fix Reading Age Filter and Added Error Message
Fix Reading Age Filter and Added Error Message
2021-05-28 12:35:43 +00:00
Lorenz Hilpert
751a175673 #1840 Teaser-Bild zu groß für Kachel 2021-05-28 11:19:19 +02:00
Lorenz Hilpert
3b83c8f14e #458 Searchbox Focus 2021-05-28 11:10:46 +02:00
Lorenz Hilpert
15d3da7b01 Fix Kundensuche keine Ergebnisse 2021-05-27 18:02:12 +02:00
Lorenz Hilpert
65ae3ef6e7 Fix Artikelsuche Prozesswechsel und Breadcrumb
Co-authored-by: schickinger <schickinger@users.noreply.github.com>
2021-05-27 17:53:15 +02:00
Lorenz Hilpert
c8e0457b67 Connect Breadcrumb to Catalog Search 2021-05-27 11:03:47 +02:00
Lorenz Hilpert
d71e30bedc Merge branch 'develop' into fix/catalog-filter 2021-05-27 11:03:25 +02:00
Andreas Schickinger
fd26415c2a Breadrumb Artikelsuche fix 2021-05-26 18:29:47 +02:00
Andreas Schickinger
ca80013212 Merge branch 'fix/catalog-filter' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into fix/catalog-filter 2021-05-26 17:52:45 +02:00
Andreas Schickinger
09cce0c609 Kundensuche Vorgangswechsel, Artikelsuche Breadcrumbs
Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>
Co-authored-by: l.hilpert@paragon-data.de <l.hilpert@paragon-data.de>
2021-05-26 17:51:20 +02:00
Lorenz Hilpert
9a637ba1ea Preserve Scroll Position 2021-05-26 17:35:09 +02:00
Lorenz Hilpert
06151fa380 #1835 Vormerker Kennzeichnung 2021-05-26 11:37:48 +02:00
Nino Righi
aea2511fa2 Fix Catalog Filter Commit 2021-05-26 09:11:51 +02:00
Andreas Schickinger
350e68d961 Merged PR 690: #1667 HFI Bestelldetails Einrückung bei Zeilenumbruch
#1667 HFI Bestelldetails Einrückung bei Zeilenumbruch

Related work items: #1667
2021-05-25 12:54:57 +00:00
Andreas Schickinger
967a7f3205 Merged PR 691: #1806 Kaufoptionen Popup - ersten Schritt nur bei Download überspringen
#1806 Kaufoptionen Popup - ersten Schritt nur bei Download überspringen

Related work items: #1806
2021-05-25 12:36:28 +00:00
Nino Righi
aad2f47154 Catalog Filter Store Refactor and Caching Service 2021-05-21 18:44:11 +02:00
Andreas Schickinger
e3e5340251 Merged PR 687: #1825 TK Wording angepasst
#1825 TK Wording angepasst

Related work items: #1825
2021-05-20 21:04:06 +00:00
Andreas Schickinger
c82d676742 Merged PR 688: #1667 HFI Bestelldetails Rechnungs- und Lieferadresse
#1667 HFI Bestelldetails Rechnungs- und Lieferadresse bei Versandbestellungen anzeigen

Related work items: #1667
2021-05-20 21:03:27 +00:00
Andreas Schickinger
a85ddaa3a9 Merged PR 689: #1815 Remission Abteilung Farbe angepasst
#1815 Remission Abteilung Farbe angepasst

Related work items: #1815
2021-05-20 21:03:08 +00:00
Nino Righi
1eba91d308 Catalog Filter Fix Update
Co-authored-by: l.hilpert@paragon-data.de <l.hilpert@paragon-data.de>
2021-05-20 19:12:31 +02:00
Nino Righi
d16c20ce57 Merge branch 'fix/catalog-filter' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into fix/catalog-filter 2021-05-20 13:44:02 +02:00
Nino Righi
414d08146d Fix Catalog Filter Commit 2021-05-20 13:43:53 +02:00
Lorenz Hilpert
aa5d86aab4 Merge branch 'develop' into fix/catalog-filter 2021-05-20 13:42:49 +02:00
Lorenz Hilpert
dba3e77aee History aus search state entfernt 2021-05-20 11:40:59 +02:00
Michael Auer
4e91ea6f85 ~ Version Bump: 1.4 2021-05-20 11:20:03 +02:00
Nino Righi
acadada245 Merged PR 677: #1812 Filter Lesealter
#1812 Filter Lesealter
2021-05-20 08:06:14 +00:00
Andreas Schickinger
5143e13ebe Merged PR 679: #1664 Bestellart Icons und Wording angepasst
#1664 Bestellart Icons und Wording angepasst

Related work items: #1664
2021-05-19 19:38:42 +00:00
Nino Righi
26308847d1 Merged PR 680: #1822 Pflichtfelder Lieferadresse B2B
#1822 Pflichtfelder Lieferadresse B2B
2021-05-19 19:37:39 +00:00
Nino Righi
7932e08c12 Merged PR 681: #1824 Articlesearch Autocomplete Search by Query and not Display Value
#1824 Articlesearch Autocomplete Search by Query and not Display Value
2021-05-19 19:35:41 +00:00
Andreas Schickinger
a3ec341ac3 Merged PR 682: #1734 TK Statusänderung erst ab Aufgabenbeginn möglich
#1734 TK Statusänderung erst ab Aufgabenbeginn möglich

Related work items: #1734
2021-05-19 19:34:42 +00:00
Andreas Schickinger
63d89d17a1 Merged PR 685: #1817 HFI Anlage Lieferadresse Titel
#1817 HFI Anlage Lieferadresse Titel

Related work items: #1817
2021-05-19 19:33:43 +00:00
Andreas Schickinger
a7b8c1963b Merged PR 686: #1774 Breadcrumb Navigation bei Vorgangswechsel
#1774 Breadcrumb Navigation bei Vorgangswechsel

Related work items: #1774
2021-05-19 19:32:50 +00:00
Lorenz Hilpert
e8ebdbddb6 update query params and breadcrumb params 2021-05-19 18:51:49 +02:00
Lorenz Hilpert
06274408dd Updated Catalog Store 2021-05-19 18:47:27 +02:00
Andreas Schickinger
45c7e14d25 Merged PR 683: #1821 TK Beschreibungsfeld Formatierung übernehmen
#1821 TK Beschreibungsfeld Formatierung übernehmen

Related work items: #1821
2021-05-19 13:35:29 +00:00
Lorenz Hilpert
955dcf11c7 #1799 #1814 Filter Focus im Suchfeld 2021-05-19 15:04:01 +02:00
Andreas Schickinger
f67bfce710 Merged PR 673: #1804 Kaufoptionen Popup Filialanzeige
#1804 Kaufoptionen Popup Filialanzeige

Related work items: #1804
2021-05-19 11:34:37 +00:00
Andreas Schickinger
46832d9855 Merged PR 678: #1803 PDP weitere Verfügbarkeiten Userbranch ausfiltern
#1803 PDP weitere Verfügbarkeiten Userbranch ausfiltern

Related work items: #1803
2021-05-19 11:33:40 +00:00
Lorenz Hilpert
c6946229a8 Feste id beim erstellen des Warenbegleitscheins entfernt 2021-05-19 11:22:49 +02:00
Lorenz Hilpert
749b8afded #1820 Anmerkungen werden nicht gespeichert 2021-05-18 18:23:22 +02:00
Lorenz Hilpert
7a55131d1f #1798 Fehlerdialog bei Remissionsstart mit bereits verwendeter Packstück-ID 2021-05-18 17:28:46 +02:00
Lorenz Hilpert
b027c150e2 #1815 Abteilungsremission - Abteilung anzeigen 2021-05-18 15:02:04 +02:00
Andreas Schickinger
91fb5be6bd Merged PR 676: #1805, #1806 PDP Abholung
#1805, #1806 PDP Abholung

Related work items: #1805, #1806
2021-05-18 11:34:08 +00:00
Andreas Schickinger
cfe9aa680d Merged PR 675: #1749 TK Footer Symbol Reihenfolge angepasst
#1749 TK Footer Symbol Reihenfolge angepasst
2021-05-18 08:34:45 +00:00
Andreas Schickinger
c415c8a220 Merged PR 672: #1803 PDP weitere Verfuegbarkeiten
#1803 PDP weitere Verfuegbarkeiten

Related work items: #1803
2021-05-18 08:05:18 +00:00
Lorenz Hilpert
a8e114da38 IPad Autofocus Test 2021-05-17 16:10:59 +02:00
Lorenz Hilpert
09a69a748c IPad Keyboard Focus 2021-05-17 15:58:27 +02:00
Lorenz Hilpert
9742a58792 Scanner Logik Fix 2021-05-17 15:43:21 +02:00
Lorenz Hilpert
69c8f9fe8c Scanner Suche 2021-05-17 15:02:36 +02:00
Lorenz Hilpert
fc4bf51b51 Scanner Artikelsuche 2021-05-17 14:54:40 +02:00
Lorenz Hilpert
6a329196d6 Merged PR 674: #1527 Client für Remi 2.0 anpassen
#1527 Client für Remi 2.0 anpassen
2021-05-17 12:48:46 +00:00
Lorenz Hilpert
2110eb59f9 Scannen für Artikelsuche aktualisiert 2021-05-17 13:45:17 +02:00
Lorenz Hilpert
61a385c2a0 #1736 Remi Listen umbenennen 2021-05-17 13:22:53 +02:00
Nino Righi
0b0fba44e6 Merged PR 671: #1809 Hotfix Filter
#1809 Hotfix Filter
2021-05-17 10:38:11 +00:00
Lorenz Hilpert
2219f2fcb9 added alert for debugging 2021-05-17 10:29:41 +02:00
Lorenz Hilpert
2d3fd78144 Unsubscribe Scanner after Scan 2021-05-17 10:19:47 +02:00
Lorenz Hilpert
1c0e7fe5f3 Start Search after Scanning 2021-05-17 10:07:53 +02:00
Lorenz Hilpert
dd9ed664df Suche starten nach scan 2021-05-17 09:51:14 +02:00
Lorenz Hilpert
db6fb718d8 Scandit aus App entfernt und Scannen für die Produktsuche 2021-05-16 18:12:10 +02:00
Nino Righi
d00098ae9a Merged PR 670: #1785 Bugfixes
#1785 Bugfixes
2021-05-14 08:13:31 +00:00
Nino Righi
6c1b452314 Merged PR 668: #1763 Filter Layout and Logic Changes
#1763 Filter Layout and Logic Changes
2021-05-14 08:11:38 +00:00
Andreas Schickinger
b612eecad3 Merged PR 667: #1801 PDP Produktbilder
#1801 PDP Produktbilder

Related work items: #1801
2021-05-14 08:09:17 +00:00
Andreas Schickinger
80c45d2cf7 Merged PR 666: #1800 PDP Split Autoren
#1800 PDP Split Autoren

Related work items: #1800
2021-05-14 08:08:38 +00:00
Andreas Schickinger
daa7964436 Merged PR 669: #1797 Filter Suche ohne Treffer
#1797 Filter Suche ohne Treffer

Related work items: #1797
2021-05-12 14:30:19 +00:00
Lorenz Hilpert
8921e50b40 #1796 Abholung + Rücklage kann nicht in WK gelegt werden 2021-05-11 18:26:35 +02:00
Andreas Schickinger
f86040ad9f Merged PR 665: #1792 PDP Slider Pfeile
#1792 PDP Slider Pfeile

Related work items: #1792
2021-05-11 15:59:22 +00:00
Andreas Schickinger
829fea5a51 Merged PR 663: #1787 PDP Mengenangabe falsche Farbe
#1787 PDP Mengenangabe falsche Farbe

Related work items: #1787
2021-05-11 11:37:44 +00:00
Nino Righi
87b8c06e36 Merged PR 664: #1795 Bugfix Changed Scroll-Arrow Top Position
#1795 Bugfix Changed Scroll-Arrow Top Position
2021-05-11 11:37:11 +00:00
Andreas Schickinger
8c0ad9f220 Merged PR 662: #1786 PDP Mehr Button nur wenn Text vorhanden
#1786 PDP Mehr Button nur wenn Text vorhanden

Related work items: #1786
2021-05-11 11:35:34 +00:00
Lorenz Hilpert
62634d231c #1788 keine Rücklage Filialentnahme ohne Bestand 2021-05-11 13:33:03 +02:00
Nino Righi
9eacd1fba2 Merged PR 661: #1791 Bugfix Article Search Autocomplete
#1791 Bugfix Article Search Autocomplete
2021-05-11 09:57:05 +00:00
Lorenz Hilpert
708dea26df #1790 Autoren-Link einzeln in suchen 2021-05-11 11:55:31 +02:00
Lorenz Hilpert
59e4f0f1d1 Merged PR 658: Merge into develop
Related work items: #1637, #1710, #1719, #1720
2021-05-10 16:26:44 +00:00
Lorenz Hilpert
b6b78245e1 Merged PR 660: TK Feature merge
Related work items: #10, #15, #16, #1591, #1592, #1604, #1611, #1617, #1618, #1628, #1632, #1637, #1644, #1655, #1676, #1681, #1682, #1683
2021-05-10 16:16:40 +00:00
Lorenz Hilpert
2294cd2788 #1789 UpdateAvailabilites fehlt vor UpdateDestination 2021-05-10 18:02:16 +02:00
Andreas Schickinger
246630f081 #1725 Bugfix Bestelldetails Kundenanzeige 2021-05-06 17:40:53 +02:00
Lorenz Hilpert
f22f26b11d #1726 Anzeige Lieferadresse in Bestellbestätigung 2021-05-04 13:48:52 +02:00
Lorenz Hilpert
04359c608d Set Notification Channels for CreateGuest and CreateBranch Customer 2021-05-03 15:38:35 +02:00
Lorenz Hilpert
221b79c365 #1713 Anzeige Herkunft der Bestell Nr 2021-04-30 10:26:26 +02:00
Lorenz Hilpert
c15bd04c67 #1713 Beeline Bestellnummer anzeigen 2021-04-28 15:03:39 +02:00
Lorenz Hilpert
ad097a6fe3 CustomerOrder Component pipe logic 2021-04-28 14:52:16 +02:00
Lorenz Hilpert
2fd44e7fe5 Update CustomerOrdersComponent to order.features.orderSource 2021-04-28 14:25:26 +02:00
Lorenz Hilpert
6ce6b3979b Anpassung nach Crm Api Update - linkedRecords 2021-04-28 11:02:28 +02:00
Lorenz Hilpert
2c12d247fb Generierung swagger apis crm und checkout 2021-04-28 10:51:43 +02:00
Nino Righi
1efbc8a28c #1711 Bugfix HFI Order List Gap 2021-04-27 15:30:01 +00:00
Lorenz Hilpert
c5d45d0f0b Update OMS API Url 2021-04-27 13:06:18 +02:00
Lorenz Hilpert
f584f9c381 #1701 Reference Id bei customer payer und shipping address setzen. 2021-04-26 11:00:48 +02:00
Lorenz Hilpert
cd5715eac7 #1701 Umstellung auf OMS-API v4 2021-04-26 10:30:19 +02:00
Lorenz Hilpert
51cc1792d3 #1641 #1692 NotificationChannel wird nicht gesetzt 2021-04-26 08:18:32 +00:00
Lorenz Hilpert
0b81eab636 #1695 Gastbesteller Dialog 2021-04-26 02:00:25 +02:00
Nino Righi
937c19882c #1678 Bugfix Customer Search Filter Removed Button Disable and Updated Init Filter Logic 2021-04-22 07:03:20 +00:00
Andreas Schickinger
ab40f0d18d #1578 Gastbesteller nur einmal nutzbar 2021-04-21 15:17:59 +02:00
Nino Righi
78eb1502cd #1631 Update Availabilities 2021-04-20 13:44:01 +02:00
Nino Righi
c62e9c6136 #1631 Refactor - Removed Search Service from Checkout Review Component 2021-04-19 17:18:20 +02:00
Nino Righi
550bd52e61 #1631 Update Bugfix 2021-04-19 15:59:08 +02:00
Nino Righi
c66a946e00 #1631 Bugfix Display B2B Customer Name and Organisation Correctly 2021-04-16 16:48:25 +02:00
Nino Righi
977171a332 Merge branch 'develop' into bugfix/1631-Anzeige-Bestelldetails 2021-04-16 15:34:02 +02:00
Nino Righi
e3dacdd4a4 #1631 Bugfix Updated Customer Order Details and Availability Service 2021-04-15 16:12:24 +02:00
Nino Righi
5096c1af91 #1633 Bugfix Article Search Display Last Search Requests 2021-04-14 11:41:40 +02:00
Nino Righi
1e2b206f13 #1599 WA Added Routing To Shelf Search After Pushing Pick Up Button 2021-04-13 11:29:08 +00:00
Nino Righi
cbed1e25cb #1577 WA Bugfix Update EnvirnomentChannel for Online, App and Mobile Channels 2021-04-13 13:10:18 +02:00
Nino Righi
2309e99d64 Merge branch 'develop' into feature/1609-Warenausgabe-Styling-Anmerkungsfeld 2021-04-13 11:14:04 +02:00
Nino Righi
16de5046c5 #1609 WA Styling Input Comment 2021-04-13 11:13:40 +02:00
Nino Righi
2209bb5a78 #1603 Customer Orders Changed Wording Of Online Orders 2021-04-12 18:15:37 +02:00
Lorenz Hilpert
b4f60bc3c9 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-04-06 11:44:57 +02:00
Lorenz Hilpert
490ce0c26a #1241 Fix - afterInitForm 2021-04-06 11:44:49 +02:00
Lorenz Hilpert
bab96a9c1a #1241 - Rechnungsadresse bearbeiten (B2B Kunde) 2021-04-06 11:42:27 +02:00
Andreas Schickinger
eb936c7d3f #1588 Import angepasst 2021-04-06 09:29:28 +00:00
Andreas Schickinger
cfcc6c8cce #1588 Benachrichtigungen im Store speichern erst beim Bestellen abschicken 2021-04-06 09:29:28 +00:00
Andreas Schickinger
9da304fd2b #1588 Warenkorb Benachrichtigungen direkt speichern 2021-04-06 09:29:28 +00:00
Lorenz Hilpert
af16385c82 #425 - Anmerkung - Bestellung 2021-04-06 10:50:29 +02:00
Andreas Schickinger
8c72c83c69 #1564 Benachrichtigung im Warenkorb nur bei Rücklage oder Abholung anzeigen 2021-03-30 11:36:06 +00:00
Andreas Schickinger
2f784a2392 #1582 Bestellbestaetigung Lieferadresse wird nicht angezeigt 2021-03-29 15:48:57 +02:00
Lorenz Hilpert
f6b26aab80 Update Checkout API and Implementing the Request for specialCOmment 2021-03-29 12:12:56 +00:00
Lorenz Hilpert
80ca02a9ba rename agent to special comment 2021-03-29 12:12:56 +00:00
Lorenz Hilpert
36bb7b241b Adding CompleteOrder Step Set Agent Comment 2021-03-29 12:12:56 +00:00
Lorenz Hilpert
e6082a3012 Setzen der Anmerkung im Store 2021-03-29 12:12:56 +00:00
Lorenz Hilpert
7b24efd958 Merge branch 'develop' into feature/1576-HFI-Rechnungsadresse-aendern-routing 2021-03-26 15:02:54 +01:00
Lorenz Hilpert
26ae722504 Error Dialog bei fehlerhaften Bestellabschluss 2021-03-26 14:24:29 +01:00
Andreas Schickinger
2279b05e4b #1561 Bugfix bei leeren QueryParams 2021-03-25 16:31:15 +01:00
Andreas Schickinger
35a424a78e #1576 Routing zu Customer Search bei Rechnungsadresse ändern 2021-03-25 16:26:08 +01:00
Andreas Schickinger
eabba753a1 #1561 Country bei Wechsel mit leerer Adresse nicht aus QueryParams übernehmen, isStringEmpty ausgelagert, Adresszusatz aus Prüfung entfernt 2021-03-25 14:57:06 +00:00
Andreas Schickinger
e70eea0271 #1561 Land wird bei Filialkunden nur gesetzt, wenn ein anderes Adressfeld befüllt wird 2021-03-25 14:57:06 +00:00
Andreas Schickinger
97985bb2d3 #1570 showDeliveryInfo$ Observable 2021-03-25 14:56:42 +00:00
Andreas Schickinger
e53340e5c7 #1570 ohne Versandkosten Hinweis bei Versand, B2B Versand und DIG Versand 2021-03-25 14:56:42 +00:00
Lorenz Hilpert
d71e506c07 #1567 Popup Adressvorschläge 2021-03-25 15:55:49 +01:00
Lorenz Hilpert
2f0807396d #1529 Filialkunde zu Onlinekunde upgraden 2021-03-25 15:15:31 +01:00
Andreas Schickinger
bc2a2b6d91 #1563 Fix für fehlendes Result Property 2021-03-24 15:06:46 +01:00
Andreas Schickinger
f7dfd16d9b #1563 InvalidProperties Error bei der Adressvalidierung auswerten 2021-03-24 14:17:26 +01:00
Andreas Schickinger
b840268847 #1555 WA Bestellposten aktualisieren Bugfix 2021-03-23 13:34:13 +00:00
Andreas Schickinger
3433893aa0 #1554 HFI B2B-Kunde nicht upgraden 2021-03-23 13:33:36 +00:00
Lorenz Hilpert
aea5e4f680 #1547 CTA Drucken Position 2021-03-23 14:32:29 +01:00
Andreas Schickinger
ab5b67ce88 #1529 Filialkunde zu Onlinekunde upgraden 2021-03-22 17:03:45 +00:00
Andreas Schickinger
ebbe4b1d98 #1553 Ui Validators Lib und Servervalidierung 2021-03-22 15:23:23 +00:00
Lorenz Hilpert
61f5262fab #1550 Dropdowns in iPad nicht möglich zu öffnen 2021-03-22 16:21:34 +01:00
Andreas Schickinger
7e80fbc638 #1547 Drucken CTA Rechtsbünding in Bestellbestätigung 2021-03-18 15:08:08 +01:00
Lorenz Hilpert
38d1722127 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2021-03-18 13:58:43 +01:00
Lorenz Hilpert
3021e9b710 CanAdd für Weiter zum Warenkorb angepasst 2021-03-18 13:58:36 +01:00
Andreas Schickinger
5241f8b77e #1530 Fix bei setDestination$ 2021-03-18 10:23:21 +00:00
Andreas Schickinger
15d74333c3 #1536 In der Edit Ansicht von Kundendaten sofort die Validierungstexte anzeigen 2021-03-18 09:07:15 +00:00
Andreas Schickinger
1c6911dda5 #1541 Bestellung wird nicht abgeschlossen Fix 2021-03-17 15:48:15 +01:00
Andreas Schickinger
530af69a6d #1531 Warenkorb Reservierung nicht möglich Fix 2021-03-16 17:28:17 +01:00
Nino Righi
424939b5f3 #1530 Bugfix Update ShippingAddress on Multiple Destinations B2B With Target 2 and 16 2021-03-16 13:46:02 +00:00
Michael Auer
699fd7db45 Merge tag '1.3' into develop 2021-03-15 12:02:43 +01:00
Nino Righi
db19797715 Merge branch 'develop' into bugfix/1438-Aenderung-Benachrichtigung 2021-03-15 10:53:00 +00:00
Nino Righi
463613b877 #1438 Bugfix Notification Channels refresh Checkout before every notification request 2021-03-15 10:53:00 +00:00
Nino Righi
524c946bc2 #1328 Bugfix Gender Validation on Create New Guest Customer 2021-03-15 10:51:22 +00:00
Nino Righi
3afbf28843 #1534 Bugfix Checkout Review Edit Shipping or Payer Address 2021-03-15 10:50:31 +00:00
Nino Righi
bc60c63c70 #1538 Bugfix iPad styling quantity-control dropdown 2021-03-15 10:49:07 +00:00
Nino Righi
8a76504bd1 #1528 Bugfix Checkout Added Download to Options 2021-03-15 10:48:23 +00:00
Michael Auer
25b8af236e Merge branch 'release/1.3' 2021-03-15 11:06:58 +01:00
Nino Righi
925f12bf9d #1537 Bugfix iPad Styling Icon 2021-03-12 17:06:11 +01:00
Lorenz Hilpert
8cac8512ab #1526 Setzen der Rechnugsadresse bei Online und B2B Kunden 2021-03-11 13:34:42 +01:00
Nino Righi
634465ce1a #1426 Bugfix Warenausgabe V1.3.0 After 10 Seconds Stop Loading Features And Throw No Error Message 2021-03-10 16:09:37 +01:00
Andreas Schickinger
5bbc3e3b1e #1520 Bestellbestätigung Bestelloptionen Header entfernt 2021-03-10 14:59:39 +00:00
Lorenz Hilpert
0e9c9d4cfd #900 Warenkorb // Rücklage nicht möglich wenn OLA-Store kein Ergebnis zurückleifert 2021-03-10 15:57:29 +01:00
Nino Righi
823f580c73 Merged PR 545: #1438 Bugfix Aenderung Benachrichtigung
#1438 Bugfix Aenderung Benachrichtigung
2021-03-10 14:30:57 +00:00
Nino Righi
53892e25d7 Merge branch 'develop' into bugfix/1438-Aenderung-Benachrichtigung 2021-03-10 15:29:55 +01:00
Andreas Schickinger
ae23b37759 #1517 Bugfixes Druckerdialog 2021-03-10 14:26:24 +00:00
Andreas Schickinger
7c01a1c31e Rechnungsadresse Typo im Warenkorb 2021-03-10 14:26:24 +00:00
Nino Righi
661351911f Merge branch 'develop' into bugfix/1438-Aenderung-Benachrichtigung 2021-03-10 15:25:46 +01:00
Nino Righi
a622b3dc0c #1519 Changed Template and Added Check If TotalItemCount is 0 2021-03-10 14:25:43 +00:00
Lorenz Hilpert
fcc88e2ec5 #1504 Breadcrumbs for Checkout 2021-03-10 14:23:35 +00:00
Lorenz Hilpert
de5a2349f5 #1509 Check Produkt Zum Warenkorb Hinzufügen 2021-03-10 14:23:35 +00:00
Nino Righi
bf58203fd2 Merge branch 'develop' into bugfix/1438-Aenderung-Benachrichtigung 2021-03-10 14:43:41 +01:00
Nino Righi
706003cce6 #1438 Bugfix Notification Channels communicationDetails Error if Process gets Closed 2021-03-10 14:39:56 +01:00
Nino Righi
8148013567 #1514 Bugfix Checkout Summary Symbol 2021-03-09 17:17:20 +00:00
Andreas Schickinger
5509a2940c #1495 Position im Warenkorb ändern 2021-03-09 17:16:36 +00:00
Nino Righi
ab9787ad5e #1496 Bugfix ShippingDate B2B changed withLatestFrom to mergeMap for Availability Check 2021-03-09 17:16:07 +00:00
Andreas Schickinger
0d69a8a78e #1515 Bestellbestaetigung Drucken Bugfix 2021-03-09 17:14:41 +00:00
Andreas Schickinger
340ab46072 #1513 Fix beim Hinzufuegen von Downloads zum Warenkorb 2021-03-09 17:14:02 +00:00
Andreas Schickinger
d72ad20e2a #1513 Anzeige anderer Versandoptionen in der Bestellbestaetigung 2021-03-09 17:14:02 +00:00
Nino Righi
01d2cae045 #1512 Bugfix Fehler Kundendaten Erfassen canAdd 2021-03-09 17:13:24 +00:00
Andreas Schickinger
e4102a76ab #1510 Pipe anstatt Funktionsaufruf 2021-03-09 17:12:09 +00:00
Andreas Schickinger
5c82d9d14c #1510 Textanpassung 2021-03-09 17:12:09 +00:00
Andreas Schickinger
dd3a259dc0 #1510 Bestellinfos Anzeige 2021-03-09 17:12:09 +00:00
Nino Righi
4ce08a5a1a #1438 Bugfix Notification Channels Refactor Code 2021-03-09 14:03:40 +00:00
Nino Righi
65d473b823 #1438 Bugfix Notification Channels Form and Logic changes 2021-03-09 14:03:40 +00:00
Nino Righi
9c6b142524 #1438 Bugfix Notification Channels Refactor Code 2021-03-09 14:25:11 +01:00
Andreas Schickinger
dca4f497cc #148 Merge Fix 2021-03-09 14:16:00 +01:00
Andreas Schickinger
fbdbb80587 Merge remote-tracking branch 'refs/remotes/origin/develop'
Conflicts:
	apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.ts
2021-03-09 14:15:32 +01:00
Andreas Schickinger
16966bce88 #1454 Zur Warenausgabe CTA in der Bestellbestaetigung bei B2B-Kunden mit Filialentnahme 2021-03-09 13:55:18 +01:00
Lorenz Hilpert
eb32e11a6e #1508 - Anzahl der Lesepunkte stimmt nicht 2021-03-09 13:55:06 +01:00
Nino Righi
406ab2e4c4 #1438 Bugfix Notification Channels Form and Logic changes 2021-03-09 11:18:04 +01:00
Lorenz Hilpert
e8e4bb4347 #1483 Maximale Bestellmenge 999 2021-03-08 17:21:27 +01:00
Andreas Schickinger
c949438745 #1505 Bestellbestätigung Belegnummer Link 2021-03-08 16:08:50 +00:00
Andreas Schickinger
b7723e944c #1506 Selektionsfarbe im Warenausgabe Filter angepasst 2021-03-08 16:08:23 +00:00
Andreas Schickinger
7734396b81 #148 Button Styling und CTA angelegt 2021-03-08 16:36:07 +01:00
Nino Righi
808bbea62a #1437 #1420 Customer Details History Update 2021-03-08 13:22:18 +00:00
Nino Righi
bacf1bec37 #1437 #1420 HFI Customer Details History 2021-03-08 13:22:18 +00:00
Andreas Schickinger
d17b19689e #1507 Footer Abstand in Bestellbestaetigung angepasst 2021-03-08 09:51:13 +00:00
Lorenz Hilpert
3c6a67b532 #1503 - Anlegen von Kunden schlägt fehl 2021-03-08 10:48:35 +01:00
Lorenz Hilpert
42713b8aca #1508 Anzahl der Lesepunkte stimmt nicht 2021-03-05 17:24:27 +01:00
Lorenz Hilpert
313aa13d80 #1421 Bugfix bei Bestllungen Download und Versand wenn Kunde vorher ausgewählt wurde. 2021-03-05 15:59:18 +01:00
Lorenz Hilpert
2a9172b9ef Merge branch 'feature/1407-Checkout' into develop 2021-03-05 11:01:38 +01:00
Lorenz Hilpert
a6a77ca7b0 Merge branch 'develop' into feature/1407-Checkout 2021-03-05 10:58:29 +01:00
Michael Auer
4575f2750b Merge branch 'release/1.3' into develop 2021-03-05 10:55:10 +01:00
Nino Righi
fd60dca5ab #1460 Implemented Scroll Position Service with Prefetch 2021-03-05 09:27:05 +00:00
Nino Righi
cd0dcca911 Merge branch 'develop' into feature/1460-Trefferliste-Scroll-Position-Merken 2021-03-05 09:27:05 +00:00
Nino Righi
f4056d33a6 #1460 Remember Scroll Position, Implementing Dynamic Logic Start 2021-03-05 09:27:05 +00:00
Andreas Schickinger
7f93088ffb #1488 Filialanzeige entfernt 2021-03-05 09:26:03 +00:00
Andreas Schickinger
dce5e2f702 #1488 Filialanzeige in Bestellbestätigung 2021-03-05 09:26:03 +00:00
Andreas Schickinger
9d8eec616f #1488 Bestellbestätigung Styling angepasst, Anzeige weiterer Daten 2021-03-05 09:26:03 +00:00
Andreas Schickinger
83eaf8e1e8 #1488 Zwischenstand Styling Bestellbestaetigung 2021-03-05 09:26:03 +00:00
Andreas Schickinger
e952691a4a #1488 Bestellbestätigung Zwischencommit 2021-03-05 09:26:03 +00:00
Andreas Schickinger
45b51de2e8 #1495 Warenkorb Versandoptionen Anzeige 2021-03-05 09:25:32 +00:00
Lorenz Hilpert
4c43c56ac5 Merge branch 'develop'
Conflicts:
	apps/page/customer/src/lib/customer-details/customer-details.component.ts
	apps/swagger/crm/src/lib/models/problem-details.ts
	apps/swagger/oms/src/lib/models/display-order-item-dto.ts
	apps/swagger/oms/src/lib/models/problem-details.ts
	apps/ui/modal/src/lib/index.ts
	apps/ui/modal/src/lib/modal.module.ts
2021-03-04 16:41:22 +01:00
Lorenz Hilpert
3061abefc5 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-03-04 14:32:41 +01:00
Lorenz Hilpert
4f26bc46b7 #1499 - Download nicht möglich 2021-03-04 14:32:10 +01:00
Andreas Schickinger
823631516c #1493 Ungenutzter import entfernt 2021-03-04 13:07:59 +00:00
Andreas Schickinger
6ce662c56e #1493 Undefined bei Adresse im Warenkorb 2021-03-04 13:07:59 +00:00
Andreas Schickinger
0e7a4950d1 #1493 Versandoption eines Artikels im Warenkorb ändern 2021-03-04 13:07:59 +00:00
Lorenz Hilpert
0301aabee7 #1496 Anzeige Versanddatum im Kaufoptionen Dialog wenn man diesen vom Warenkorb aus öffnet 2021-03-04 14:05:48 +01:00
Lorenz Hilpert
650d7be1c1 #1484 Bestellposten-Split funktioniert nicht 2021-03-04 13:21:19 +01:00
Lorenz Hilpert
da32e46544 #1499 Download nicht möglich 2021-03-04 10:37:39 +01:00
Lorenz Hilpert
687f6ee0f8 Fix Debugger entfernt 2021-03-04 10:26:46 +01:00
Lorenz Hilpert
d9084760a6 #1502 Nicht möglich Titel mehrfach in Warenkorb zulegen 2021-03-04 10:24:02 +01:00
Nino Righi
f2590a8c1d Merge branch 'feature/1407-Checkout'
Conflicts:
	apps/domain/checkout/src/lib/checkout.service.ts
2021-03-03 17:19:03 +01:00
Nino Righi
e0ead15223 #1438 Store and Filter Branches 2021-03-03 17:12:46 +01:00
Lorenz Hilpert
130a0f460b #1497 Keine Versandbestellung möglich 2021-03-03 16:59:10 +01:00
Nino Righi
a1708ca5a5 #1461 HFI Customer Mark Gender as Required 2021-03-03 16:34:01 +01:00
Andreas Schickinger
458b0aa3d3 #1498 Anzeige der Filialadresse im Warenkorb 2021-03-03 15:00:47 +00:00
Nino Righi
43121fd53b #1438 Checkout Bugfix Notification Channel Update Request and Data Fetch 2021-03-03 14:59:28 +00:00
Lorenz Hilpert
fa085bc214 #1494 Fehler bei Avaibility Berechnung 2021-03-03 15:58:01 +01:00
Lorenz Hilpert
c9dc0c0da0 CRM - API - Upgrade v2 => v3 + SwaggerGen 2021-03-03 14:44:30 +01:00
Nino Righi
25d532ba0a #1438 Checkout Bugfix Notification Channel Update Request and Data Fetch 2021-03-03 14:30:59 +01:00
Andreas Schickinger
952ce3d99e Merge remote-tracking branch 'refs/remotes/origin/feature/1407-Checkout'
Conflicts:
	apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts
2021-03-03 14:11:37 +01:00
Nino Righi
2b1c441ff9 #1481 Checkout Bugfix Branch Dropdown Displayed Branches and Added Key Navigation 2021-03-03 13:09:11 +00:00
Andreas Schickinger
7204a47d44 #1477 Navigation in Warenkorb ausgebaut 2021-03-03 13:49:54 +01:00
Andreas Schickinger
7e0e0447da Merge branch 'feature/1407-Checkout'
Conflicts:
	apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts
2021-03-03 13:01:59 +01:00
Lorenz Hilpert
5c069c1975 #1490 Status 8192 ist nicht lieferbar 2021-03-03 11:37:58 +01:00
Andreas Schickinger
3222f019d9 #1477 Abstand angepasst 2021-03-03 11:13:19 +01:00
Andreas Schickinger
6e84c116b6 Merge branch 'feature/1407-Checkout'
Conflicts:
	apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.html
2021-03-03 11:08:40 +01:00
Lorenz Hilpert
94c1df1b3d Bugfix - Supplier Product Number in Availability 2021-03-03 11:01:48 +01:00
Andreas Schickinger
9926d1a3bb Merged PR 511: #1474 WA Dropdown Pfeile ausblenden, wenn Button disabled
#1474 WA Dropdown Pfeile ausblenden, wenn Button disabled

Related work items: #1474
2021-03-03 09:47:04 +00:00
Andreas Schickinger
53563c86fd #1486 Anzeige Versanddatum Warenkorb Dialog 2021-03-03 10:25:12 +01:00
Lorenz Hilpert
1a96f9ed16 Replaced Trash Icon 2021-03-03 10:19:26 +01:00
Lorenz Hilpert
48eb4e792d Added Icons cart and circle_cart 2021-03-03 10:13:04 +01:00
Andreas Schickinger
663563aff2 Merged PR 512: #1485 Anzeige Liefer- und Rechnungsadresse
#1485 Anzeige Liefer- und Rechnungsadresse

Related work items: #1485
2021-03-02 20:12:57 +00:00
Lorenz Hilpert
78693b0b03 #1483 Maximale Bestellmenge 999 2021-03-02 21:03:38 +01:00
Lorenz Hilpert
898df561bd #1479 Fehler bei Rücklage für Filialkunden 2021-03-02 20:51:41 +01:00
Lorenz Hilpert
846bc0b72c #1484 Bestellposten-Split 2021-03-02 20:38:17 +01:00
Michael Auer
68fb60a7ee ! bugfix: errors after merge 2021-03-02 18:05:08 +01:00
Andreas Schickinger
9054d63ce9 #1477 Zwischenstand Routing bei Klick auf Mueltonne, Anzeige wenn Warenkorb leer 2021-03-02 17:14:12 +01:00
Andreas Schickinger
438968f390 #1485 Anzeige Liefer- und Rechnungsadresse 2021-03-02 16:42:29 +01:00
Michael Auer
ed4be3c94f MERGE from release/1.3 into develop (with CONFLICTS) 2021-03-02 16:41:16 +01:00
Andreas Schickinger
b576a3dec2 #1474 WA Dropdown Pfeile ausblenden, wenn Button disabled 2021-03-02 16:00:59 +01:00
Andreas Schickinger
ae4fde64f9 Merged PR 509: #1471 Warenausgabe Status in Bearbeiten-Seiten disabled
#1471 Warenausgabe Status in Bearbeiten-Seiten disabled

Related work items: #1471
2021-03-02 13:28:50 +00:00
Nino Righi
8b1620c663 #1407 Checkout Notification Channels Bugfix, Close Form, Reducer Update 2021-03-02 14:03:42 +01:00
Nino Righi
9fbc07a3e0 #1407 Checkout Notification Channel Update 2021-03-02 13:09:02 +01:00
Nino Righi
9c7d3dba46 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-03-02 13:08:00 +01:00
Nino Righi
fa8d12e1e4 #1407 Checkout Notification Channels Update 2021-03-02 13:07:47 +01:00
Andreas Schickinger
de77eaeb11 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-03-02 12:37:04 +01:00
Andreas Schickinger
0f4d1a2835 #1407 Domain Printer und Modal Printer 2021-03-02 12:29:21 +01:00
Nino Righi
ba139660eb Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-03-02 12:02:56 +01:00
Nino Righi
3baa7d839e #1407 Checkout Notification Channels 2021-03-02 12:02:04 +01:00
Lorenz Hilpert
4f3f3009c7 #1479 - Fehler bei Rücklage für Filialkunden 2021-03-02 10:25:12 +01:00
Lorenz Hilpert
a83897ecdd Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-03-02 08:53:47 +01:00
Lorenz Hilpert
0dbddeead4 Removed Console Logs 2021-03-01 15:25:35 +01:00
Lorenz Hilpert
ff419a26a5 Bugfix - Bestellabschluss 2021-03-01 15:19:39 +01:00
Andreas Schickinger
f00cdc7575 #1407 OMS Swagger aktualisiert 2021-03-01 13:50:04 +01:00
Andreas Schickinger
ae1411bae7 #1471 Warenausgabe Status in Bearbeiten-Seiten disabled 2021-03-01 12:41:57 +01:00
Lorenz Hilpert
bb841a1254 Versandauswahl => Availability kann in die Komponente übergeben werden 2021-03-01 09:45:37 +01:00
Nino Righi
9c121a951a #1407 Checkout backToOptions Button Navigation 2021-02-26 14:43:40 +01:00
Nino Righi
05c688f725 #1407 Checkout Options Modal Navigation 2021-02-26 14:25:09 +01:00
Lorenz Hilpert
e8014c0092 AvailabilityService.mapToOlaAvailability() 2021-02-26 11:46:25 +01:00
Nino Righi
ead10720e8 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-25 18:32:30 +01:00
Nino Righi
b618c615db #1407 Checkout Navigation Cart 2021-02-25 18:32:15 +01:00
Andreas Schickinger
d73884ab8d #1407 Erster Zwischenstand für Styling und Anzeige der Daten in der Bestellübersicht 2021-02-25 17:56:05 +01:00
Nino Righi
2abd75fa92 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-25 16:21:42 +01:00
Nino Righi
aeb79c8bee #1407 Checkout Implemented Memorize Decorator 2021-02-25 16:21:25 +01:00
Nino Righi
67f93b98db #1407 Checkout Update Product Image Link 2021-02-25 16:12:15 +01:00
Lorenz Hilpert
f66e5fcffe Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-25 14:17:08 +01:00
Lorenz Hilpert
4b27444fe7 Checkout Summary Component Daten Laden und Anzeigen 2021-02-25 14:16:37 +01:00
Andreas Schickinger
c879c7e5ea #1407 Icon größe in OptionsModal angepasst, Ui-Spinner bei Change Button im Warenkorb 2021-02-25 12:49:08 +01:00
Andreas Schickinger
45340fbddb #1407 Styling Fix in DIG Delivery, Weitere Verfügbarkeiten öffnen Bugfix 2021-02-25 12:33:27 +01:00
Andreas Schickinger
4193a6a702 #1407 Spinner für Bestellen, QuantityControl, Weiter zum Warenkorb, Weiter zur Artikelsuche 2021-02-24 16:05:49 +01:00
Andreas Schickinger
f06931be72 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-24 15:05:25 +01:00
Andreas Schickinger
0a7c8351da #1407 UiSpinner Lib 2021-02-24 14:59:27 +01:00
Nino Righi
aa7b535566 #1407 Checkout Changed ean to imageId for Loading Product Images 2021-02-24 13:54:57 +01:00
Nino Righi
8dc206c126 #1407 Checkout Changed Dropdown within Purchasing Options Modal 2021-02-24 13:11:30 +01:00
Nino Righi
492fd6f3f8 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-24 11:47:23 +01:00
Nino Righi
bc64c01d6c #1407 Checkout Updated Process Cart Entries Number 2021-02-24 11:46:40 +01:00
Andreas Schickinger
2da011cb7f #1407 Styling und Erweiterungen für PurchaseOptionsModal 2021-02-24 11:27:55 +01:00
Lorenz Hilpert
26f5a116b6 Update Item Count in Shopping Cart Review Page
Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>
2021-02-24 10:24:04 +01:00
Nino Righi
ed671f1fad Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-24 09:45:05 +01:00
Nino Righi
c19ad0de3e #1407 Checkout Changed Product Name Link and Removed Console Log 2021-02-24 09:43:46 +01:00
Lorenz Hilpert
a7e88fbe30 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-24 09:42:27 +01:00
Lorenz Hilpert
0fe76c3692 Extended DomainCheckoutService and Application Service to get the Orders 2021-02-24 09:31:09 +01:00
Andreas Schickinger
5095c96a15 Merged PR 508: #872 Anzeige Organisation bei B2B Kunden in Warenausgabe
#872 Anzeige Organisation bei B2B Kunden in Warenausgabe

Related work items: #872
2021-02-23 19:26:38 +00:00
Andreas Schickinger
06aab6eefc Merged PR 507: #1243 Warenausgabe check für Bezahltstatus in Trefferliste
#1243 Warenausgabe check für Bezahltstatus in Trefferliste
2021-02-23 19:26:17 +00:00
Nino Righi
0ecfe80a3e Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-23 19:04:29 +01:00
Nino Righi
81d8ca097c #1407 Checkout Cart and Dropdown Styling Changes, Created Product Image Library 2021-02-23 19:02:03 +01:00
Andreas Schickinger
981a18b584 Merge remote-tracking branch 'origin/release/1.3' into feature/872-Warenausgabe-Firmenkunden 2021-02-23 17:46:52 +01:00
Andreas Schickinger
e0d70bd70c #872 Anzeige Organisation bei B2B Kunden in Warenausgabe 2021-02-23 17:40:53 +01:00
Lorenz Hilpert
48e1ff42b6 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-23 16:43:35 +01:00
Lorenz Hilpert
8d9f0427e8 Bestellung Abschließen 2021-02-23 16:43:26 +01:00
Andreas Schickinger
f44b1a2971 #1243 Warenausgabe check für Bezahltstatus in Trefferliste 2021-02-23 16:40:25 +01:00
Andreas Schickinger
88cb1d9473 #1407 Weiter einkaufen Action 2021-02-23 15:22:29 +01:00
Lorenz Hilpert
0348018575 Added icons truck and shopping_bag 2021-02-23 14:30:03 +01:00
Lorenz Hilpert
237c36a3b1 Added @cdn/product-image library 2021-02-23 14:19:46 +01:00
Lorenz Hilpert
7a788b64c3 Merge branch 'feature/1407-Checkout' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/1407-Checkout 2021-02-23 13:59:04 +01:00
Lorenz Hilpert
743a238a29 Checkout Review Page aufgebaut 2021-02-23 13:51:19 +01:00
Andreas Schickinger
fb2370ee6a Merged PR 506: Warenausgabe Status Trefferliste - keine Prüfung auf Kundennummer, Prüfung auf Zielfiliale
Warenausgabe Status Trefferliste - keine Prüfung auf Kundennummer, Prüfung auf Zielfiliale

Related work items: #1243
2021-02-23 12:50:19 +00:00
Andreas Schickinger
7ab97712f5 Merged PR 505: Warenausgabe - bugfix bei leeren Actions und Toggle Button ausblenden
Warenausgabe - bugfix bei leeren Actions und Toggle Button ausblenden

Related work items: #1209
2021-02-23 12:49:54 +00:00
Andreas Schickinger
7f472d714b #1209 Bugfix bei leeren Actions, Ausblenden des Toggle Buttons 2021-02-23 13:01:19 +01:00
Andreas Schickinger
32e5ac4a30 #1243 Kein Check mehr auf Kundennummer 2021-02-23 11:37:04 +01:00
Andreas Schickinger
e22c66c50b #1243 Zielfiliale wird zusätzlich geprüft 2021-02-23 10:50:31 +01:00
Andreas Schickinger
57439729ab Merged PR 504: #1209 WA // Status und Folgebuttons im WA
#1209 Warenausgabe: im Dropdown werden nur noch Actions mit enabled === false angezeigt, Rest als Buttons
2021-02-22 17:21:36 +00:00
Lorenz Hilpert
b030592157 #1407 Refactoring Checkout Service 2021-02-22 17:52:14 +01:00
Andreas Schickinger
59d7345ea8 #1209 Warenausgabe: im Dropdown werden nur noch Actions mit enabled === false angezeigt, Rest als Buttons 2021-02-22 14:25:43 +01:00
Andreas Schickinger
5e5214f994 Merged PR 499: #1243 Warenausgabe Status in Trefferliste setzen
#1243 Warenausgabe Status in Trefferliste setzen
2021-02-22 13:11:07 +00:00
Andreas Schickinger
cbf0ea1712 #1243 Vergleich auf BuyerNumber anstatt OrderId 2021-02-18 15:48:05 +01:00
Andreas Schickinger
ce6d2f1612 #1243 Status Refresh nach dem Laden 2021-02-18 14:39:22 +01:00
Nino Righi
784efc2cda Merged PR 503: #1444 Bugfix added tabindex for customer searchbox
#1444 Bugfix added tabindex for customer searchbox
2021-02-18 08:58:52 +00:00
Nino Righi
1d95f5574b #1444 Bugfix added tabindex for customer searchbox 2021-02-17 17:43:25 +01:00
Nino Righi
3dc29818eb Merged PR 498: #1223 UPDATE if status is paid, collection period should not be extended
#1223 UPDATE if status is paid, collection period should not be extended
2021-02-17 16:31:23 +00:00
Andreas Schickinger
6f4942ac38 Merged PR 500: #1442 Fehler bei Bestelldetails behoben
#1442 Fehler bei Bestelldetails behoben
2021-02-17 16:29:45 +00:00
Andreas Schickinger
f566af6f1b Merged PR 501: #1441 Kundendaten erfassen Validierung für Name, Phone und Ausgabe der Server...
#1441 Kundendaten erfassen Validierung für Name, Phone und Ausgabe der Server Errors
2021-02-17 16:28:28 +00:00
Nino Righi
f51f5a966b Merged PR 502: #1443 Create New Branch Customer Changed Info Text
#1443 Create New Branch Customer Changed Info Text
2021-02-17 16:26:34 +00:00
Nino Righi
fd56bc115a #1443 Create New Branch Customer Changed Info Text 2021-02-17 16:23:08 +01:00
Nino Righi
b473cf547c #1407 Checkout implemented branch select dropdown for pick up option 2021-02-17 16:15:08 +01:00
Andreas Schickinger
7bca62a5b6 #1441 Kundendaten erfassen Validierung für Name, Phone und Ausgabe der Server Errors 2021-02-17 14:03:09 +01:00
Andreas Schickinger
57f76554de #1442 Fehler bei Bestelldetails behoben 2021-02-16 16:48:24 +01:00
Andreas Schickinger
c68f037a81 #1243 Progress und Button Disable 2021-02-16 16:22:41 +01:00
Andreas Schickinger
4cd3b5d8da #1243 Warenausgabe Status in Trefferliste setzen 2021-02-16 16:05:42 +01:00
Lorenz Hilpert
bacf79d547 Dialog Versandoptionsauswahl 2021-02-16 14:18:25 +01:00
Nino Righi
ff72d3d6be #1223 UPDATE if status is paid, collection period should not be extended 2021-02-16 10:42:02 +01:00
Nino Righi
fcbd341367 Merged PR 497: #1223 if status is paid, collection period should not be extended
#1223 if status is paid, collection period should not be extended
2021-02-16 09:27:32 +00:00
Andreas Schickinger
c124a6a6b8 Merged PR 496: #1346 Bestellungen Detailansicht
#1346 Bestellungen Detailansicht
2021-02-16 09:26:39 +00:00
Nino Righi
556e0c3188 #1223 if status is paid, collection period should not be extended 2021-02-15 17:24:00 +01:00
Michael Auer
e6af31e438 Merge branch 'master' into release/1.3 2021-02-15 15:16:25 +01:00
Andreas Schickinger
c0ca8c1056 Merge branch 'develop' into feature/1346-Bestellungen-Kundensuche-Detailansicht 2021-02-15 14:59:36 +01:00
Andreas Schickinger
f0d3b5e6fc #1346 Zilfiliale Styling 2021-02-15 14:52:17 +01:00
Andreas Schickinger
25d80976b6 #1346 Ordernumber Format 2021-02-15 14:49:29 +01:00
Andreas Schickinger
2b3bfd637b #1346 Abholfachnummer, Organisation wenn kein Name 2021-02-15 14:28:30 +01:00
Andreas Schickinger
e7c2250174 #1346 Package-Lock auf dev Stand zurückgesetzt 2021-02-15 12:54:26 +01:00
Andreas Schickinger
ee883d6a72 #1346 Swagger Update, Kategorisierung, Styling 2021-02-15 12:00:12 +01:00
Michael Auer
be0312d726 ! bugfix: app.module.ts 2021-02-15 11:55:04 +01:00
Michael Auer
519c527cf4 Merge tag '1388-change-productImages-url' into develop
1.2.6

# Conflicts:
#	apps/sales/src/app/app.module.ts
2021-02-15 11:46:50 +01:00
Nino Righi
d9b5998c07 Merged PR 493: #1431 bugfix upgrade branch to webshop customer added gender validation and f...
#1431 bugfix upgrade branch to webshop customer added gender validation and fixed data composition
2021-02-15 10:25:29 +00:00
Nino Righi
64f8d1aa9e Merged PR 494: #1435 bugfix customer details payer id does not exist
#1435 bugfix customer details payer id does not exist
2021-02-15 10:24:32 +00:00
Michael Auer
c886d89f7f Merge branch 'hotfix/1388-change-productImages-url' 2021-02-15 11:04:00 +01:00
Nino Righi
6ddf4d0150 Merged PR 495: #1436 bugfix ipad styling and process name b2b customer
#1436 bugfix ipad styling and process name b2b customer
2021-02-15 09:31:07 +00:00
Lorenz Hilpert
92825bf5a9 #1407 Bestellung abschliessen 2021-02-15 10:26:54 +01:00
Andreas Schickinger
ac09c816e5 #1346 Weiterer Zwischencommit für Bestellungen Details 2021-02-15 09:51:12 +01:00
Nino Righi
f845c9b013 #1436 bugfix ipad styling and process name b2b customer 2021-02-12 15:07:49 +01:00
Nino Righi
1f2694b93b #1435 bugfix customer details payer id does not exist 2021-02-12 12:51:56 +01:00
Nino Righi
9eb41f298e #1431 bugfix upgrade branch to webshop customer added gender validation and fixed data composition 2021-02-12 12:39:17 +01:00
Nino Righi
8f2d1a4614 Merged PR 487: #1405 bugfix search customer via customer card number (scan)
#1405 bugfix search customer via customer card number (scan)
2021-02-12 09:52:26 +00:00
Nino Righi
e873a0a5e7 Merged PR 490: #1427 added customer details history routing
#1427 added customer details history routing
2021-02-12 09:50:12 +00:00
Nino Righi
7f6d0e54ac Merged PR 491: #1432 bugfix customer search result card marked organisation as optional
#1432 bugfix customer search result card marked organisation as optional
2021-02-12 09:49:58 +00:00
Nino Righi
5fd440b2aa Merged PR 492: #1433 added access to customer history endpoint
#1433 added access to customer history endpoint
2021-02-12 09:49:42 +00:00
Nino Righi
d9c5dbf92a #1433 added access to customer history endpoint 2021-02-11 19:10:08 +01:00
Nino Righi
d27c046380 #1432 bugfix customer search result card marked organisation as optional 2021-02-11 18:29:17 +01:00
Nino Righi
b3439784b1 #1427 added customer details history routing 2021-02-11 17:49:24 +01:00
Nino Righi
25351a7c0b Merged PR 489: #1428 created customer history component and added to module
#1428 created customer history component and added to module
2021-02-11 16:37:48 +00:00
Nino Righi
8feac56493 #1428 created customer history component and added to module 2021-02-11 17:29:48 +01:00
Nino Righi
cbae78b4b2 #1405 bugfix search customer via customer card number (scan) 2021-02-11 14:27:02 +01:00
Nino Righi
f333d00528 Merged PR 486: #1422 bugfix made button sticky
#1422 bugfix made button sticky
2021-02-11 08:47:32 +00:00
Nino Righi
7f71fb9197 #1422 bugfix made button sticky 2021-02-10 17:58:55 +01:00
Andreas Schickinger
986179d7a0 Merged PR 483: #1399 Fehlende StreetNumber in PayerDTO
#1399 Fehlende StreetNumber in PayerDTO
2021-02-10 16:34:24 +00:00
Andreas Schickinger
cf3d45e142 Merged PR 484: #1401 Weiter suchen zu Weiter einkaufen
#1401 Weiter suchen zu Weiter einkaufen
2021-02-10 16:34:02 +00:00
Nino Righi
441ddd0ab2 Merged PR 485: #1403 bugfix css grid on iOS devices for edit selected customer
#1403 bugfix css grid on iOS devices for edit selected customer
2021-02-10 16:33:39 +00:00
Nino Righi
7c240eaa65 #1403 bugfix added margin instead of gap for input-wrapper to customer edit page 2021-02-10 17:32:14 +01:00
Andreas Schickinger
b09c6a68b2 #1346 Anzeige Bestelldetails 2021-02-10 17:22:45 +01:00
Nino Righi
83e090cb60 #1403 bugfix css grid on iOS devices for edit selected customer 2021-02-10 16:24:51 +01:00
Andreas Schickinger
e6d3e219d6 #1401 Weiter suchen zu Weiter einkaufen 2021-02-10 15:31:05 +01:00
Andreas Schickinger
91e5c2e751 #1346 Bestellungen Detailansicht Zwischenstand 2021-02-10 15:27:36 +01:00
Andreas Schickinger
f930834299 #1399 Fehlende StreetNumber in PayerDTO 2021-02-10 10:26:22 +01:00
Andreas Schickinger
d9802191fa #1346 Bestellungen Detailansicht Zwischencommit 2021-02-10 10:23:14 +01:00
Nino Righi
c3b80a7e11 Merged PR 482: #1403 bugfix css grid for iOS
#1403 bugfix css grid for iOS
2021-02-09 15:48:10 +00:00
Nino Righi
21026daece #1403 bugfix css grid for iOS 2021-02-09 16:47:23 +01:00
Nino Righi
a1d6e18509 Merged PR 477: #1408 changed all country dropdowns for guest and webshop customers to displa...
#1408 changed all country dropdowns for guest and webshop customers to display and preselect only germany
2021-02-09 15:25:00 +00:00
Andreas Schickinger
bd859c1d62 Merged PR 478: #1415 Artikelsuche zu Weiter suchen
#1415 Artikelsuche zu Weiter suchen
2021-02-09 15:24:41 +00:00
Andreas Schickinger
8e055305a3 Merged PR 479: #1418 Ein- und Ausblenden der Organisationsdaten
#1418 Ein- und Ausblenden der Organisationsdaten
2021-02-09 15:24:20 +00:00
Nino Righi
d641dfe37a Merged PR 480: #1403 bugfix css grid (customer-details page) on iOS devices
#1403 bugfix css grid (customer-details page) on iOS devices
2021-02-09 15:24:00 +00:00
Nino Righi
575fc0324d Merged PR 481: #1419 added pipe separator for B2B contact person to customer search hits
#1419 added pipe separator for B2B contact person to customer search hits
2021-02-09 15:23:21 +00:00
Nino Righi
a7579198bb #1419 added pipe separator for B2B contact person to customer search hits 2021-02-09 16:10:11 +01:00
Nino Righi
1226be740a #1403 bugfix css grid (customer-details page) on iOS devices 2021-02-09 14:45:04 +01:00
Andreas Schickinger
0358e1b994 #1418 Ein- und Ausblenden der Organisationsdaten 2021-02-09 13:44:33 +01:00
Lorenz Hilpert
14852ca2b7 Tailwind Upgrade Version 2 2021-02-08 18:05:39 +01:00
Andreas Schickinger
60ed6e5d8e #1415 Artikelsuche zu Weiter suchen 2021-02-08 17:08:28 +01:00
Nino Righi
40c87ab093 #1408 changed all country dropdowns for guest and webshop customers to display and preselect only germany 2021-02-08 16:01:34 +01:00
Nino Righi
9f1a6f4d47 Merged PR 473: #1400 dont show scan article button for desktop
#1400 dont show scan article button for desktop
2021-02-08 14:50:11 +00:00
Andreas Schickinger
3ad23d431f Merged PR 474: #1406 Artikel bei Scannen/Zur Artikelsuche im Warenkorb behalten
#1406 Artikel bei Scannen/Zur Artikelsuche im Warenkorb behalten
2021-02-08 14:48:54 +00:00
Andreas Schickinger
b619535339 Merged PR 476: #1404 Dropdown Titel erweitert
#1404 Dropdown Titel erweitert
2021-02-08 14:47:55 +00:00
Andreas Schickinger
68b234659a Merged PR 475: #1410 Belegnummer Link deaktiviert
#1410 Belegnummer Link deaktiviert, Fallback auf Organisation Name, wenn kein Customer Name vorhanden
2021-02-08 14:46:18 +00:00
Andreas Schickinger
05173f69a7 #1404 Dropdown Titel erweitert 2021-02-08 15:39:51 +01:00
Lorenz Hilpert
3c5ce435b3 Removed Libs inside date and datepicker 2021-02-08 15:39:45 +01:00
Lorenz Hilpert
66b781d11b Config Update for EIS Services 2021-02-08 15:39:06 +01:00
Lorenz Hilpert
a234f565da Moved @ui/dialog to own library 2021-02-08 15:21:57 +01:00
Andreas Schickinger
4afbb065e6 #1410 Belegnummer Link deaktiviert 2021-02-08 14:51:02 +01:00
Andreas Schickinger
6e09e3dc67 #1406 Artikel bei Scannen/Zur Artikelsuche im Warenkorb behalten 2021-02-08 13:53:16 +01:00
Nino Righi
98e6c73b8f #1400 dont show scan article button for desktop 2021-02-08 13:52:54 +01:00
Lorenz Hilpert
065b7f0e63 BUGFIX - Cdn for Images
(cherry picked from commit 2d38e738b3)
2021-02-08 12:25:35 +01:00
Lorenz Hilpert
5e3a45c691 Prüfen/Ändern der Referenzen: produktbilder.ihugendubel.de => produktbilder.paragon-data.net
(cherry picked from commit 877c3d9f31)

# Conflicts:
#	apps/sales/src/app/app.module.ts
#	apps/sales/src/app/modules/shelf/components/search-result-group/search-result-group-item.component.html
2021-02-08 12:25:15 +01:00
Lorenz Hilpert
14645a2ec1 Merge branch 'feature/customer_pages'
Conflicts:
	apps/sales/src/app/app.component.html
	apps/sales/src/app/components/printer-selection/printer-selection.component.html
	apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts
	apps/sales/src/app/modules/shelf/components/order-item-details/order-item-details.component.html
	apps/sales/src/app/modules/shelf/services/shelf-abholfachetikett.service.ts
	apps/swagger/oms/src/lib/models/branch-dto.ts
	apps/swagger/oms/src/lib/models/display-order-dto.ts
	apps/swagger/oms/src/lib/models/display-order-item-dto.ts
	apps/swagger/oms/src/lib/models/display-order-item-subset-dto.ts
	apps/swagger/oms/src/lib/models/display-order-payment-dto.ts
	apps/swagger/oms/src/lib/models/order-item-list-item-dto.ts
	apps/swagger/oms/src/lib/models/order-list-item-dto.ts
	apps/swagger/oms/src/lib/models/order-query-token-dto.ts
	apps/swagger/oms/src/lib/models/receipt-list-item-dto.ts
2021-02-05 18:09:35 +01:00
Lorenz Hilpert
37c6abf4f0 Selectox fuer kundenanlage angepasst. 2021-02-05 15:02:00 +01:00
Lorenz Hilpert
f4b69cd5e2 Update Upgrade Customer And Api's 2021-02-04 18:44:24 +01:00
Lorenz Hilpert
364d6506b5 #907 Upgrade von Kundenkonto nur auf Onlinekonto 2021-02-04 14:58:27 +01:00
Lorenz Hilpert
e3d516d6c2 Update swagger generated services an models 2021-02-04 13:42:20 +01:00
Andreas Schickinger
6f42c3ce8f Merged PR 472: #1399 B2B-Kundendaten-Warenkorb
#1399 B2B-Kundendaten-Warenkorb
2021-02-04 08:53:23 +00:00
Andreas Schickinger
0fd700ce77 #1399 B2B-Kundendaten-Warenkorb 2021-02-03 17:34:38 +01:00
Andreas Schickinger
fdb52cb505 Console.log entfernt 2021-02-03 16:59:40 +01:00
Andreas Schickinger
47bb1d948a Merged PR 471: #1370 Kunden Checkbox verhalten
#1370 Kunden Checkbox verhalten
2021-02-03 15:52:59 +00:00
Andreas Schickinger
d285627878 #1370 Kunden Checkbox verhalten 2021-02-03 16:50:56 +01:00
Lorenz Hilpert
2884e61ccd #1402 - Navigation vom Warenkorb zum Kunden um Adressen zu ändern 2021-02-03 16:31:29 +01:00
Andreas Schickinger
c6d8aab825 Merged PR 469: #1362 Kundenkarte Animation
#1362 Kundenkarte Animation
2021-02-03 15:22:16 +00:00
Andreas Schickinger
db850d7f82 #1401 Weiter suchen -> zur Artikelsuche 2021-02-03 16:15:16 +01:00
Andreas Schickinger
741570735f Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-02-03 16:04:38 +01:00
Andreas Schickinger
9d08ae3a00 CustomerType wurde bei existierender Kundenkarte nicht richtig erkannt 2021-02-03 16:04:07 +01:00
Lorenz Hilpert
0df61b41d4 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-02-03 15:59:35 +01:00
Lorenz Hilpert
e5fd01b0c6 Artikel Scannen nach hinzufügen des artikels 2021-02-03 15:55:02 +01:00
Andreas Schickinger
6fdc48fd7f #1362 2021-02-03 15:20:04 +01:00
Andreas Schickinger
f881d6ef23 #1362 Fix für falsch platziertem Button bei Animation 2021-02-03 15:14:23 +01:00
Andreas Schickinger
d7688dc8d8 #1362 Kundenkarte Animation 2021-02-03 14:52:13 +01:00
Andreas Schickinger
bf0c17e640 Merged PR 467: #1372 Fix für überdeckten Filterbutton
#1372 Fix für überdeckten Filterbutton
2021-02-03 12:47:14 +00:00
Andreas Schickinger
33b5d65af1 Merged PR 468: #1396 Fix für nicht selektierte Lieferadresse
#1396 Fix für nicht selektierte Lieferadresse
2021-02-03 12:47:05 +00:00
Lorenz Hilpert
2d38e738b3 BUGFIX - Cdn for Images 2021-02-03 13:46:33 +01:00
Andreas Schickinger
775452604b #1369 Kundenkarte Click Handler 2021-02-03 13:07:13 +01:00
Andreas Schickinger
91f04d156e #1396 Fix für nicht selektierte Lieferadresse 2021-02-03 11:34:11 +01:00
Andreas Schickinger
7832b2cc69 #1372 Fix für überdeckten Filterbutton 2021-02-03 10:22:51 +01:00
Andreas Schickinger
a3d73da872 Merged PR 463: #1306 Adressanzeige in Kundendetails
#1306 Adressanzeige in Kundendetails
2021-02-02 15:44:06 +00:00
Andreas Schickinger
043123ff26 Merged PR 464: #1390 Currency Pipe bei Bestellungen verwendet
#1390 Currency Pipe bei Bestellungen verwendet
2021-02-02 15:43:42 +00:00
Andreas Schickinger
4bded05928 Merged PR 465: #1340 Reihenfolge auch in der Bearbeiten Ansicht angepasst
#1340 Reihenfolge auch in der Bearbeiten Ansicht angepasst
2021-02-02 15:42:59 +00:00
Andreas Schickinger
64accd8d08 Merged PR 466: #1385 Load Spinner Styling angepasst
#1385 Load Spinner Styling angepasst
2021-02-02 15:42:43 +00:00
Lorenz Hilpert
877c3d9f31 Prüfen/Ändern der Referenzen: produktbilder.ihugendubel.de => produktbilder.paragon-data.net 2021-02-02 16:42:10 +01:00
Andreas Schickinger
32943dc9f6 #1385 2021-02-02 15:31:34 +01:00
Andreas Schickinger
384b4f00a6 #1385 Load Spinner Styling angepasst 2021-02-02 15:27:38 +01:00
Lorenz Hilpert
28ec1068ca #1386 - Rechnungs- und Lieferadresse bei Online- und Gastkunden anlegen 2021-02-02 15:27:13 +01:00
Andreas Schickinger
215b0c18e1 #1340 Reihenfolge auch in der Bearbeiten Ansicht angepasst 2021-02-02 14:50:13 +01:00
Andreas Schickinger
fea4cfaed1 #1390 Currency Pipe bei Bestellungen verwendet 2021-02-02 14:46:44 +01:00
Lorenz Hilpert
10818c6d09 @swagger/crm Generator 2021-02-02 14:46:13 +01:00
Andreas Schickinger
08d7c04a2d #1306 Adressanzeige in Kundendetails 2021-02-02 13:12:55 +01:00
Andreas Schickinger
45ee316197 Merged PR 462: #1386 Adressuebergabe bei Online- und Gastkunde angepasst
#1386 Adressuebergabe bei Online- und Gastkunde angepasst
2021-02-02 11:55:00 +00:00
Lorenz Hilpert
9f8d8f154f Hide Edit Buttons For Online And Guest Details 2021-02-02 12:09:56 +01:00
Andreas Schickinger
2ea7510925 #1386 Adressuebergabe bei Online- und Gastkunde angepasst 2021-02-02 12:09:05 +01:00
Nico Hanus
42e6a8caaa add docker cleanup after build 2021-02-02 11:16:29 +01:00
Lorenz Hilpert
204c93a5dc Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-02-01 17:06:14 +01:00
Lorenz Hilpert
2f8e18af1f Bugfix - Erstellung Und Abschluss Checkout 2021-02-01 17:05:57 +01:00
Andreas Schickinger
f54fd21054 Merged PR 461: #1340 Reihenfolge B2B Kundendetails
#1340 Reihenfolge B2B Kundendetails
2021-02-01 16:00:55 +00:00
Andreas Schickinger
733bdf8400 Merged PR 460: #1381 Fehler beim Anlegen einer B2C Rechnungsadresse behoben
#1381 Fehler beim Anlegen einer B2C Rechnungsadresse behoben
2021-02-01 14:45:37 +00:00
Andreas Schickinger
28f8ab52ef Merged PR 459: #1356 Gastbesteller können nicht mehr Hinzufügen oder Bearbeiten, Onlinekunde...
#1356 Gastbesteller können nicht mehr Hinzufügen oder Bearbeiten, Onlinekunden können nur noch Hinzufügen
2021-02-01 14:45:24 +00:00
Andreas Schickinger
5bde17da2a Merged PR 458: #1379 Anlage Lieferadresse IsDefault Fehler
#1379 Anlage Lieferadresse IsDefault Fehler
2021-02-01 14:44:44 +00:00
Andreas Schickinger
813ad4afad Merged PR 457: #1366 Prozess-ID wird bei neuem Vorgang / wechsel gesetzt
#1366 Prozess-ID wird bei neuem Vorgang / wechsel gesetzt

Related work items: #1366
2021-02-01 14:44:34 +00:00
Andreas Schickinger
673de26a8c #1340 Reihenfolge B2B Kundendetails 2021-02-01 15:06:55 +01:00
Andreas Schickinger
321505c771 #1381 Fehler beim Anlegen einer B2C Rechnungsadresse behoben 2021-02-01 14:18:17 +01:00
Andreas Schickinger
62e4317ee9 #1379 Anlage Lieferadresse IsDefault Fehler 2021-02-01 13:12:38 +01:00
Andreas Schickinger
778e9cf049 #1366 Prozess-ID wird bei neuem Vorgang / wechsel gesetzt 2021-02-01 11:45:04 +01:00
Lorenz Hilpert
5ef4a2d4c5 Customer Mapping Fix 2021-02-01 10:13:21 +01:00
Lorenz Hilpert
eb7496a09d Convertierung der Strassennummer in eine Nummer entfernt 2021-01-29 15:25:14 +01:00
Lorenz Hilpert
5dd77c1535 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-29 12:57:13 +01:00
Lorenz Hilpert
e642e7d0aa #1309 - Das Scannen einer Kundenkartennummer an iPad funktioniert nicht 2021-01-29 12:56:55 +01:00
Andreas Schickinger
2edd44192b Merged PR 454: #1360 Bestellungen Kundendetails UI
#1360 Bestellungen Kundendetails UI
2021-01-29 11:54:45 +00:00
Lorenz Hilpert
9931df8b5a Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-28 17:07:15 +01:00
Lorenz Hilpert
cdda509e9e #752 HFI // PDP/ B2B Laster 2021-01-28 17:06:59 +01:00
Andreas Schickinger
e3e8a8f785 #1356 Gastbesteller können nicht mehr Hinzufügen oder Bearbeiten, Onlinekunden können nur noch Hinzufügen 2021-01-28 16:46:15 +01:00
Andreas Schickinger
3daa06bcef #1370 Kunden erstellen: Checkbox abhaken möglich 2021-01-28 15:28:12 +01:00
Lorenz Hilpert
eef4d42f32 #1340 - B2B Kundendetails// Felder Reihenfolge 2021-01-28 14:25:47 +01:00
Lorenz Hilpert
11f7ccdf14 #1355 - Kundensuche via Kundenkarten ID -> Ergebnismenge undefined 2021-01-28 14:20:57 +01:00
Andreas Schickinger
ce138cdd2a #1368 Styling angepasst 2021-01-28 14:18:21 +01:00
Andreas Schickinger
28cdc33f7c #1367, #1368 2021-01-28 13:42:38 +01:00
Andreas Schickinger
7ae16e19bb Merge branch 'feature/customer_pages'
Conflicts:
	apps/page/customer/src/lib/customer-details/customer-details.component.html
	apps/page/customer/src/lib/customer-details/customer-details.module.ts
	apps/page/customer/src/lib/page-customer-routing.module.ts
2021-01-28 11:56:07 +01:00
Andreas Schickinger
71bb6d6e98 Merged PR 455: #1365 Ändern Nachname Vorname
#1365 Ändern Nachname Vorname
2021-01-28 10:52:47 +00:00
Andreas Schickinger
c9390a0d3d #1365 Ändern Nachname Vorname 2021-01-28 11:46:04 +01:00
Nino Righi
a14fa7e2fe Merged PR 451: #1361 implemented option to create different shipping address for B2C customer
#1361 implemented option to create different shipping address for B2C customer
2021-01-28 10:27:07 +00:00
Nino Righi
0b3d4c60b5 Merged PR 453: #1362 customer card sticky headline with dropshadow
#1362 customer card sticky headline with dropshadow
2021-01-28 10:26:30 +00:00
Andreas Schickinger
a41ce54e33 Merged PR 452: #1306 Vorname Nachname Fix
#1306 Vorname Nachname Fix
2021-01-28 10:26:02 +00:00
Lorenz Hilpert
f4a22ad26d Nach dem Hinzufügen eines Produktes, navigation zur Kundensuche mit Filtern 2021-01-28 10:55:56 +01:00
Lorenz Hilpert
f3c67dd659 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-28 10:38:22 +01:00
Lorenz Hilpert
f18332664c Warenkorb Navigation auf Kundensuche mit Filtern 2021-01-28 10:38:02 +01:00
Andreas Schickinger
3510ca0c3d Fix bei "Weiter zum Warenkorb" - setCustomer wurde nicht ausgeführt 2021-01-27 12:37:15 +01:00
Andreas Schickinger
3caef7c3ec #1360 Loading Fix 2021-01-27 12:30:34 +01:00
Andreas Schickinger
9caccb652d #1360 Loading Progress, Styling 2021-01-27 12:29:14 +01:00
Andreas Schickinger
12fb971185 Bugfix im E-Mail Validator 2021-01-27 11:47:56 +01:00
Nino Righi
ef05364c18 Merge branch 'feature/customer_pages' into feature/1361-Anlage-B2C-abweichende-Lieferadresse 2021-01-27 10:09:24 +01:00
Nino Righi
e423df62d7 #1362 customer card sticky headline with dropshadow 2021-01-27 09:53:08 +01:00
Andreas Schickinger
55cf7f8309 #1306 Anzeige Vorname Nachname fix 2021-01-26 18:19:17 +01:00
Andreas Schickinger
3753c9aff5 #1360 Bestellung Kundensuche UI Step1 2021-01-26 18:13:24 +01:00
Lorenz Hilpert
6eeac511c6 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-26 17:41:17 +01:00
Lorenz Hilpert
f6731fac55 Update Customer Create Guard und navigation 2021-01-26 17:36:21 +01:00
Nino Righi
21977187ba #1361 implemented option to create different shipping address for B2C customer 2021-01-26 16:43:26 +01:00
Nino Righi
208a5fe803 Merged PR 450: #1345 implemented option to create different shipping address for B2B customer
#1345 implemented option to create different shipping address for B2B customer
2021-01-26 15:17:24 +00:00
Nino Righi
09178a81a9 #1345 implemented option to create different shipping address for B2B customer 2021-01-26 15:22:31 +01:00
Lorenz Hilpert
c59210e9e0 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-25 18:29:07 +01:00
Lorenz Hilpert
3be6b0cd49 Added Kundenauswahl Fehler Dialog 2021-01-25 18:28:57 +01:00
Andreas Schickinger
24b2800286 Merged PR 447: #1323 Hindernismeldung Styling und Actions
#1323 Hindernismeldung Styling und Actions
2021-01-25 17:27:14 +00:00
Andreas Schickinger
88dd8bc926 Merged PR 448: #1306 Adressanzeige Kundendetails
#1306 Adressanzeige Kundendetails
2021-01-25 17:27:06 +00:00
Andreas Schickinger
4355cdc7d0 Merged PR 449: #1353 Filter zurücksetzen
#1353 Filter zurücksetzen
2021-01-25 17:27:00 +00:00
Nino Righi
dced6b399c Merged PR 446: #1343 Kundensuche - Anlage der Seite Kundenkarte
Related work items: #1343
2021-01-25 17:26:49 +00:00
Andreas Schickinger
ff4ff84b32 #1353 Filter zurücksetzen 2021-01-25 17:13:22 +01:00
Andreas Schickinger
7e71403f06 #1306 Adressanzeige angepasst 2021-01-25 16:24:15 +01:00
Andreas Schickinger
7474df83d7 #1306 Adressanzeige in Kundendetails 2021-01-25 16:05:49 +01:00
Andreas Schickinger
80dbda2f4b #1323 Actions angepasst 2021-01-25 15:40:44 +01:00
Nino Righi
86d9eebd82 #1343 page customer card icons color 2021-01-25 15:19:04 +01:00
Nino Righi
fecef982fa Merge branch 'feature/customer_pages' into feature/1343-Page-Kundenkarte 2021-01-25 15:05:05 +01:00
Nino Righi
5afea3a224 #1343 page customer card styling changes, added icons 2021-01-25 15:04:25 +01:00
Lorenz Hilpert
244e2d0570 Missing CartService Changes 2021-01-25 14:47:35 +01:00
Lorenz Hilpert
37738fbdf3 Update CartService.canAddItem => return true | string 2021-01-25 14:46:56 +01:00
Andreas Schickinger
8dcd92d87a #1323 Styling Hindernismeldung 2021-01-25 14:40:46 +01:00
Lorenz Hilpert
ca77ca3954 Update Icons 2021-01-25 14:29:36 +01:00
Andreas Schickinger
4c1f2c226a Merged PR 442: #1347 Styling auch für change-order-type.component
#1347 Styling auch für change-order-type.component
2021-01-25 12:42:31 +00:00
Lorenz Hilpert
c999697645 #1323 Dialog um Hindernismeldung erweitern
Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>
2021-01-25 13:39:42 +01:00
Nino Righi
2230b83c65 Merge branch 'feature/customer_pages' into feature/1343-Page-Kundenkarte 2021-01-25 13:36:58 +01:00
Andreas Schickinger
678238da6d Merge branch 'feature/customer_pages' into feature/1347-Styling-Kaufoptionen 2021-01-25 13:23:44 +01:00
Andreas Schickinger
073710d0e2 Merge branch 'feature/customer_pages' into feature/1347-Styling-Kaufoptionen 2021-01-25 11:47:53 +01:00
Nino Righi
4d1350dc97 Merged PR 445: #1322 Cart Service implementation of canAddItem based on activeCustomer and c...
#1322 Cart Service implementation of canAddItem based on activeCustomer and customer features
2021-01-25 10:43:23 +00:00
Nino Righi
854515308b #1343 Page customer card styling changes 2021-01-25 10:50:13 +01:00
Nino Righi
104bc50613 Merge branch 'feature/customer_pages' into feature/1343-Page-Kundenkarte 2021-01-25 10:10:57 +01:00
Lorenz Hilpert
41248c9d08 Erweiterte Debug Fehlermeldung beim hinzufügen des Kunden 2021-01-22 18:27:33 +01:00
Nino Righi
35ba0b8dfc #1322 Cart Service implementation of canAddItem based on activeCustomer and customer features 2021-01-22 17:56:20 +01:00
Nino Righi
2699866f02 Merged PR 444: #1322 cart service getRequiredCustomerTypes
#1322 cart service getRequiredCustomerTypes
2021-01-22 16:16:43 +00:00
Nino Righi
f4d5d6bdb6 #1322 cart service customerFeatures object changed 2021-01-22 16:47:01 +01:00
Nino Righi
b470b66943 #1322 cart service getRequiredCustomerTypes 2021-01-22 16:35:55 +01:00
Nino Righi
0d49f9e914 #1343 Page customer card created 2021-01-22 15:18:58 +01:00
Lorenz Hilpert
9b6b781437 Generierung checkout api 2021-01-22 15:14:35 +01:00
Lorenz Hilpert
54f0d16767 Anpassung für Kundenupgrade von Filial zu Onlinekunden 2021-01-22 14:45:44 +01:00
Andreas Schickinger
5b6e5d05fc Merged PR 443: #1348 Styling für gewählte Kaufoption
#1348 Styling für gewählte Kaufoption
2021-01-22 09:04:05 +00:00
Andreas Schickinger
338f0f4e49 Merged PR 441: #1349 Warenkorb - Anzeige B2B Artikel
#1349 Warenkorb - Anzeige B2B Artikel

Related work items: #1349
2021-01-22 09:03:27 +00:00
Andreas Schickinger
804b4f8ea0 #1348 Styling für gewählte Option 2021-01-21 18:12:18 +01:00
Andreas Schickinger
93ff308786 #1348 Styling für gewählte Kaufoption 2021-01-21 17:24:21 +01:00
Andreas Schickinger
7e5c1cae5c #1347 Styling auch für change-order-type.component 2021-01-21 15:40:29 +01:00
Lorenz Hilpert
39d7d52b4d #1340 - B2B Kundendetails// Felder Reihenfolge 2021-01-21 15:22:30 +01:00
Lorenz Hilpert
3627a7c556 #1337 - B2B Kundendetails/ nur eine Kundennummer wird angezeigt 2021-01-21 15:20:28 +01:00
Lorenz Hilpert
b45cb45417 #1334 - Kundendaten erfassen auf der Trefferliste 2021-01-21 15:12:31 +01:00
Andreas Schickinger
a91cf2a06f #1349 Warenkorb - Anzeige B2B Artikel 2021-01-21 14:58:12 +01:00
Nino Righi
f9d99ea6b9 Merged PR 438: #1339 Bugfix Checkbox library customer types create customer
#1339 Bugfix Checkbox library customer types create customer
2021-01-21 12:22:30 +00:00
Andreas Schickinger
1b29de184d Merged PR 439: #1347 Styling Für Kaufoptionen Fenster anpassen
#1347 Styling Für Kaufoptionen Fenster anpassen

Related work items: #1347
2021-01-21 12:21:55 +00:00
Nino Righi
3355c3a4f2 Merged PR 440: #1342 added route to customer card inside customer details
#1342 added route to customer card inside customer details
2021-01-21 12:21:08 +00:00
Nino Righi
78cf05f875 #1342 added route to customer card inside customer details 2021-01-21 11:52:14 +01:00
Andreas Schickinger
9815d063ae #1347 Styling für das Kaufoptionen Fenster 2021-01-21 10:36:57 +01:00
Nino Righi
fecd27cab9 #1339 Bugfix Checkbox library customer types create customer 2021-01-20 18:15:49 +01:00
Andreas Schickinger
22632ae204 #1347 Styling Kaufoptionen Fenster 2021-01-20 17:17:47 +01:00
Andreas Schickinger
bfeeefaad8 Merged PR 437: #1338 B2B Versand Kaufoption
#1338 B2B Versand Kaufoption

Related work items: #1338
2021-01-20 15:27:44 +00:00
Lorenz Hilpert
9db195d649 Merge branch 'feature/customer_pages' into feature/1338-B2B-Versand-Kaufoption 2021-01-20 16:25:09 +01:00
Andreas Schickinger
7e6c8263b0 #1338 Noch ein log entfernt 2021-01-20 15:25:26 +01:00
Lorenz Hilpert
6fff867df0 Added Icon truck_b2b 2021-01-20 15:23:16 +01:00
Andreas Schickinger
6df12b8468 #1338 Console.log entfernt 2021-01-20 15:18:36 +01:00
Andreas Schickinger
c03f0382ed #1338 B2B Versand Kaufoption 2021-01-20 15:10:22 +01:00
Lorenz Hilpert
83e4f4ee12 #1335 Kundendaten erfassen B2B sticky Button 2021-01-19 17:26:02 +01:00
Nino Righi
b333d182b6 Merged PR 434: #1324 activation and deactivation of checkboxes inside create customer
#1324 activation and deactivation of checkboxes inside create customer
2021-01-19 16:13:10 +00:00
Andreas Schickinger
88bfca6dc3 Merged PR 435: #1330 UI Circle Progress Library
#1330 UI Circle Progress Library

Related work items: #1330
2021-01-19 16:12:16 +00:00
Andreas Schickinger
9ee30230bd Merged PR 436: #1326 E-Mail Validierung mit Top Level Domain
#1326 E-Mail Validierung mit Top Level Domain

Related work items: #1326
2021-01-19 16:11:04 +00:00
Andreas Schickinger
e1fe5a4ba4 #1326 E-Mail Validierung mit Top Level Domain 2021-01-19 16:06:59 +01:00
Andreas Schickinger
01ef455eb5 #1330 UI Circle Progress Library 2021-01-19 15:26:40 +01:00
Lorenz Hilpert
6b7c5868c2 [IPAD] content-sizing 2021-01-19 14:59:13 +01:00
Nino Righi
8e6b80f2ab #1324 activation and deactivation of checkboxes inside create customer 2021-01-19 14:13:58 +01:00
Andreas Schickinger
9c4a6b31ed Merged PR 433: #1328 HFI // Validierungstext bei Dropdown Kundenanlage => Anrede
#1328 HFI // Validierungstext bei Dropdown Kundenanlage => Anrede

Related work items: #1328
2021-01-18 17:10:52 +00:00
Andreas Schickinger
f91faaa921 #1328 HFI // Validierungstext bei Dropdown Kundenanlage => Anrede 2021-01-18 18:06:44 +01:00
Lorenz Hilpert
2c6e939bd9 #1308 Anpassung Kundensuche Für Ipad 2021-01-18 18:06:22 +01:00
Nino Righi
5fc004a49e Merged PR 431: #1325 hide link for adding payer and deliveryadress if customer is guest
#1325 hide link for adding payer and deliveryadress if customer is guest
2021-01-18 16:30:14 +00:00
Andreas Schickinger
c4c2b89cae Merged PR 432: #1327 Dropdown schließen wenn dieser den Focus verliert
#1327 Dropdown schließen wenn dieser den Focus verliert

Related work items: #1327
2021-01-18 16:29:29 +00:00
Andreas Schickinger
cc08d8161e #1327 Blur in FocusOut umbenannt 2021-01-18 17:22:11 +01:00
Nino Righi
4be20e5536 #1325 hide link for adding payer and deliveryadress if customer is guest 2021-01-18 17:18:53 +01:00
Nino Righi
f093baf8b9 Merged PR 430: #1322 Cart service erweitern um den benötigten Kunden zu ermitteln
#1322 Cart service erweitern um den benötigten Kunden zu ermitteln
2021-01-18 16:17:42 +00:00
Andreas Schickinger
2a225d3621 Merged PR 429: #1321 Text für Standard Adresse Checkbox angepasst
#1321 Text für Standard Adresse Checkbox angepasst

Related work items: #1321
2021-01-18 16:16:59 +00:00
Lorenz Hilpert
0f11f6e2d9 #1309 Das Scannen einer Kundenkartennummer an iPad funktioniert nicht 2021-01-18 17:16:05 +01:00
Andreas Schickinger
e6e29d5f1b #1327 Dropdown schließen wenn dieser den Focus verliert 2021-01-18 17:16:02 +01:00
Nino Righi
2278402a83 #1322 Cart service erweitern um den benötigten Kunden zu ermitteln 2021-01-18 16:49:46 +01:00
Lorenz Hilpert
5d0e3ca3b2 unit tests for @core/application 2021-01-18 14:32:59 +01:00
Andreas Schickinger
c33258522c #1321 Text für Standard Adresse Checkbox angepasst 2021-01-18 12:00:04 +01:00
Nino Righi
5f6cbf18a1 Merged PR 428: #1320 bugfix remove disabled features from customer details view
#1320 bugfix remove disabled features from customer details view
2021-01-18 09:42:10 +00:00
Nino Righi
e1c360921c #1320 bugfix restructured code of previous solution 2021-01-15 17:27:21 +01:00
Nino Righi
82b931e064 #1320 bugfix remove disabled features from customer details view 2021-01-15 16:55:17 +01:00
Nino Righi
d3719daa47 Merged PR 426: #1319 B2B shipping removed required validators for organisation name
#1319 B2B shipping removed required validators for organisation name
2021-01-14 16:48:18 +00:00
Nino Righi
2682365edb #1319 removed * 2021-01-14 17:47:30 +01:00
Andreas Schickinger
dbb531550b Merged PR 427: #1318 Sticky Speichern Button, eine scss Datei für alle Adress-Forms
#1318 Sticky Speichern Button, eine scss Datei für alle Adress-Forms

Related work items: #1318
2021-01-14 16:44:51 +00:00
Lorenz Hilpert
5b2e96b113 Merged PR 425: #1314 B2C Geschäftliche Angaben Rechnungsadresse
#1314 B2C Geschäftliche Angaben Rechnungsadresse
2021-01-14 16:42:24 +00:00
Andreas Schickinger
e157c4ee2c #1318 Sticky Speichern Button, eine scss Datei für alle Adress-Forms 2021-01-14 17:37:11 +01:00
Nino Righi
5871b2835c #1319 B2B shipping removed required validators for organisation name 2021-01-14 17:33:57 +01:00
Nino Righi
f459e53f92 Merged PR 419: #1311 #1312 Button Navigation Customer Details
#1311 #1312 Button Navigation Customer Details
2021-01-14 16:32:56 +00:00
Nino Righi
1e668beb1a #1311 #1312 Button Navigation Customer Details refactor 2021-01-14 17:18:09 +01:00
Andreas Schickinger
93632b3c86 Merged PR 424: #1317 Cursor Pointer hinzugefügt
#1317 Cursor Pointer hinzugefügt

Related work items: #1317
2021-01-14 16:10:00 +00:00
Andreas Schickinger
6e8d06c0a9 #1317 Cursor Pointer hinzugefügt 2021-01-14 17:08:30 +01:00
Nino Righi
3db7ef7e6a #1314 B2C Geschäftliche Angaben Rechnungsadresse 2021-01-14 17:01:05 +01:00
Andreas Schickinger
acaeea9efc Merged PR 422: #1316 OnChange der RadioButtons wurde in diesem Fall nie registriert
#1316 OnChange der RadioButtons wurde in diesem Fall nie registriert

Related work items: #1316
2021-01-14 15:53:24 +00:00
Andreas Schickinger
b0a36829cd #1316 OnChange der RadioButtons wurde in diesem Fall nie registriert 2021-01-14 16:37:40 +01:00
Andreas Schickinger
5483949df3 Merged PR 420: #1315 Reihenfolge Nachname - Vorname
#1315 Reihenfolge Nachname - Vorname

Related work items: #1315
2021-01-14 15:06:20 +00:00
Andreas Schickinger
519adfb866 Merged PR 417: 1310: HFI // Kundendetails Abstand zwischen Rechnungs- und Lieferadresse
Related work items: #1310
2021-01-14 15:04:24 +00:00
Andreas Schickinger
e8edab21ec #1315 Reihenfolge Nachname - Vorname 2021-01-14 15:57:23 +01:00
Andreas Schickinger
7d4796aa85 Merged PR 418: #1313 Checkbox für Gastkunde disabled
#1313 Checkbox für Gastkunde disabled

Related work items: #1313
2021-01-14 14:51:01 +00:00
Nino Righi
3afcbc8e43 #1311 #1312 Button Navigation Customer Details 2021-01-14 15:34:10 +01:00
Andreas Schickinger
3bf518ece6 #1313 Checkbox für Gastkunde disabled 2021-01-14 15:19:56 +01:00
Andreas Schickinger
3be2c0d2c2 #1310 Abstand auch bei Lieferadresse und Footer korrigiert 2021-01-14 14:52:32 +01:00
Andreas Schickinger
3fe14b6f78 #1310 Abstand bei Rechnungsadresse fixed 2021-01-14 14:49:43 +01:00
Lorenz Hilpert
463df1178d Fix Customer Set Customer And Address And Sync With UserState
Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>
2021-01-14 13:59:06 +01:00
Lorenz Hilpert
4490842cff Dockerfile changed image to node:14 2021-01-14 10:42:03 +01:00
Lorenz Hilpert
6e623a26bc Setzen des Kunden und der Adressen im Warenkorb 2021-01-14 10:37:31 +01:00
Lorenz Hilpert
7b637be2fa Customer Data, Address, Payer Add/Update
Co-authored-by: n.righi@paragon-data.de <n.righi@paragon-data.de>
2021-01-13 15:34:05 +01:00
Andreas Schickinger
de65a4cd86 Als Standardadresse verwenden in den Formularen implementiert 2021-01-12 14:02:36 +01:00
Lorenz Hilpert
194cab551f FIX Hinzufügen zum Warenkorb 2021-01-11 16:27:54 +01:00
Lorenz Hilpert
2a41ec9011 FIX - Produkt Scrolling & [@loading] on ng-container 2021-01-11 16:20:24 +01:00
Lorenz Hilpert
89f69976e0 Nur Gastkunde kann bearbeitet werden 2021-01-11 14:51:35 +01:00
Andreas Schickinger
ef902fc187 ProcessService implementation 2021-01-08 17:42:51 +01:00
Andreas Schickinger
8c6e0aee94 Select Verhalten bugfix, TabIndex angepasst 2021-01-08 16:40:08 +01:00
Andreas Schickinger
15a8006b9e RadioButton Size, Default Check Verhalten angepasst 2021-01-08 16:20:17 +01:00
Andreas Schickinger
c1e9a10811 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-08 16:10:35 +01:00
Lorenz Hilpert
aafeca823a Styling Radio Button 2021-01-08 16:09:36 +01:00
Andreas Schickinger
5195a48730 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2021-01-08 16:05:23 +01:00
Andreas Schickinger
8b6d3140c8 Breadcrumb für Bearbeiten 2021-01-08 16:04:54 +01:00
Lorenz Hilpert
f9c4563229 Added Icons To Assets 2021-01-08 16:02:58 +01:00
Andreas Schickinger
65446b19cb AddressPipe angepasst, fehlende Adresszusatz Felder hinzugefügt 2021-01-08 15:50:11 +01:00
Andreas Schickinger
a537437046 Link bei Adresse bearbeiten fixed 2021-01-08 14:18:33 +01:00
Andreas Schickinger
0c3c9fdb05 #1274, #1275 2021-01-08 14:15:48 +01:00
Andreas Schickinger
2a875fa4e0 Breadcrumb bei Rechnungsadresse/Lieferadresse 2021-01-08 10:52:12 +01:00
Andreas Schickinger
48713a3e17 #1241, #1240, #845, #1284, #1288, #1289, #1290, #1291 2021-01-07 17:18:21 +01:00
Andreas Schickinger
8e98f9efd0 Schriftgröße bei Inputs für Kundendaten erfassen 2021-01-05 18:14:24 +01:00
Andreas Schickinger
ea49c4ec12 Bearbeiten von Kundendaten 2021-01-05 18:10:01 +01:00
Andreas Schickinger
f8210c3049 Onlinekunde Details überarbeitet 2021-01-05 16:10:22 +01:00
Andreas Schickinger
bc35c533a4 Submit-Event bei Onlinekunden Form hinzugefügt, Konsolenausgaben entfernt 2021-01-05 13:39:58 +01:00
Lorenz Hilpert
f01aaf5622 customer search async pipe error fix 2021-01-04 17:26:15 +01:00
Lorenz Hilpert
73162e2430 #1145 Kundendaten erfassen für B2B Kunden 2021-01-04 17:00:50 +01:00
Lorenz Hilpert
0e203d9633 Merge branch 'feature/755-HFI-Firmendetails' into feature/customer_pages 2021-01-04 16:12:35 +01:00
Lorenz Hilpert
8c3ab0f346 Added Breadcrumb and Application Service 2021-01-04 16:11:19 +01:00
Lorenz Hilpert
daf0a18c17 Merge branch 'feature/755-HFI-Firmendetails' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/755-HFI-Firmendetails 2021-01-04 16:10:29 +01:00
Lorenz Hilpert
e9cc0b5032 Datenübernahme bei der Kundenanlage über URL 2021-01-04 16:02:32 +01:00
Lorenz Hilpert
636f901e89 #1145 Kundendaten erfassen für B2B Kunden 2021-01-04 15:01:29 +01:00
Lorenz Hilpert
416a19ca9d #1145 Anlage von Kunden (Gast, Filiale und Online) 2020-12-22 13:53:55 +01:00
Lorenz Hilpert
5026db9aaf UI Input,select,form-control Libs 2020-12-15 16:48:12 +01:00
Michael Auer
658dc4f2fe ~ replicaCount = 2 (staging + production) 2020-12-15 14:43:23 +01:00
Michael Auer
68eaefefaa ~ Version Bump: 1.3 2020-12-15 14:31:45 +01:00
Michael Auer
ad315c39a1 Merge tag '1.2' into develop 2020-12-15 14:29:23 +01:00
Michael Auer
6c04a5b3b6 Merge branch 'release/1.2' 2020-12-15 14:29:22 +01:00
Michael Auer
d5df65ab43 Merge branch 'develop' into release/1.2 2020-12-15 14:11:28 +01:00
Lorenz Hilpert
30cb62cd06 #1218 Added linkedRecords to CustomerDTO 2020-12-08 14:32:14 +01:00
Lorenz Hilpert
a2914f3ccd #755 Basis-Layout für Kundendetails 2020-12-08 14:25:27 +01:00
Michael Auer
195532d14b Merge tag '1.1-google-analytics' into develop 2020-12-07 16:31:49 +01:00
Michael Auer
66d6ef8e40 Merge branch 'hotfix/1.1-google-analytics' 2020-12-07 16:31:48 +01:00
Lorenz Hilpert
d06512160a Fix Google Analytics
(cherry picked from commit 4c67792f08)
2020-12-07 12:03:28 +01:00
Lorenz Hilpert
6f936072d0 Merged PR 415: Fix Google Analytics
Fix Google Analytics
2020-12-07 10:56:22 +00:00
Lorenz Hilpert
4c67792f08 Fix Google Analytics 2020-12-07 11:55:28 +01:00
Lorenz Hilpert
edd79e055a Merge branch 'feature/customer_pages' into feature/755-HFI-Firmendetails 2020-11-27 15:02:08 +01:00
Lorenz Hilpert
8767158bd9 Added @ui/select And @Ui/toggle Libraries 2020-11-27 15:01:35 +01:00
Lorenz Hilpert
8c2db7db0d #1251 Kategorien-Filter-Button Farbe anpassen 2020-11-26 14:18:21 +01:00
Lorenz Hilpert
ea1ba91fed #1250 Color Filter Button; #1248 Disable Buttons 2020-11-26 11:57:28 +01:00
Lorenz Hilpert
da65a23a79 #1247 HFI // Default Kundentyp in Filter vorausgewählt 2020-11-26 10:45:59 +01:00
Lorenz Hilpert
8c59305ac4 Anlage Form 2020-11-26 10:37:49 +01:00
Lorenz Hilpert
f3b603130c #1227 - Searchbox Text Input Farbe 2020-11-24 16:24:14 +01:00
Lorenz Hilpert
ce4b09b067 #1226 Filter Button Size und Icon 2020-11-24 16:22:15 +01:00
Lorenz Hilpert
becd0a1f2c Merged PR 411: #1190 Button soll inaktiv sein, solange Availability noch nicht geladen wurde
#1190 Button soll inaktiv sein, solange Availability noch nicht geladen wurde

Related work items: #1101
2020-11-23 16:53:26 +00:00
Lorenz Hilpert
8b3213cc8c #1190 Button soll inaktiv sein, solange Availability noch nicht geladen wurde 2020-11-23 17:52:35 +01:00
Lorenz Hilpert
2542cc90c4 Navigation to Details after Search 2020-11-13 15:54:33 +01:00
Lorenz Hilpert
f5a614c735 Merged PR 410: Tabindex for searchinput
Tabindex for searchinput
2020-11-13 14:40:52 +00:00
Lorenz Hilpert
bd89cfb8f1 Tabindex for searchinput 2020-11-13 15:39:54 +01:00
Michael Auer
7dbba2b5ba ~ Version Bump: 1.2 2020-11-13 14:16:31 +01:00
Michael Auer
8c187378e0 Revert "Disable Warenausgabe Navigation"
This reverts commit 0588612adb.
2020-11-13 14:15:30 +01:00
Michael Auer
21adae7141 Merge tag '1.1' into develop 2020-11-13 14:14:17 +01:00
Michael Auer
64a9a457db Merge branch 'release/1.1' 2020-11-13 14:14:13 +01:00
Lorenz Hilpert
0588612adb Disable Warenausgabe Navigation 2020-11-12 16:58:22 +01:00
Lorenz Hilpert
3bf52b7ce3 Merged PR 409: #1224 PCL// Bei Änderung des Status erscheint Fehlermeldung
#1224 PCL// Bei Änderung des Status erscheint Fehlermeldung
2020-11-12 14:41:49 +00:00
Lorenz Hilpert
0723f80051 #1224 PCL// Bei Änderung des Status erscheint Fehlermeldung 2020-11-12 15:40:49 +01:00
Lorenz Hilpert
1eec0afa8f Merged PR 408: Remission #1219 Bugfix
Related work items: #1219
2020-11-11 14:03:37 +00:00
Lorenz Hilpert
802b59bcd2 Merged PR 407: #1219 Remission // Artikel zu Remi hinzufügen wirft Fehler
#1219 Remission // Artikel zu Remi hinzufügen wirft Fehler
2020-11-11 14:02:12 +00:00
Lorenz Hilpert
4d9c8c3cea #1219 Remission // Artikel zu Remi hinzufügen wirft Fehler 2020-11-11 15:01:21 +01:00
Lorenz Hilpert
bd53dcb52c Merged PR 406: Zahlungsart für Warenaugabe 2020-11-11 13:22:35 +00:00
Lorenz Hilpert
608d95b77f Merged PR 405: #1222 - WA // Zahlart anzeigen
#1222 - WA // Zahlart anzeigen
2020-11-11 10:33:12 +00:00
Lorenz Hilpert
50505f8a7b #1222 - WA // Zahlart anzeigen 2020-11-11 11:31:43 +01:00
Lorenz Hilpert
c2dc51b9ed Details Page Für Kundendetails 2020-11-10 15:38:50 +01:00
Lorenz Hilpert
702cdaad4f Merge branch 'develop_angular_10' into feature/customer_pages 2020-11-09 14:06:28 +01:00
Lorenz Hilpert
ae11d47438 Merge branch 'develop' into develop_angular_10 2020-11-09 12:45:19 +01:00
Lorenz Hilpert
1e92e1bf20 Merged PR 404: #1213 - RetailPrice.Vat wird nun als MwSt angezeigt
#1213 - RetailPrice.Vat wird nun als MwSt angezeigt
2020-11-09 09:49:21 +00:00
Lorenz Hilpert
a57109ac60 #1213 - RetailPrice.Vat wird nun als MwSt angezeigt 2020-11-09 10:46:50 +01:00
Nico Hanus
9704ecd9d2 fix config urls for feature 2020-11-05 16:12:21 +01:00
Nico Hanus
415999bb58 change helm name for feature 2020-11-05 15:59:43 +01:00
Nico Hanus
6fa7f93e3d enable feature Build for new stage 2020-11-05 15:50:19 +01:00
Sebastian Neumair
50f945a91b Merged PR 403: Set Skip Correctly For Customer Search | Fix Features Display on Customer Search Result Page | Update Search Result, Search Main and Customer Search Unit Tests 2020-11-02 13:53:40 +00:00
Sebastian
0688b995c6 Update Search Result, Search Main and Customer Search Unit Tests 2020-11-02 14:49:18 +01:00
Sebastian
5d8feadeb4 Fix Features Display on Customer Search Result Page 2020-11-02 12:43:03 +01:00
Sebastian
c4d1e80965 Set Skip Correctly For Customer Search 2020-11-02 12:42:25 +01:00
Lorenz Hilpert
bdd375e876 Filter bei neuladen der Seite beibehalten 2020-10-30 17:19:07 +01:00
Lorenz Hilpert
0340e04f47 Breadcrumb Remove Tail On Load And On NavigationEnd Event 2020-10-30 14:49:51 +01:00
Lorenz Hilpert
84e2037cff Added Breadcrumb Logic & Styling & Navigation 2020-10-30 14:23:14 +01:00
Lorenz Hilpert
32aa147124 Merged PR 402: #932 - Kundenfilter
#932 - Kundenfilter
2020-10-29 16:34:45 +00:00
Sebastian
9fa97d94fc Merge Feature Main Branch 2020-10-29 17:33:52 +01:00
Sebastian Neumair
339232fea5 Merged PR 401: #966 Kundensuche incl. Unit Tests
Related work items: #966
2020-10-29 16:07:32 +00:00
Lorenz Hilpert
8be789062a #932 - Kundenfilter 2020-10-29 17:06:58 +01:00
Sebastian
b2c617f375 #966 Add CustomerSearchService Unit Test 2020-10-29 15:42:00 +01:00
Sebastian
2897facf9d #966 Add CustomerSearchbox Unit Tests 2020-10-29 12:40:52 +01:00
Sebastian
20d262b9fa #966 Fix CustomerSearchService Unit Tests 2020-10-29 10:21:58 +01:00
Sebastian Neumair
db8d209c75 Merged PR 400: #1203 Refetch Items and Reset Search Results on New Search
#1203 Refetch Items and Reset Search Results on New Search

Related work items: #1203
2020-10-29 09:14:26 +00:00
Sebastian
21dd70d4aa #966 Focus Input On Enter Viewport (Searchbox)) 2020-10-29 10:07:17 +01:00
Sebastian Neumair
92f089ccad Merged PR 399: #1203 Refetch Items and Reset Search Results on New Search
#1203 Refetch Items and Reset Search Results on New Search
2020-10-28 17:18:10 +00:00
Sebastian
da117e3070 #1203 Refetch Items and Reset Search Results on New Search 2020-10-28 17:56:24 +01:00
Sebastian
0c5e856240 #966 Focus Input Initially & On View Change FIlter <--> Main Content 2020-10-28 15:41:45 +01:00
Sebastian
c12e319ce0 #966 Start Search on Tap / Click Autocomplete Results 2020-10-28 14:20:17 +01:00
Sebastian
71b0302333 #966 Hide No Search Results on Input Reset (X-Icon) 2020-10-28 13:09:01 +01:00
Sebastian
e693009491 #966 Remove Multiple Autocomplete Requests 2020-10-28 12:52:26 +01:00
Sebastian
1abbcc8174 #966 Use Tailwind Utiility Classes for Shell Breadcrumb Margin & Padding 2020-10-28 12:24:52 +01:00
Sebastian
5f32de6c59 #966 Positioning Breadcrumb and Filter Overlay 2020-10-28 12:21:49 +01:00
Sebastian Neumair
acad176c8c Merged PR 398: #1198 Add KT and GEB Icons (SVGs)
Related work items: #1198
2020-10-27 16:52:42 +00:00
Sebastian Neumair
32b1a750d4 Merged PR 396: #1193 Trefferliste incl. Unit Tests
Related work items: #1193
2020-10-27 16:48:06 +00:00
Sebastian Neumair
b0a146cda3 Merged PR 397: #1198 Add KT and GEB Icons (SVGs)
#1198 Add KT and GEB Icons (SVGs)
2020-10-27 16:47:57 +00:00
Sebastian
5375862093 #1198 Add KT and GEB Icons (SVGs) 2020-10-27 17:46:01 +01:00
Sebastian
8054af1dc9 #1193 Add SearchResultComponent Unit Tests 2020-10-27 17:21:00 +01:00
Sebastian
d0b87def98 #1193 Add CustomerResultCard Unit Tests 2020-10-27 16:49:09 +01:00
Sebastian
774dc4ac12 #1193 Fix SearchMainComponent Unit Tests 2020-10-27 16:06:08 +01:00
Sebastian
fddedc09f6 #1193 Parametrize Search [CustomerSearchService] 2020-10-27 16:05:08 +01:00
Sebastian Neumair
d6839f4884 Merged PR 395: #982 #1024 #1162 #1164 #1166 #1167 #1176 #1177 #1182 Merge WA PCL to Release
Related work items: #982, #1024, #1162, #1164, #1166, #1167, #1176, #1177, #1182
2020-10-27 10:17:45 +00:00
Sebastian Neumair
0101ccb8f6 Merged PR 394: #1167 UpdateStyling for long Vorgang-ID + Add Format Icon
Related work items: #1167
2020-10-27 09:18:17 +00:00
Sebastian
347a78f658 #1167 UpdateStyling for long Vorgang-ID + Add Format Icon 2020-10-27 10:07:38 +01:00
Sebastian
f869232f3b 2020-10-27 10:07:15 +01:00
Sebastian Neumair
1758761085 Merged PR 393: #1166 Align Edit Button on WA Page with other secondary CTAs
#1166 Align Edit Button on WA Page with other secondary CTAs

Related work items: #1166
2020-10-27 08:23:31 +00:00
Sebastian
1550eea5ac #1166 Align Edit Button on WA Page with other secondary CTAs 2020-10-27 09:19:04 +01:00
Sebastian Neumair
7e3fc0ac4d Merged PR 392: #1182 Set Partial Qty on SetSupplier
#1182 Set Partial Qty  on SetSupplier

Related work items: #1182
2020-10-26 18:51:05 +00:00
Sebastian
c0a475bc44 #1182 Set Partial Qty on SetSupplier 2020-10-26 18:14:21 +01:00
Sebastian Neumair
f72e9de980 Merged PR 391: #1164 Fix iPad Bug Where WA Search Page Not Scrollable on
#1164 Fix iPad Bug Where WA Search Page Not Scrollable on

Related work items: #1164
2020-10-26 11:36:46 +00:00
Sebastian
51f2ec6d73 #1164 Fix iPad Bug Where WA Search Page Not Scrollable on 2020-10-26 12:31:26 +01:00
Sebastian Neumair
cea4dbf329 Merged PR 390: #1182 Reset Partial PickUp Qty After All States Are Set
#1182 Reset Partial PickUp Qty After All States Are Set
2020-10-26 09:04:27 +00:00
Sebastian
26aac3a1f5 #1182 Reset Partial PickUp Qty After All States Are Set 2020-10-26 09:54:24 +01:00
Sebastian Neumair
3035175943 Merged PR 389: #1185 Add FromSearch to HistoryState To Identify Origin from Result Page
#1185 Add FromSearch to HistoryState To Identify Origin from Result Page
2020-10-23 12:00:03 +00:00
Sebastian
0c76ef6463 #1185 Add FromSearch to HistoryState To Identify Origin from Result Page 2020-10-23 13:45:19 +02:00
Sebastian Neumair
9e664837d9 Merged PR 388: #1024 Add Focused Event Delay to trigger Reset Event
#1024 Add Focused Event Delay to trigger Reset Event

Related work items: #1024
2020-10-23 09:19:44 +00:00
Sebastian
93647dc748 #1024 Add Focused Event Delay to trigger Reset Event 2020-10-23 11:15:01 +02:00
Sebastian Neumair
89679a94b0 Merged PR 387: #1180 Set Dropdown Max Height to 488px
#1180 Set Dropdown Max Height to 488px
2020-10-22 19:59:41 +00:00
Sebastian
3be5897f5b #1180 Set Dropdown Max Height to 488px 2020-10-22 21:58:23 +02:00
Sebastian Neumair
961c69f318 Merged PR 386: #1177 Ensure New Data is Fetched For Result Page OnInit
#1177 Ensure New Data is Fetched For Result Page OnInit

Related work items: #1176, #1177
2020-10-22 19:33:19 +00:00
Sebastian
865cdd8076 #1177 Ensure New Data is Fetched For Result Page OnInit 2020-10-22 21:27:46 +02:00
Sebastian
dba5e19b84 #1177 Ensure New Data is Fetched For Result Page OnInit 2020-10-22 21:26:08 +02:00
Sebastian Neumair
f4868585b5 Merged PR 385: #1178 Fix Safari-Bug With Button Position Not Respecting Status Bar
#1178 Fix Safari-Bug With Button Position Not Respecting Status Bar
2020-10-22 17:39:59 +00:00
Sebastian
4465bf8787 #1178 Fix Safari-Bug With Button Position Not Respecting Status Bar 2020-10-22 19:35:35 +02:00
Sebastian Neumair
cebbd27ef6 Merged PR 384: #1024 Remove Reset Option on Blur Event [Shelf Edit Page]
#1024 Remove Reset Option on Blur Event [Shelf Edit Page]

Related work items: #1024
2020-10-22 17:03:12 +00:00
Sebastian
0a9de9eaab #1024 Remove Reset Option on Blur Event [Shelf Edit Page] 2020-10-22 18:56:27 +02:00
Sebastian
3cdf1656d7 #1024 Remove Reset X on Blur Event 2020-10-22 18:54:29 +02:00
Sebastian Neumair
f85f31a46e Merged PR 383: #982 Shelf Searchbar - Listen for keycode instead of Enter Event
#982 Shelf Searchbar - Listen for keycode instead of Enter Event

(iOS Keyboard does not emit Enter Event)

Related work items: #982
2020-10-22 12:39:53 +00:00
Sebastian
f747b6aad7 #982 Shelf Searchbar - Listen for keycode instead of Enter Event
(iOS Keyboard does not emit Enter Event)
2020-10-22 14:34:34 +02:00
Sebastian
865e10ef16 Add Skeleton Loader to Customer Search Result Page 2020-10-22 13:15:11 +02:00
Sebastian
ea32037991 Update Margin Top Warenausgabe Page 2020-10-22 08:34:05 +02:00
Sebastian
1c5c6bfdf1 Fix Warenausgabe Page Scrolling Bug on Nav from new Customer Page 2020-10-22 08:31:52 +02:00
Sebastian Neumair
239f940b28 Merged PR 380: #1162 Check for ChangeDetectorRef Before Running Change Detection
#1162 Check for ChangeDetectorRef Before Running Change Detection

[Product Details Component]

Related work items: #1162
2020-10-21 08:22:40 +00:00
Sebastian
b1884e4c05 #1162 Check for ChangeDetectorRef Before Running Change Detection
[Product Details Component]
2020-10-21 10:17:02 +02:00
Sebastian Neumair
6ec6d04fbc Merged PR 377: #1153 Center Apply Filters Button in Remi Overlay
#1153 Center Apply Filters Button in Remi Overlay

Related work items: #1153
2020-10-20 10:03:11 +00:00
Sebastian Neumair
982fd1066b Merged PR 376: #1153 CenterFilter Apply Button in Remi Overlay
#1153 CenterFilter Apply Button in Remi Overlay

Related work items: #1153
2020-10-20 08:50:50 +00:00
Sebastian
749e38d634 #1153 CenterFilter Apply Button in Remi Overlay 2020-10-20 10:46:38 +02:00
Sebastian Neumair
5a7d13202b Merged PR 375: Fix Protected Variable Access in Text Input Component Template 2020-10-19 15:28:28 +00:00
Sebastian Neumair
52db2ba39e Merged PR 374: Fix Protected Variable Access in Text Input Component Template
Fix Protected Variable Access in Text Input Component Template
2020-10-19 15:25:24 +00:00
Sebastian
a8ff13dd60 Fix Protected Variable Access in Text Input Component Template 2020-10-19 17:24:19 +02:00
Sebastian Neumair
078c8b74fa Merged PR 373: Merge Tested Develop Branch to Release Branch
Related work items: #877, #988, #1007, #1067, #1074, #1084, #1085, #1086, #1087, #1100, #1102, #1113, #1131, #1144
2020-10-19 14:49:08 +00:00
Sebastian Neumair
50b8b1e042 Merged PR 372: #1085 Set Partial Quantity On UI Change to Checkmark or SelectAll 2020-10-19 13:36:54 +00:00
Sebastian
0a6e92075f #1085 Add Print Error Message on Abholfachetikett Druck 2020-10-19 15:34:21 +02:00
Sebastian
173696f82e #1085 Set Partial Quantity On UI Change to Checkmark or SelectAll 2020-10-19 15:24:02 +02:00
Sebastian Neumair
877a0f9f79 Merged PR 371: #1085 Set BackToStock on Status 262144
#1085 Set BackToStock on Status 262144
2020-10-19 09:33:21 +00:00
Sebastian
7b4f35caed #1085 Set BackToStock on Status 262144 2020-10-19 11:32:31 +02:00
Michael Auer
6bee9ac8c0 ~ azure-pipelines.yml: changed base patch version to 0 (prepare for upcoming release branches) 2020-10-19 10:44:56 +02:00
Sebastian Neumair
c7968177e8 Merged PR 370: #1085 Refresh View After Partial Remit In Case of No Navigation
#1085 Refresh View After Partial Remit In Case of No Navigation
2020-10-19 08:42:36 +00:00
Sebastian
d8cf263bb7 #1085 Refresh View After Partial Remit In Case of No Navigation 2020-10-19 10:41:07 +02:00
Sebastian Neumair
85dc13771f Merged PR 369: Fix UI Bug To Show Quantity on Details page
Fix UI Bug To Show Quantity on Details page
2020-10-19 07:39:33 +00:00
Sebastian
312da5a73b Fix UI Bug To Show Quantity on Details page 2020-10-19 09:38:02 +02:00
Sebastian Neumair
23c44241ae Merged PR 368: #1144 Update Dropdown Available Status Unit Test & Allow Mutiple Status Changes & Navigate on Determine Supplier
#1144 Update Dropdown Available Status Unit Test & Allow Mutiple Status Changes & Navigate on Determine Supplier
#1137 UI Fixes

Related work items: #1144
2020-10-16 15:39:31 +00:00
Sebastian Neumair
4ab7210e26 Merged PR 367: #1144 Update Dropdown Available Status Unit Test & Allow Mutiple Status Changes & Navigate on Determine Supplier
#1144 Update Dropdown Available Status Unit Test & Allow Mutiple Status Changes & Navigate on Determine Supplier

Related work items: #1144
2020-10-16 15:36:01 +00:00
Sebastian
4a8034d8fb #1144 Update Dropdown Available Status Unit Test 2020-10-16 17:31:58 +02:00
Sebastian
04043e3fd8 2020-10-16 17:31:58 +02:00
Sebastian
26fd7183f7 #1085 Remove Secondary & Primary CtA Options from Dropdown Options 2020-10-16 14:05:32 +02:00
Sebastian
7cfe74b84e #1137 Fix SCSS Spacings File 2020-10-16 12:24:28 +02:00
Sebastian Neumair
d137d1db31 Merged PR 366: #1137 Fix UI Regressions
#1137 Fix UI Regressions
2020-10-16 10:22:32 +00:00
Sebastian
d837f90527 #1137 Add Negative Spacings 2020-10-16 12:21:39 +02:00
Sebastian
414328cf49 #1137 Right Align Bearbeiten Button on Detail Page 2020-10-16 12:16:52 +02:00
Sebastian
f7dddfdd80 #1137 Left Align Dropdown Text (Status Change Dropdown) 2020-10-16 11:50:34 +02:00
Sebastian
18cc0e63ad #1137 Right Align Filter Overlay "select all" 2020-10-16 11:47:27 +02:00
Sebastian
1736fbd838 #1087 Change from .key to .command as primary action identifier 2020-10-16 11:27:48 +02:00
Sebastian Neumair
084afb6971 Merged PR 365: #1085 Show Print Shippingnote in Dropdown
#1085 Show Print Shippingnote in Dropdown

Related work items: #1085
2020-10-16 08:42:13 +00:00
Sebastian
8a1173aaca #1085 Show Print Shippingnote in Dropdown 2020-10-16 10:38:46 +02:00
Sebastian Neumair
e8c28e4728 Merged PR 364: #1085 Change Disabled Button Font Color to White | #1087 Add Check To Identify Clicked Button For Loading Indicator
#1085 Change Disabled Button Font Color to White
#1087 Add Check To Identify Clicked Button For Loading Indicator

Related work items: #1085, #1087
2020-10-15 14:32:30 +00:00
Sebastian
07198b4ede #1087 Update Button Loading Indicator Pipe 2020-10-15 16:26:42 +02:00
Sebastian
2c2825a88f #1087 Fix Spec File Naming for Btn Loading Pipe 2020-10-15 16:25:34 +02:00
Sebastian
c70e9c4202 #1087 Add Check To Identify Clicked Button For Loading Indicator 2020-10-15 16:18:34 +02:00
Sebastian
b19a47d044 #1085 Change Disabled Button Font Color to White 2020-10-15 16:01:58 +02:00
Sebastian Neumair
def80dcf76 Merged PR 363: #1087 Catch Error Creating Lieferschein & Reset Loading State | #1085 Reset Loader on Empty List of Receipts to Print
#1087 Catch Error Creating Lieferschein & Reset Loading State
#1085 Reset Loader on Empty List of Receipts to Print

Related work items: #1087
2020-10-15 12:08:13 +00:00
Sebastian
7683887387 #1085 Reset Loader on Empty List of Receipts to Print 2020-10-15 14:06:18 +02:00
Sebastian
dda86d9975 #1087 Catch Error Creating Lieferschein & Reset Loading State 2020-10-15 13:42:28 +02:00
Sebastian Neumair
27c15fab46 Merged PR 362: #1067 Show Only One Compartment Code Per Group | #1085 Add CREATE_SHIPPINGNOTE as Indicator for creating a shipping note
#1067 Show Only One Compartment Code Per Group
#1085 Add CREATE_SHIPPINGNOTE as Indicator for creating a shipping note

Related work items: #1067, #1085
2020-10-15 11:24:33 +00:00
Sebastian Neumair
5a182bf07b Merged PR 361: #1085 Add CREATE_SHIPPINGNOTE as Indicator for creating a note
#1085 Add CREATE_SHIPPINGNOTE as Indicator for creating a note
2020-10-15 10:33:18 +00:00
Sebastian
abf8c0b0dd #1085 Add CREATE_SHIPPINGNOTE as Indicator for creating a note 2020-10-15 12:32:19 +02:00
Sebastian Neumair
0ec7e45179 Merged PR 360: #1067 Show Only One Compartment Code Per Group
#1067 Show Only One Compartment Code Per Group

Related work items: #1067
2020-10-15 10:17:39 +00:00
Sebastian
a74859c2d2 #1067 Show Only One Compartment Code Per Group 2020-10-15 12:11:32 +02:00
Sebastian Neumair
dfa8e94e26 Merged PR 359: #1007 Teilabholungs Dropdown
#1007 Teilabholungs Dropdown

Related work items: #1007
2020-10-15 08:22:39 +00:00
Sebastian Neumair
53232d4a63 Merged PR 358: #1007 Fix Dropdown Not Shown After Error
#1007 Fix Dropdown Not Shown After Error

Related work items: #1007
2020-10-15 07:37:18 +00:00
Sebastian
b671ea0b03 #1007 Fix Dropdown Not Shown After Error 2020-10-14 18:09:18 +02:00
Sebastian Neumair
92ef685474 Merged PR 357: #1074 Focus Searchbar after Click on Clear Button
#1074 Focus Searchbar after Click on Clear Button

Related work items: #1074
2020-10-14 14:57:53 +00:00
Sebastian Neumair
bf25d9c716 Merged PR 356: #1074 Focus Searchbar after Click on Clear Button
#1074 Focus Searchbar after Click on Clear Button

Related work items: #1074
2020-10-14 14:53:13 +00:00
Sebastian
36ae4e06b9 #1074 Focus Searchbar after Click on Clear Button 2020-10-14 16:51:57 +02:00
Sebastian Neumair
f9b6addafd Merged PR 355: #1131 Fix Duplicate Search Request From Details Effects
#1131 Fix Duplicate Search Request From Details Effects

Related work items: #1131
2020-10-14 12:50:51 +00:00
Sebastian Neumair
8312942ffd Merged PR 354: #1131 Fix Duplicate Search Request From Details Effects
#1131 Fix Duplicate Search Request From Details Effects

Related work items: #1131
2020-10-14 12:50:02 +00:00
Sebastian
8293d80004 #1131 Fix Duplicate Search Request From Details Effects 2020-10-14 14:49:00 +02:00
Sebastian Neumair
ee365eaa1e Merged PR 353: #1085 #1087 #1084 #1085 #1113
#1085 #1087 #1084 #1085

Related work items: #1085, #1087, #1113
2020-10-14 11:11:00 +00:00
Sebastian
11fa26e68a Integrate Changes from Develop 2020-10-14 12:52:17 +02:00
Sebastian Neumair
f23bb2f096 Merged PR 352: #1085 Fetch Button Actions from Server | Refactor Button Logic | #1113 Update Wording on Shelf Search Page | #1085 Add Loading Spinners to Buttons | Add Skeleton Loader to Features on Detail Page
#1085 Fetch Button Actions from Server | Refactor Button Logic | #1113 Update Wording on Shelf Search Page |  #1085 Add Loading Spinners to Buttons | Add Skeleton Loader to Features on Detail Page

Related work items: #1085, #1087, #1113
2020-10-14 10:35:59 +00:00
Sebastian
5c10d1548b #1085 Add Skeleton Loader for Features on Details Page 2020-10-14 12:28:15 +02:00
Sebastian
4664d7d2e7 #1085 Add Skeleton Loader for Features on Details Page 2020-10-14 11:59:57 +02:00
Sebastian
f49756f839 #1085 Remove Filter Button from Details Page 2020-10-14 11:20:28 +02:00
Sebastian
57aa15a710 #1087 Add Spinner to Buttons while status change in progress 2020-10-14 11:14:44 +02:00
Sebastian
0edd316195 #1087 Allow to Print Abholfachetikett 2020-10-14 11:04:24 +02:00
Sebastian
a246c39be3 #1113 Update Wording on Shelf Search Page
Remove Title and Author From Search Suggestions
2020-10-14 10:28:03 +02:00
Sebastian
3d7173d50f #1087 Update Breadcrumb When Changing Status on History Page 2020-10-14 10:18:33 +02:00
Sebastian
2ed4c608a0 #1087 Refactor All Logic To Dedicated Service 2020-10-13 22:13:21 +02:00
Sebastian
d4c35a255c #1087 Re-Add Comment Section 2020-10-13 20:47:41 +02:00
Sebastian
b5b75ac967 #1085 (WiP) Add Partial Pickup 2020-10-13 16:20:58 +02:00
Sebastian
e30d36b93a #1085 (WiP) Fetch Button Display Logic From Server 2020-10-13 14:11:20 +02:00
Sebastian Neumair
d56f3e8221 Merged PR 351: #1087 Create & Print Lieferschein
Related work items: #1087
2020-10-13 07:10:16 +00:00
Sebastian
c491b47114 #1087 Lieferschein erneut drucken 2020-10-13 09:05:28 +02:00
Sebastian
61ba54066c #1087 HistoryDropdown (Special Case: Create & Print Shipping Note)
Add ShelfShippingNoteService & ShelfOrderDetailsService
2020-10-12 15:02:41 +02:00
Lorenz Hilpert
4dba96683f Merged PR 350: #1007 Min und Max Wert als default setzen wenn über bbzw unterschritten
#1007 Min und Max Wert als default setzen wenn über bbzw unterschritten
2020-10-12 07:37:08 +00:00
Sebastian
bb4d344737 #1087 Add Teilabholung Create and Print Shipping Note 2020-10-09 19:36:31 +02:00
Sebastian
75e6cb9d3f #1087 Add Teilabholung Create and Print Shipping Note 2020-10-09 19:30:53 +02:00
Sebastian
9b7aebd9fa #1087 Filter Duplicate Receipts in Store 2020-10-09 18:12:16 +02:00
Lorenz Hilpert
63c5967b6f #1007 Min und Max Wert als default setzen wenn über bbzw unterschritten 2020-10-09 17:11:09 +02:00
Sebastian
60b7913c7a #1087 Identify Receipts to Create and Print 2020-10-09 16:54:01 +02:00
Sebastian
c8a9e73b8b #1087 Fetch and Show Belegdaten 2020-10-09 16:19:36 +02:00
Sebastian
8a4c18df43 #1087 Fetch Receipts for Belegdaten on DetailsPage [Store] 2020-10-09 13:09:03 +02:00
Sebastian
b15d158617 #1087 Add Verification Code and Bezahlt-Marker on Detail Page 2020-10-09 11:22:40 +02:00
Sebastian Neumair
972de14e20 Merged PR 347: #1084 PCL Trefferliste | #1086 PCL Bearbeiten Seite
#1084 PCL Trefferliste | #1086 PCL Bearbeiten Seite

Related work items: #1084, #1086, #1102
2020-10-09 09:10:26 +00:00
Sebastian
3332c7e23c #1087 Add Create Lieferschein and Print Plus Button Styling 2020-10-08 17:09:10 +02:00
Sebastian
647129bbf2 #1087 Add Logic When To Display Print ShippingNote CtA 2020-10-08 15:13:14 +02:00
Sebastian
ca2f2cc24f #1087 Add Features to OrderDetailsCardInput 2020-10-08 15:10:55 +02:00
Sebastian Neumair
84c68da6f6 Merged PR 346: #1084 Trefferliste PCL
Related work items: #1084
2020-10-08 12:29:18 +00:00
Sebastian Neumair
014741e25a Merged PR 345: #1086 Edit Page Pay And Collect With Editable Meldenummer and Inline Validation
#1086

Related work items: #1086, #1102
2020-10-08 12:11:22 +00:00
Sebastian
df4493a5c3 #1084 Show Feature Spacer Only For Prebooked Feature 2020-10-08 13:04:15 +02:00
Sebastian
e59f2747b1 #1084 Hide Vorgemerkt Marker for Abgeholt Status 2020-10-08 13:04:15 +02:00
Sebastian
23c0690fd4 #1084 Show Changed Date for Status Storniert and Nicht Lieferbar 2020-10-08 13:03:43 +02:00
Sebastian
a508c587cb #1084 Center Format Detail Icon 2020-10-08 13:03:43 +02:00
Sebastian
42d0bf9d99 #1084 Change Font Sizing for Abholfachnummer 2020-10-08 13:03:43 +02:00
Sebastian
2d4413e7c7 #1094 Add Cursor Pointer to Result Card 2020-10-08 13:03:43 +02:00
Sebastian
b8ea8ed625 #1086 Layout Improvements Edit Page 2020-10-08 12:53:49 +02:00
Sebastian
602fb4fa4f #1086 Add Unit Tets for ShelfEditFormService and sscText Pipe 2020-10-08 12:16:36 +02:00
Sebastian
e249bcca5f #1086 Set sscText on Form Submit 2020-10-08 00:45:17 +02:00
Sebastian
694779d9ff §1086 Remove Duplicate Requests for available sscCodes 2020-10-08 00:24:30 +02:00
Sebastian
9af1bec78b #1086 Add Option To Change Meldenummer With Suggestion and Validation 2020-10-07 23:47:22 +02:00
Lorenz Hilpert
3eaad281d3 Merged PR 344: Dropdown bei 10+ Exemplareren durch Input ersetzt
Dropdown bei 10+ Exemplareren durch Input ersetzt

Related work items: #1007
2020-10-07 14:53:09 +00:00
Sebastian Neumair
808fd95783 Merged PR 343: #877 Set Filters on Initial Customer Search & Remove filtering results
#877 Set Filters on Initial Customer Search & Remove filtering results

Related work items: #877
2020-10-07 14:35:27 +00:00
Lorenz Hilpert
5d4b0b684c Dropdown bei 10+ Exemplareren durch Input ersetzt 2020-10-07 16:32:46 +02:00
Sebastian
2b5c737377 #988 Set Filters on Initial Customer Search & Remove filtering results 2020-10-07 11:28:10 +02:00
Sebastian Neumair
512e6fecdb Merged PR 342: #988 Start Search On Click Autocomplete Result
#988 Start Search On Click Autocomplete Result

Related work items: #988
2020-10-07 08:47:14 +00:00
Sebastian
9a34cb0cff #988 Start Search On Click Autocomplete Result 2020-10-06 17:11:14 +02:00
Lorenz Hilpert
d8ea34d88a Added Filter Overlay And Update Result Navigation
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-10-06 15:43:47 +02:00
Sebastian Neumair
7b8b3c10a6 Merged PR 341: #1100 Add CustomerType to User Model & Set Payer For B2B Customers
#1100 Add CustomerType to User Model & Set Payer For B2B Customers

Related work items: #1100
2020-10-06 10:32:09 +00:00
Sebastian
4cab1ad4a3 #1100 Add CustomerType to User Model & Set Payer For B2B Customers 2020-10-06 12:28:54 +02:00
Sebastian
6f7b3def90 Add GetFilters Call in CrmCustomer Service 2020-10-05 11:11:49 +02:00
Sebastian
7dc05b3065 Add Filter Overlay & Refactor Searchbox to own component 2020-10-02 17:01:42 +02:00
Lorenz Hilpert
d42fad4281 Merge branch 'feature/customer_pages' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/customer_pages 2020-10-02 15:02:40 +02:00
Lorenz Hilpert
81bc59ff7a Added Icon filter_alt 2020-10-02 15:02:21 +02:00
Sebastian
a02281fb7a Add @core/environment lib & iPad Scan Button on Search Page 2020-10-02 13:49:17 +02:00
Lorenz Hilpert
e609675349 Scan Icon hinzugefügt 2020-10-02 10:27:34 +02:00
Sebastian
fd220eb19f Re-Position Search Button 2020-10-02 10:27:14 +02:00
Sebastian
1434323130 Update Styling on Search Page 2020-10-02 10:10:17 +02:00
Sebastian
c4c9a0a46d [Customer Search Results] Add Lazy Loading and Loading Spinner 2020-10-01 21:47:43 +02:00
Sebastian
08103ab552 Add Scroll to Customer Search Result Page 2020-10-01 16:29:48 +02:00
Lorenz Hilpert
e8b068e5a0 Styling Customer Result Card
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-10-01 15:49:43 +02:00
Lorenz Hilpert
cc8cc57a48 Anpassung Icons search und back_alt 2020-10-01 12:25:51 +02:00
Lorenz Hilpert
d2093cc9d6 Added spinner Icon 2020-10-01 12:17:45 +02:00
Sebastian Neumair
e05c14a2ce Merged PR 337: Merge Warenausgabe Bug Fixes from develop to release || #1053 #1076 #1080 #1077 #1073 #1069
#1053 #1076 #1080 #1077 #1073 #1069

Related work items: #1069, #1076, #1077, #1080
2020-10-01 09:59:02 +00:00
Sebastian Neumair
68217ad2bb Merged PR 338: #1089 Check if sscText has value before populating form
#1089 Check if sscText has value before populating form

Related work items: #1089
2020-10-01 09:58:41 +00:00
Sebastian Neumair
b86c8fc083 Merged PR 339: #1090 Check if Filters Exist Before Fetching Filters
#1090 Check if Filters Exist Before Fetching Filters

Related work items: #1090
2020-10-01 09:58:22 +00:00
Sebastian Neumair
7bf7a0a70b Merged PR 340: #1091 Update Google Analytics Id
#1091 Update Google Analytics Id

Related work items: #1091
2020-10-01 09:58:08 +00:00
Sebastian
6da59ab62c Update Google Analytics Id 2020-10-01 11:43:22 +02:00
Sebastian
0a8632381d #1090 Check if Filters Exist Before Fetching Filters 2020-10-01 11:36:59 +02:00
Sebastian
3f45c80f60 #1090 Check if Filters Exist Before Fetching Filters 2020-10-01 11:33:09 +02:00
Sebastian
b1d7c81ee1 #1090 Check If Filter Exist Before Fetching Filters 2020-10-01 11:05:58 +02:00
Sebastian
890e09ac69 #1089 Check if sscText has value before populating form 2020-10-01 09:57:51 +02:00
Sebastian
f6a4a873fd Add Autocomplete Automatic Close, Loading Spinnner and General UI Requirements 2020-09-30 19:08:07 +02:00
Sebastian
267b8ed977 Add Unit Tests for MainComponent and CustomerSearchService 2020-09-30 15:38:54 +02:00
Lorenz Hilpert
f5e9ea81bf Merged PR 336: #1053 - Dropdown Auswahl aktiviert Bulletpoints
#1053 - Dropdown Auswahl aktiviert Bulletpoints
2020-09-30 10:24:15 +00:00
Lorenz Hilpert
c97990217c #1053 - Dropdown Auswahl aktiviert Bulletpoints 2020-09-30 12:21:19 +02:00
Sebastian
deb70faa8a Add Unit Tests for SearchMainComponent 2020-09-30 11:43:12 +02:00
Sebastian
581c542848 Add Search and Navigation 2020-09-29 18:19:56 +02:00
Sebastian Neumair
7fd5eb4c8e Merged PR 335: #1076 Refetch Filters On Restore Processes from User State
#1076 Refetch Filters On Restore Processes from User State

Related work items: #1076
2020-09-29 15:08:00 +00:00
Sebastian Neumair
3a4c9d7bd4 Merged PR 331: #1080 Use Pending Filters For Autocomplete Search
#1080 Use Pending Filters For Autocomplete Search

Related work items: #1080
2020-09-29 15:07:43 +00:00
Sebastian
0d019d6ab7 #1076 Refetch Filters On Restore Processes from User State 2020-09-29 17:06:07 +02:00
Sebastian
255d6bbb9d Add CustomerSearch Service 2020-09-29 16:38:51 +02:00
Sebastian
4a7032fb1b Add Unit Test for getCustomers 2020-09-29 09:49:46 +02:00
Sebastian
e2a58242f9 Add Routing and Customer Search Service 2020-09-28 17:54:05 +02:00
Sebastian
00887b3889 Add Autocomplete Functionality 2020-09-28 16:53:40 +02:00
Sebastian
4da22194af Add Stylelint Config & Clear Button in SearchBox
Add Stylelint Config & Clear Button in SearchBox
2020-09-28 15:27:48 +02:00
Lorenz Hilpert
2a9edff9c3 UnitTests @ui/searchbox
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-25 17:33:39 +02:00
Sebastian Neumair
8d0e6484b9 Merged PR 334: #1077 Set Pending Filters When SelectFilter[] has length
#1077 Set Pending Filters When SelectFilter[] has length

Related work items: #1076
2020-09-25 10:35:52 +00:00
Sebastian
cfa15b59f6 #1077 Set Pending Filters When SelectFilter[] has length 2020-09-25 12:22:51 +02:00
Lorenz Hilpert
fddb74ca26 Merged PR 333: #1053 Dropdown Auswahl aktiviert Bulletpoints
#1053 Dropdown Auswahl aktiviert Bulletpoints
2020-09-25 09:51:18 +00:00
Sebastian
d5a3fd47a7 #1080 Resolve Merge Conflicts 2020-09-25 11:48:30 +02:00
Lorenz Hilpert
c896d61016 #1053 Dropdown Auswahl aktiviert Bulletpoints 2020-09-25 11:01:56 +02:00
Sebastian
5cf9eced6b #1080 Update flatten function to handle empty options array 2020-09-25 10:55:52 +02:00
Sebastian
749d5bba02 #1080 Use Pending Filters for Autocomplete 2020-09-25 10:55:52 +02:00
Sebastian
6f5c6fa51c #1080 [WiP] Use Pending Filters for Autocomplete 2020-09-25 10:54:51 +02:00
Sebastian Neumair
d5699fdd05 Merged PR 332: #1077 Cancel Pending Search Requests and Hide Autocomplete during active search
#1077 Cancel Pending Search Requests and Hide Autocomplete during active search

Related work items: #1077
2020-09-25 08:52:20 +00:00
Sebastian
395526027b #1077 Cancel Request on Filter Overlay Close During Search & Reset State 2020-09-24 21:31:49 +02:00
Sebastian
a6dd070b4e #1077 Cancel Request on Filter Overlay Close During Search & Reset State 2020-09-24 21:25:45 +02:00
Sebastian
7013638631 #1077 Add Unit Tests for Hide Autocomplete Suggestions While Loading 2020-09-24 20:16:46 +02:00
Lorenz Hilpert
136906ff1a Implemented UiSearchbox Lib 2020-09-24 18:21:25 +02:00
Sebastian
36c8d2517a #1077 Hide Autocomplete While Loading 2020-09-24 16:05:20 +02:00
Sebastian
a2101328e7 #1077 Fail-Safe create Cancel-Sub if not existing on cancellation 2020-09-24 16:03:51 +02:00
Lorenz Hilpert
d96e14a154 Merged PR 330: #1073 Suche endet in Fehlermeldung
#1073 Suche endet in Fehlermeldung
2020-09-24 12:10:35 +00:00
Sebastian Neumair
3be12ad944 Merged PR 329: #1069 Update Button Sizing
#1069 Update Button Sizing

Related work items: #1069
2020-09-24 12:07:21 +00:00
Lorenz Hilpert
0716388141 #1073 Suche endet in Fehlermeldung 2020-09-24 14:06:49 +02:00
Sebastian
1260a1e9f8 #1077 Add Unit Tests For Cancellation 2020-09-24 13:59:28 +02:00
Sebastian
56ddf5b8b9 #1077 Cancel Request On Navigation 2020-09-24 12:47:18 +02:00
Sebastian
725307c022 #1069 Update Button Sizing 2020-09-24 11:13:31 +02:00
Sebastian Neumair
8a94ea3d82 Merged PR 328: #1076 Sync User State Processes With NgrxProcesses & Set Filters ForEach
Related work items: #1076
2020-09-24 08:38:15 +00:00
Sebastian
90d17ef359 #1076 Remove Unused rxjs operator imports 2020-09-23 23:54:30 +02:00
Sebastian
f866db3097 #1076 Remove Unused Import of AsyncScheduler 2020-09-23 23:53:04 +02:00
Sebastian
7f13b79547 #1076 Show Active Filter After Login 2020-09-23 23:45:01 +02:00
Sebastian
42d22dd514 #1076 Sync User State Processes With NgrxProcesses & Set Filters ForEach 2020-09-23 22:20:01 +02:00
Sebastian
b521e9dea0 2020-09-23 22:20:01 +02:00
Lorenz Hilpert
6f38011312 Added Libs for Customer Pages 2020-09-23 18:23:18 +02:00
Lorenz Hilpert
f1bc141a4e Merged PR 327: Added utils lib to project
Added utils lib to project
2020-09-23 12:24:49 +00:00
Lorenz Hilpert
0236459495 Added utils lib to project 2020-09-23 14:23:34 +02:00
Lorenz Hilpert
5c892a6fd6 Merged PR 326: Created Library for Managing Breadcrumbs
Created Library for Managing Breadcrumbs

Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-23 11:50:08 +00:00
Lorenz Hilpert
e5e3ba7df2 Created Library for Managing Breadcrumbs
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-23 13:49:24 +02:00
Michael Auer
7a6eabfda0 ~ Dockerfile: changed npm version from 10 to 12 2020-09-23 12:24:23 +02:00
Lorenz Hilpert
f2a14194bc Merged PR 325: Added UI Icon Library
Added UI Icon Library
2020-09-23 09:38:45 +00:00
Lorenz Hilpert
0f405c812c Added UI Icon Library 2020-09-23 11:32:57 +02:00
Lorenz Hilpert
b1da89717d Added Tailwind 2020-09-22 19:25:41 +02:00
Sebastian Neumair
57aa5701ad Merged PR 323: #925 Favicons | #1066 Catch Payer Undefined Error | #1061 View Destroyed Fix | #985 Checkmark Margin |
Related work items: #1066
2020-09-22 15:07:12 +00:00
Lorenz Hilpert
c43264f71c Angular 10 Update
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-22 14:57:47 +02:00
Lorenz Hilpert
bc0e4d5633 Angular 10 Commit before ng update command 2020-09-22 14:27:25 +02:00
Lorenz Hilpert
aaff8be246 Angular 10 before Upgrade 2020-09-22 14:19:42 +02:00
Lorenz Hilpert
e84b73c6ec Angular Update 9 2020-09-22 14:14:14 +02:00
Lorenz Hilpert
4ee7455169 ng update @angular/core@8 @angular/cli@8
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-22 12:37:52 +02:00
Lorenz Hilpert
b773cb2d25 Merged PR 322: build error fix: NodeJS.Timer
build error fix: NodeJS.Timer
2020-09-22 10:04:20 +00:00
Lorenz Hilpert
5c141d3bbe build error fix: NodeJS.Timer 2020-09-22 12:03:14 +02:00
Lorenz Hilpert
7a2a9237f7 Merged PR 321: #925 Design // Favoriten-Icon für ISA
#925 Design // Favoriten-Icon für ISA
2020-09-22 10:01:52 +00:00
Sebastian Neumair
c38c94cd36 Merged PR 320: #1066 Catch Payer Undefined in AddPayerReference Response
#1066 Catch Payer Undefined in AddPayerReference Response

Related work items: #1066
2020-09-22 10:00:18 +00:00
Lorenz Hilpert
75fb2045db #925 Design // Favoriten-Icon für ISA 2020-09-22 11:58:53 +02:00
Sebastian
1aafe81b37 #1066 Catch Payer Undefined in AddPayerReference Respomse 2020-09-22 11:49:47 +02:00
Lorenz Hilpert
ca5798e244 Merged PR 319: #1061 View Destroy aus Artikelsuche - Suchfeld
#1061 View Destroy aus Artikelsuche - Suchfeld
2020-09-22 09:49:11 +00:00
Lorenz Hilpert
3458b0a642 #1061 View Destroy aus Artikelsuche - Suchfeld 2020-09-22 11:43:48 +02:00
Lorenz Hilpert
8d905cf94d Merged PR 318: #985 WA Checkmark Margin
#985 WA Checkmark Margin
2020-09-22 08:40:08 +00:00
Lorenz Hilpert
768eac723d #985 WA Checkmark Margin 2020-09-22 10:37:59 +02:00
Lorenz Hilpert
da03e220ed Merged PR 317: lib Builds nicht mehr notwendig
lib Builds nicht mehr notwendig

Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-21 14:06:14 +00:00
Lorenz Hilpert
1985d4df51 lib Builds nicht mehr notwendig
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-21 16:04:46 +02:00
Sebastian Neumair
a28d2c05b3 Merged PR 316: #913 Show All Open Remissions #929 Stop Amoklauf #1049 Vorgemerkt-Marker #975 Store CleanUp #939 Personal-Wechsel Offene Remi
Related work items: #913, #929, #939, #975, #1049
2020-09-21 02:43:48 +00:00
Sebastian Neumair
7b77e8c234 Merged PR 315: #913 Hide Deleted Shipping Documents
+ Update Logic On Which Shipping Document to Display for a Given Remission

Related work items: #913
2020-09-18 12:05:57 +00:00
Sebastian
cc667c13bb #913 Hide Deleted Shipping Documents
+ Update Logic On Which Shipping Document to Display for a Given Remission
2020-09-17 21:40:58 +02:00
Sebastian Neumair
ca4803fda2 Merged PR 314: #929 Stop Amoklauf (UpdateShippingDocuent pipes to process and then take 1 ensures only one update is made)
+ Add ProductGroupName to continued process shipping document products

Related work items: #929
2020-09-17 15:53:04 +00:00
Lorenz Hilpert
df058030b0 Merged PR 312: Customer features werden nicht angezugt wenn disabled oder keine description
Customer features werden nicht angezugt wenn disabled oder  keine description
2020-09-17 15:24:15 +00:00
Lorenz Hilpert
d31db9f430 Merged PR 313: #1049 Vorgemerkt-Marker in Bestellpostendetails anzeigen
#1049 Vorgemerkt-Marker in Bestellpostendetails anzeigen
2020-09-17 15:23:57 +00:00
Sebastian
6d1d7ed65c #929 Add ProductGroupName to continued process shipping document products 2020-09-17 17:01:58 +02:00
Lorenz Hilpert
b2f3e58b59 #1049 Vorgemerkt-Marker in Bestellpostendetails anzeigen 2020-09-17 16:35:46 +02:00
Lorenz Hilpert
824f3babc4 Customer features werden nicht angezugt wenn disabled oder keine description 2020-09-17 16:26:30 +02:00
Sebastian
349259a3bd #929 Take1 on updateShippingDocument 2 update remi process in store once 2020-09-17 16:05:53 +02:00
Lorenz Hilpert
e2af856a24 Merged PR 310: #1028 - Update styling for ipad
#1028 - Update styling for ipad
2020-09-17 13:24:45 +00:00
Lorenz Hilpert
9debb4a4e2 Merged PR 311: removed color settings for vs code
removed color settings for vs code
2020-09-17 13:24:34 +00:00
Lorenz Hilpert
f68f4ae9fa removed color settings for vs code 2020-09-17 15:23:19 +02:00
Lorenz Hilpert
c532123a2c #1028 - Update styling for ipad 2020-09-17 15:21:15 +02:00
Lorenz Hilpert
4d196aa4eb Merged PR 309: #975 cleanup search results
#975 cleanup search results
2020-09-17 12:47:42 +00:00
Lorenz Hilpert
6e76c0d48e #975 cleanup search results 2020-09-17 14:40:13 +02:00
Lorenz Hilpert
25270474e7 Merged PR 308: #939 Personal-wechsel-bei-offener-Remi
#939 Personal-wechsel-bei-offener-Remi
2020-09-17 12:26:01 +00:00
Sebastian Neumair
97ddbac01e Merged PR 307: #913 Show all open remissions instead of all remissions of the last 7 days
+ Reduce number of http requests by getting all data from queryReturns call
+ reduce number of productGroup calls with shareReplay

Related work items: #913
2020-09-17 11:55:13 +00:00
Lorenz Hilpert
fd55d3a65e #939 Personal-wechsel-bei-offener-Remi 2020-09-17 13:54:14 +02:00
Sebastian
ca8c1b5f6b #913 Refactor QueryReturns to minimize no of server calls
+ Update cmf dependencies to ^0.1.34
2020-09-17 13:01:52 +02:00
Sebastian
ec5f494ba5 Remove unneccessary receipt calls and get all data with return calls 2020-09-17 13:01:34 +02:00
Sebastian
152feb010f Show All Open Remissions
Cache Products Group Name Request
Hide Deleted Shipping Documents (Remissions) (WiP)
2020-09-17 13:01:34 +02:00
Sebastian Neumair
c93e568ea1 Merged PR 301: #991 #995 #1022 Merge Warenausgabe Fixes
Related work items: #991, #995, #1022
2020-09-17 08:54:38 +00:00
Lorenz Hilpert
31b3d67974 Merged PR 306: Detailseite Header Bestellkanal
Detailseite Header Bestellkanal

Related work items: #1041
2020-09-16 17:18:30 +00:00
Lorenz Hilpert
a969ed775e Merged PR 305: #975 ISA_NGRX_STATE exceeded the quota
#975 ISA_NGRX_STATE exceeded the quota
2020-09-16 17:17:59 +00:00
Lorenz Hilpert
3ea3f54286 Detailseite Header Bestellkanal 2020-09-16 18:37:05 +02:00
Sebastian Neumair
c241545bd1 Merged PR 304: #1033 Remove Nachbestellen CtA on Status "Storniert Lieferant" (2048)
#1033 Remove Nachbestellen CtA on Status "Storniert Lieferant" (2048)

Related work items: #1033
2020-09-16 16:25:52 +00:00
Lorenz Hilpert
196a0c309a #975 ISA_NGRX_STATE exceeded the quota 2020-09-16 18:25:00 +02:00
Sebastian
288737aed3 #1033 Remove Nachbestellen CtA on Status "Storniert Lieferant" (2048) 2020-09-16 17:35:25 +02:00
Lorenz Hilpert
edc3329f5a Merged PR 303: Remission // Personal wechsel bei offener Remi
Related work items: #939
2020-09-16 15:23:14 +00:00
Lorenz Hilpert
6813eadced 2020-09-16 16:51:11 +02:00
Lorenz Hilpert
5a069e5fce Remission Lib hinzugefügt 2020-09-16 16:50:11 +02:00
Sebastian Neumair
7189cc31d1 Merged PR 302: #1033 Remove "Nachbestellt" Option in Status Change Dropdowns
#1033 Remove "Nachbestellt" Option in Status Change Dropdowns

Related work items: #1033
2020-09-16 08:30:39 +00:00
Sebastian
d1570d2079 #1033 Remove "Nachbestellt" Option in Status Change Dropdowns 2020-09-15 18:43:43 +02:00
Sebastian Neumair
1f60ee2eb9 Merged PR 299: #1022 Fix Header Column Sizing for Shelf Header (Details Page and Edit Page)
Related work items: #1022
2020-09-15 13:33:18 +00:00
Sebastian Neumair
c9d078047e Merged PR 300: #995 #992 Apply Pending Filters On Click Searchbar Icon & Center Apply Filter Button On Small Desktop Devices
Related work items: #991, #995
2020-09-15 13:33:11 +00:00
Sebastian
76fce84661 #992 Minimize button Width to extend arrow up&down clickable area 2020-09-15 15:24:31 +02:00
Sebastian
ecf4437cf6 #995 Apply Pending Filters On Click Searchbar Icon 2020-09-15 15:03:07 +02:00
Sebastian
c04ad8fd4d #992 Center Apply Filter Button on very small desktop devices 2020-09-15 14:40:15 +02:00
Sebastian Neumair
56c2b16916 Merged PR 298: #1022 Eliminate unused width-container utility classes
#1022 Eliminate unused width-container utility classes
2020-09-15 09:02:06 +00:00
Sebastian
e6d03dc5ea #1022 Eliminate unused width-container utility classes 2020-09-15 10:50:21 +02:00
Sebastian Neumair
d2998d42f3 Merged PR 297: #1022 Fix Header Column Sizing for Shelf Header (Details Page and Edit Page)
#1022 Fix Header Column Sizing for Shelf Header (Details Page and Edit Page)

Related work items: #1022
2020-09-15 08:29:09 +00:00
Sebastian
af31afac17 #1022 Fix Header Column Sizing for Shelf Header (Details Page and Edit Page) 2020-09-15 10:23:03 +02:00
Sebastian Neumair
73fa821f19 Merged PR 296: Merge Bugfixes from Develop to Release Branch
Related work items: #893, #991, #1012, #1013, #1016, #1029
2020-09-14 16:02:30 +00:00
Sebastian Neumair
f83e0bc88c Merged PR 295: #1092 Check Scanned Barcode Value before writing to store
#1092 Check Scanned Barcode Value before writing to store

Related work items: #1029
2020-09-14 13:23:07 +00:00
Sebastian
2d1a5aad44 #1092 Check Scanned Barcode Value before writing to store 2020-09-14 15:22:16 +02:00
Sebastian Neumair
fdd18e656c Merged PR 294: #1092 Synchronize Scanned Value With Store for Reuse in Filter Overlay
+ Filter Scan Started Event

Related work items: #1029
2020-09-14 13:08:37 +00:00
Lorenz Hilpert
7d2d0a1af4 Merged PR 293: #1031 Fix: Printer-Dialog an iPad erscheint nicht
#1031 Fix:  Printer-Dialog an iPad erscheint nicht
2020-09-14 13:06:55 +00:00
Sebastian
77cccd225f + Filter Scan Started Event 2020-09-14 15:06:10 +02:00
Lorenz Hilpert
bb591b8fca #1031 Fix: Printer-Dialog an iPad erscheint nicht 2020-09-14 14:46:23 +02:00
Sebastian Neumair
81b59440eb Merged PR 292: #1029 Update Searchbar Query After Scanning With Scanned Value
#1029 Der gescannte Wert wird vor der Suche jetzt in der Suchfeld geschrieben.

// Da ich lokal nicht den nativen Container testen kann, kann ich das Scanning nicht testen. Kann sein das nochmal Aenderungen vonnoeten sind.
2020-09-14 12:32:43 +00:00
Sebastian
9809e75b33 Fix Apply Filters Button Position 2020-09-14 14:31:46 +02:00
Sebastian
c588ed7784 #1029 Update Searchbar Query After Scanning With Scanned Value 2020-09-14 14:10:19 +02:00
Sebastian Neumair
21d9b67086 Merged PR 291: #991 Add Shadow to Up&Down Button
#991 Add Shadow to Up&Down Button

Related work items: #991
2020-09-14 11:25:00 +00:00
Lorenz Hilpert
774815966b Merged PR 290: Merge 2020-09-14 10:54:04 +00:00
Sebastian
f6bf2d21ee #991 Add Shadow to Up&Down Button 2020-09-14 12:52:54 +02:00
Lorenz Hilpert
1b9f5bf0b9 Merged PR 289: #1028 WA // Anmerkung styling
#1028 WA // Anmerkung styling
2020-09-14 10:42:31 +00:00
Lorenz Hilpert
39655965e8 #1028 WA // Anmerkung styling 2020-09-14 12:31:51 +02:00
Sebastian Neumair
faecc6f857 Merged PR 287: #991 Show Filter Button on Safari Browser
Related work items: #991
2020-09-14 08:39:14 +00:00
Sebastian Neumair
edbc5279b3 Merged PR 288: #1013 Fix Duplicate Check in AddResult Reducer
Related work items: #1013
2020-09-14 08:38:54 +00:00
Sebastian
2aa7acad6a #991 Add Box Shadow to apply filters button 2020-09-14 10:27:58 +02:00
Sebastian
a74c05be60 #1013 Fix Duplicate Check in AddResult Reducer 2020-09-14 10:27:24 +02:00
Sebastian
038cb6c7a8 #991 Various UI Fixes for Filter Button on iPad
Unsubscribe updateHeight oDestroy
Position FIlter Button on iPad Sticky to allow for scrolling
2020-09-13 22:34:31 +02:00
Sebastian
7e33832197 #991 Fix Button Not Shown on Safari Browser 2020-09-11 17:56:16 +02:00
Lorenz Hilpert
1e83a3efbe Merged PR 286: Fix Fehlermeldung filters of undefined in der Warenausgabe
Fix Fehlermeldung filters of undefined in der Warenausgabe
2020-09-11 14:54:48 +00:00
Lorenz Hilpert
732bc9e4aa Fix Fehlermeldung filters of undefined in der Warenausgabe 2020-09-11 16:22:23 +02:00
Lorenz Hilpert
d05ff90031 Merged PR 285: #1005 Anmerkungen werden nicht angezeigt
#1005 Anmerkungen werden nicht angezeigt
2020-09-11 13:53:49 +00:00
Lorenz Hilpert
f36050882f #1005 Anmerkungen werden nicht angezeigt 2020-09-11 15:52:05 +02:00
Sebastian Neumair
07bcddf7b5 Merged PR 283: #1013 Remove Clear Results on Add Result To Update Result List
#1013 Remove Clear Results on Add Result To Update Result List

+ check if all results are loaded before fetching new results

Related work items: #1013
2020-09-11 10:43:25 +00:00
Sebastian Neumair
efaa5d1106 Merged PR 284: #1016 Check for presence of order details before navigating
#1016 Check for presence of order details before navigating

Related work items: #1016
2020-09-11 10:43:18 +00:00
Sebastian
2f4f8bd95c #1016 Check for presence of order details before navigating 2020-09-11 12:40:00 +02:00
Sebastian
ddc92958ac #1013 Remove Clear Results on Add Result To Update Result List
+ check if all results are loaded before fetching new results
2020-09-11 12:14:53 +02:00
Sebastian Neumair
c4b254b26c Merged PR 282: Set Correct Skip on Subsequent Search
Related work items: #1012
2020-09-11 09:09:52 +00:00
Sebastian
ce9efd3f28 Fix Skip Eval Falsy on 0 Value 2020-09-11 11:07:42 +02:00
Sebastian Neumair
e06099f1a4 Merged PR 279: Fix Process Being Incorrectly Updated From Add Cart To Process Causing Process Errors and Empty Result List
Related work items: #893
2020-09-10 14:10:58 +00:00
Sebastian Neumair
3d67ebf6f1 Merged PR 281: #913 Update RegEx to spot customer card numbers
& allow for customer card numbers with spaces
2020-09-10 14:10:51 +00:00
Lorenz Hilpert
f33bc7ee50 Merged PR 280: #896 Abschluss von wieder geöffnetem Warenbegleitschein nicht möglich
#896 Abschluss von wieder geöffnetem Warenbegleitschein nicht möglich
2020-09-10 13:28:37 +00:00
Sebastian
624eb87467 #913 Update RegEx to spot customer card numbers
& allow for customer card numbers with spaces
2020-09-10 15:26:32 +02:00
Lorenz Hilpert
1bdbaa5c31 #896 Abschluss von wieder geöffnetem Warenbegleitschein nicht möglich 2020-09-10 14:53:58 +02:00
Sebastian
63d65c3679 Fix Process Being Incorrectly Updated From Add Cart To Process 2020-09-10 14:30:22 +02:00
Michael Auer
4ef6cc7d3e ~ version bump: 1.1 2020-09-10 07:07:56 +02:00
Lorenz Hilpert
7ebaf68117 Merged PR 278: Run Command > npx prettier --write .
Run Command > npx prettier --write .
2020-09-09 14:16:49 +00:00
Lorenz Hilpert
0b0f0706b7 Run Command > npx prettier --write . 2020-09-09 16:15:14 +02:00
Lorenz Hilpert
b8924fbf43 Merged PR 218: prettier and vs code recommendations 2020-09-09 14:03:07 +00:00
Lorenz Hilpert
f043d9a019 Merge branch 'develop' into prettier-and-vscode-extensions 2020-09-09 16:02:17 +02:00
Sebastian Neumair
038cfc6862 Merged PR 277: fix: Remove branchNumber from GoodsInService Search Method Params
fix: Remove branchNumber from GoodsInService Search Method Params
2020-09-09 13:54:38 +00:00
Sebastian
0e33288a2a fix: Remove branchNumber from GoodsInService Search Method Params 2020-09-09 15:49:49 +02:00
Michael Auer
c3682f2c05 MERGE branch integration into develop (CONFLICTS resolved) 2020-09-09 15:24:42 +02:00
Lorenz Hilpert
0c5e7430f6 Merged PR 276: Output hashing enabled
Output hashing enabled
2020-09-09 10:03:18 +00:00
Lorenz Hilpert
ae89a4e3db Output hashing enabled 2020-09-09 12:01:37 +02:00
Sebastian Neumair
dffa0e3627 Merged PR 275: Fix Product Search Page Scanning
Fix Product Search Page Scanning

Related work items: #274, #950
2020-09-09 09:24:23 +00:00
Sebastian
2d384debd6 Remove Barcde Search p-tag used for debuggingpurposes 2020-09-08 21:39:33 +02:00
Sebastian
3cc35fef03 Fix Product Search Page Scanning 2020-09-08 21:26:29 +02:00
Lorenz Hilpert
f3c8e9024f Merged PR 274: Mit der letzten Integration ersetzt
Mit der letzten Integration ersetzt
2020-09-08 15:33:34 +00:00
Lorenz Hilpert
9c175efa5f Mit der letzten Integration ersetzt 2020-09-08 17:32:11 +02:00
Lorenz Hilpert
84777be5cf Merged PR 273: #274 Anzeige Uhrzeit in der Trefferliste
#274 Anzeige Uhrzeit in der Trefferliste

Related work items: #274
2020-09-08 15:13:13 +00:00
Lorenz Hilpert
484ffda3ef Text Uhr hinzugefügt 2020-09-08 17:12:29 +02:00
Lorenz Hilpert
5643da6693 #274 Anzeige Uhrzeit in der Trefferliste 2020-09-08 17:09:51 +02:00
Lorenz Hilpert
5c0b057e4c Merged PR 272: #274 - Artikel Scan Fehler
#274 - Artikel Scan Fehler

Related work items: #274
2020-09-08 15:07:56 +00:00
Lorenz Hilpert
6d6c3073fb #274 - Artikel Scan Fehler 2020-09-08 17:06:36 +02:00
Sebastian Neumair
fe3915be9f Merged PR 271: Show Date and Time on Geandert Timestamp on Detail Page
Show Date and Time on Geandert Timestamp on Detail Page

Related work items: #274
2020-09-08 14:26:28 +00:00
Sebastian
a1ded4ff38 Show Date and Time on Geandert Timestamp on Detail Page 2020-09-08 16:24:19 +02:00
Sebastian Neumair
2be18e4b56 Merged PR 269: #581 Show Eingetroffen CtA On Status Abgeholt
#581 Show Eingetroffen CtA On Status Abgeholt

Related work items: #581
2020-09-08 13:41:07 +00:00
Sebastian
91613997d3 #581 Show Eingetroffen CtA On Status Abgeholt 2020-09-08 15:37:39 +02:00
Lorenz Hilpert
ad9defeeb9 Merged PR 268: Sonderfälle haben nun Geändert als Info Feld
Sonderfälle haben nun Geändert als Info Feld

Related work items: #274
2020-09-08 13:28:13 +00:00
Lorenz Hilpert
774ed0a30f Sonderfälle haben nun Geändert als Info Feld 2020-09-08 15:26:25 +02:00
Lorenz Hilpert
be565cbc74 Merged PR 267: #950 Fix Auswertung Scan Result
#950 Fix Auswertung Scan Result
2020-09-08 12:41:56 +00:00
Lorenz Hilpert
be4c91b2a7 #950 Fix Auswertung Scan Result 2020-09-08 14:39:47 +02:00
Lorenz Hilpert
9a3ca38b7a Merged PR 266: #950 stringyfiy Barcode
#950 stringyfiy Barcode
2020-09-08 11:31:30 +00:00
Lorenz Hilpert
f3c2df64c9 #950 stringyfiy Barcode 2020-09-08 13:30:49 +02:00
Michael Auer
3b101a9e1a azure-pipelines.yml: ! corrected branch expression for release-branches 2020-09-08 13:08:39 +02:00
Lorenz Hilpert
e4c12f575b Merged PR 265: #950 NativeContainerService für Scanning
#950 NativeContainerService für Scanning
2020-09-08 11:03:20 +00:00
Lorenz Hilpert
211fd78dc7 #950 NativeContainerService für Scanning 2020-09-08 12:58:10 +02:00
Michael Auer
60971792ec azure-pipelines.yml: added release/* for prod-build 2020-09-08 11:41:39 +02:00
Sebastian Neumair
77e0dad4a2 Merged PR 264: #954 Edit Page: Optimize Layout for Safari & Text Color Disabled State
Related work items: #954
2020-09-08 08:25:46 +00:00
Sebastian
4783dfbd48 #950 Increase Dropdown Elements Size 2020-09-07 22:30:59 +02:00
Sebastian
7dc22689d6 Add Option To Ignore TouchEvents in ClickOutsideDirective 2020-09-07 22:02:49 +02:00
Sebastian
740206fd08 Edit Page: Optimize Layout for Safari & Text Color Disabled State 2020-09-07 21:32:59 +02:00
Lorenz Hilpert
853e49a231 Merged PR 263: #963, #935
Related work items: #935, #963
2020-09-07 17:23:47 +00:00
Sebastian Neumair
86496869c5 Merged PR 262: #260 Detail Page: Highlight Selected Value
Related work items: #260
2020-09-07 15:35:17 +00:00
Lorenz Hilpert
dfb96c735d #963 Shelf Detail Store: Identifier OrderItemSubsetId anstatt OrderItemId 2020-09-07 17:34:02 +02:00
Lorenz Hilpert
7023635c2d Query Update: Fetch Data for Details from all Branches 2020-09-07 17:22:13 +02:00
Sebastian
90cde380d2 Merge remote-tracking branch 'origin/feature/189-Warenausgabe/Detail-Page-Dropdown-Highlight-Selected-Value' into feature/189-Warenausgabe/Detail-Page-Dropdown-Highlight-Selected-Value 2020-09-07 17:12:48 +02:00
Sebastian
8c98fbb564 Detail Page: Highlight Selected Value 2020-09-07 17:12:40 +02:00
Sebastian
60a794a6ab Detail Page: Highlight Selected Value 2020-09-07 17:01:29 +02:00
Sebastian Neumair
3b23a6af7b Merged PR 261: Show Title and Contributors on Edit Page
Move title pipe to shelf pipe module for reusuability

Related work items: #193
2020-09-07 13:36:43 +00:00
Sebastian
ee4ccd9e84 Merge branch 'feature/189-Warenausgabe/957-Show-Error-On-Edit-Page-Submit-Failure' into feature/189-Warenausgabe/main 2020-09-07 13:35:35 +02:00
Sebastian Neumair
4c8006c836 Merged PR 260: #957 Show error message for failed submit requests on edit page / + Restore Scroll Position
Related work items: #957
2020-09-07 11:28:02 +00:00
Sebastian
f4c9fe355a Show Title and Contributors on Edit Page
Move title pipe to shelf pipe module
2020-09-07 13:25:13 +02:00
Sebastian
283803d55a #261 Patch PickUpDeadline (compartmentStop) from Edit Page 2020-09-07 12:23:15 +02:00
Sebastian
a8016b0c7d #957 Show error message for failed submit requests on edit page 2020-09-07 12:03:23 +02:00
Sebastian
bf75dc5db7 Merge branch 'feature/189-Warenausgabe/264-Warenausgabe-Edit-Page-QA-Feedback' into feature/189-Warenausgabe/main 2020-09-07 11:00:17 +02:00
Sebastian Neumair
16dfcab4a7 Merged PR 259: #264 Edit Page: Full Width Input and Price with two decimal places
Related work items: #264
2020-09-07 08:49:26 +00:00
Sebastian
62acbdecc5 Warenausgabe Edit Page: Show Price with two decimal places 2020-09-04 20:56:40 +02:00
Sebastian Neumair
6e2ff83336 Merged PR 258: Add Scroll Position Restoration on Shelf Details Page 2020-09-04 15:08:27 +00:00
Sebastian Neumair
66a2fd772a Merged PR 257: Add Underscore between compartmentCode and compartmentInfo
Add Underscore between compartmentCode and compartmentInfo

Related work items: #952
2020-09-04 15:08:05 +00:00
Sebastian
aca691fe2e Add Scroll Position Restoration on Shelf Details Page 2020-09-04 17:05:30 +02:00
Sebastian
9c4f2b8395 Add FullWidth Support to Text Input Component 2020-09-04 16:19:06 +02:00
Sebastian
d529ed0b17 Add Scroll Position Restoration Directive 2020-09-04 15:26:42 +02:00
Sebastian
c5e73bf578 Add Underscore between compartmentCode and compartmentInfo 2020-09-04 14:23:18 +02:00
Sebastian Neumair
9aa9e2155b Merged PR 256: #948 #949 Post-QA Bug Fixes and Improvements to Warenausgabe
Related work items: #944, #947, #948, #949
2020-09-04 10:58:28 +00:00
Sebastian Neumair
c7407c5036 Merged PR 254: #949 #948 Show Error Message on Shelf History Page | Catch Invalid SearchQuery Error in Searchbar Component
Related work items: #948, #949
2020-09-04 10:51:08 +00:00
Sebastian Neumair
7bd2e51148 Merged PR 255: Set Results Hits Based on Actual Result Hits (old: filterdCustomer hits)
Set Results Hits Based on Actual Result Hits (old: filterdCustomer hits)

Related work items: #877
2020-09-04 10:50:35 +00:00
Sebastian
8c988f0917 Set Results Hits Based on Actual Result Hits (old: filterdCustomer hits) 2020-09-04 12:31:17 +02:00
Sebastian
3b19f5c6ab Reactivate Old Edit Page For Entry Via Customer Module 2020-09-04 11:44:30 +02:00
Sebastian
79a1a5befc Warenausgabe Breadcrumb Header: Hide Filter on History and Edit Page 2020-09-04 10:58:41 +02:00
Sebastian Neumair
b2496e1c57 Merged PR 252: Set Correct Last Previous Path on Status Change
Related work items: #947
2020-09-03 21:59:03 +00:00
Sebastian
6a5546d0f2 #948 Catch Invalid SearchQuery Error in Searchbar Component 2020-09-03 23:56:11 +02:00
Sebastian
c72de1f08b Show Error Message on Shelf History Page 2020-09-03 23:40:24 +02:00
Lorenz Hilpert
1ac67cf1e5 Merged PR 253: Padding angepasst
Padding angepasst
2020-09-03 21:32:51 +00:00
Lorenz Hilpert
ad1cb0ff5d Padding angepasst 2020-09-03 23:31:01 +02:00
Sebastian Neumair
0270216f49 Merged PR 250: Add Search with CustomerCard (query for customerNumber before querying))
Related work items: #944
2020-09-03 15:10:10 +00:00
Sebastian Neumair
881ee9d8c7 Merged PR 251: Add Error Log (stacktrace) for startRemission Calls
Add Error Log (stacktrace) for startRemission Calls

Related work items: #929
2020-09-03 15:09:49 +00:00
Sebastian
6cd15f8eba Add Error Log (stacktrace) for startRemission Calls 2020-09-03 17:05:08 +02:00
Sebastian
03e4bcf760 Await Navigation Before Replacing last visited path 2020-09-03 12:40:56 +02:00
Sebastian
a3c53096ad Breadcrumb Management & History State Management on Status Change (WiP) 2020-09-03 12:12:16 +02:00
Sebastian
39de228eff Add Search with CustomerCard (query for customerNumber before querying)) 2020-09-03 10:55:04 +02:00
Lorenz Hilpert
7597832cbf Merged PR 248: Feature Warenausgeb
Related work items: #264
2020-09-02 16:14:45 +00:00
Lorenz Hilpert
cc69a0a24e Layout Fix; Edit Navigation Fix 2020-09-02 18:14:10 +02:00
Lorenz Hilpert
29160abb97 Merge branch 'develop' into feature/189-Warenausgabe/main 2020-09-02 17:45:55 +02:00
Sebastian Neumair
a68d9bc906 Merged PR 247: #264 Bearbeiten Detail Seite + Various Bug Fixes
Related work items: #264
2020-09-02 15:34:03 +00:00
Lorenz Hilpert
2bf7987280 Merged PR 243: Message bei Inaktivität geädnert
Message bei Inaktivität geädnert

Related work items: #738
2020-09-02 15:33:56 +00:00
Sebastian
3e81c825cf Merge branch 'feature/189-Warenausgabe/264-Bearbeiten/689-Edit-Form-Content-And-Styling' into feature/189-Warenausgabe/264-Bearbeiten/main 2020-09-02 17:25:08 +02:00
Sebastian
342dd04452 Update Calendar To Disable Sundays 2020-09-02 17:04:45 +02:00
Sebastian
9bc9be8538 Fix Duplicate Lieferdatum 2020-09-02 15:25:44 +02:00
Sebastian
41791981d7 Breadcrumb & Bookmark Styling 2020-09-02 15:12:58 +02:00
Sebastian
3fb6cd29f7 Update Search Result Hits in Breadcrumb 2020-09-02 12:21:28 +02:00
Sebastian
c2d021104c Merge remote-tracking branch 'origin/feature/189-Warenausgabe/264-Bearbeiten/689-Edit-Form-Content-And-Styling' into feature/189-Warenausgabe/264-Bearbeiten/689-Edit-Form-Content-And-Styling 2020-09-02 11:21:44 +02:00
Sebastian
4b3aedc685 Update Status, EstimatedShippingDate and PickUp Date in History Header 2020-09-02 11:21:39 +02:00
Lorenz Hilpert
0454d7e687 Order Details Card Anzeige Geändert 2020-09-02 11:18:09 +02:00
Sebastian
cfdf151b56 Remove Divider When Estimated Shipping Date or PickUp Date Not Shown 2020-09-02 07:34:23 +02:00
Sebastian
6cd85bcb58 Add Sticky Header on Edit Page 2020-09-01 21:24:33 +02:00
Sebastian
be05cf7fdd Update Placeholder for "Anmerkung" from "-" to "" 2020-09-01 20:54:56 +02:00
Sebastian
e4a58baba0 Fix SpecialComment Patch with undefined 2020-09-01 20:49:35 +02:00
Lorenz Hilpert
1620df76b9 Header zur Hinstory hinzugefügt 2020-09-01 18:38:41 +02:00
Lorenz Hilpert
a1c7167e50 Status Sortierung, Datepicker Styling, ROrderItem und OrderItemSubset Patch fix
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-09-01 17:30:34 +02:00
Michael Auer
6e7925a18c merge tag '923-Druckerdialog-Druckliste-ist-nicht-scrollbar' into develop 2020-09-01 15:27:13 +02:00
Michael Auer
053e28483e merge tag '875-Breadcrumb-Remission-Review-Zuruecksetzen-Verhalten' into develop 2020-09-01 15:25:37 +02:00
Michael Auer
b5d7f084f2 merge tag '889-Warenausgabe-Button-in-Navgation-deaktivieren' into develop 2020-09-01 15:23:34 +02:00
Sebastian
1c1a6c05c2 Update Editable Fields 2020-09-01 11:26:26 +02:00
Sebastian
3ebe35a0f6 Update ProcessingStatus Mapping and Wording 2020-09-01 11:14:05 +02:00
Sebastian
bd0d9765fd Update Processing Status Mapping on Details Page 2020-09-01 10:13:59 +02:00
Sebastian
b8faf2f2d6 Update ProcessingStatus Mapping 2020-09-01 09:43:02 +02:00
Sebastian
eb280d4533 Add Navigation on Patch Complete (incl. ProcessingStatus changed case)
+ Minor Stzling Changes Label Edit Page
+ Only Show enabled Status Options in Processing Status Dropdown
2020-08-31 22:30:05 +02:00
Lorenz Hilpert
720efdb3a4 Merge from Main Feature and Calling Update Requests for Shelf Items 2020-08-31 18:36:35 +02:00
Lorenz Hilpert
994ff7b31a Push Missing Changes 2020-08-31 13:22:04 +02:00
Lorenz Hilpert
cc55656b76 Merge branch 'feature/189-Warenausgabe/main'
Conflicts:
	apps/sales/src/app/modules/shelf/components/order-details-card/order-details-card.component.html
	apps/sales/src/app/modules/shelf/components/order-item-details/order-item-details.component.html
	apps/sales/src/app/modules/shelf/components/search-result-group/search-result-group.component.html
	apps/sales/src/app/modules/shelf/constants/processing-status-name.map.ts
	apps/sales/src/app/modules/shelf/pages/shelf-order-details/shelf-order-details.component.html
	apps/sales/src/app/modules/shelf/pages/shelf-order-details/shelf-order-details.component.ts
	apps/sales/src/app/modules/shelf/pipes/shelf-pipes.module.ts
	apps/sales/src/app/modules/shelf/shared/services/shelf-navigation.service.ts
	apps/sales/src/app/modules/shelf/shelf-routing.module.ts
	apps/sales/src/app/store/customer/shelf/details/details.actions.ts
	apps/sales/src/app/store/customer/shelf/details/details.effects.ts
	apps/sales/src/app/store/customer/shelf/details/details.facade.ts
	apps/sales/src/app/store/customer/shelf/details/details.reducer.ts
	apps/swagger/oms/src/lib/models/order-item-list-item-dto.ts
2020-08-31 13:21:40 +02:00
Sebastian
5f1733e147 Fix LabelPipe 2020-08-31 11:43:05 +02:00
Sebastian
d9c25dacf3 Fix Build Error 2020-08-31 11:31:47 +02:00
Lorenz Hilpert
a762c6b1b4 #260 Fix Teilabholung Id Falsch gesetzt 2020-08-31 05:16:41 +02:00
Lorenz Hilpert
570f237399 Anpassung Store/Facade; Routing enthält Status; 2020-08-31 04:40:00 +02:00
Lorenz Hilpert
cea4d9e4fb #258 Mehr - Weniger Pfeile geändert 2020-08-31 04:38:59 +02:00
Lorenz Hilpert
1518c0e41b Swagger Gen - Print API 2020-08-26 13:06:50 +02:00
Lorenz Hilpert
8ac66c12cb #258 - Warenausgabe // Detailseite - "Mehr" and "Weniger" - MwSt Wert laden 2020-08-20 17:52:10 +02:00
Lorenz Hilpert
8a2df5d060 Warenausgabe Details Sticky Buttons & setArrivedAndPrint function angepasst 2020-08-20 15:56:02 +02:00
Lorenz Hilpert
65aa27e64f Änderung Patch Comment 2020-08-20 14:47:23 +02:00
Lorenz Hilpert
6e78b4bacd #258 missing changes in order-item-details html 2020-08-20 12:27:54 +02:00
Lorenz Hilpert
b3509b510e #258 - Detailseite - "Mehr" and "Weniger" 2020-08-20 12:27:24 +02:00
Lorenz Hilpert
e143067a52 #854 - status Storniert x 2020-08-20 11:57:14 +02:00
Lorenz Hilpert
b1a5e0827a #853 - Abstände Format Icon 2020-08-20 11:45:33 +02:00
Holger Moritz
ea15f1941e Merged PR 246: Styling für Druckerdialog - Dropdown Max Höhe 350px
Styling für Druckerdialog - Dropdown Max Höhe 350px

Related work items: #923
2020-08-20 09:05:10 +00:00
Lorenz Hilpert
c7549b8594 #261 - Detailseite - Abholfrist 2020-08-19 17:29:08 +02:00
Lorenz Hilpert
a79e84fad8 #262 - Detailseite - Status ändern 2020-08-19 15:53:43 +02:00
Lorenz Hilpert
c9d7faf9a1 #263 - Detailseite - Anmerkung hinzufügen 2020-08-19 12:55:51 +02:00
Lorenz Hilpert
d87ceb1f74 #854 - status Storniert x Icon Anpassung 2020-08-18 17:45:35 +02:00
Lorenz Hilpert
c8fa18ed29 #855 Zeilenabstände 2020-08-18 17:32:36 +02:00
Lorenz Hilpert
2d5d461f02 Styling für Druckerdialog - Dropdown Max Höhe 350px 2020-08-18 16:50:49 +02:00
Lorenz Hilpert
87885cb0bd Message bei Inaktivität geädnert 2020-08-18 16:08:05 +02:00
Lorenz Hilpert
ad929324df Ändeung deadline, Styling Warenausgabe, Mehrfachauswahl 2020-08-18 15:33:31 +02:00
Lorenz Hilpert
ee2805332b Merge branch 'feature/189-Warenausgabe/264-Bearbeiten/main' into feature/189-Warenausgabe/main 2020-08-11 13:51:21 +02:00
Lorenz Hilpert
c1c2f3c41f Navigation zur Orderitem History 2020-08-11 12:49:03 +02:00
Lorenz Hilpert
a618ff0b63 Merge branch 'feature/189-Warenausgabe/main' into feature/189-Warenausgabe/578-Details-bestellt/main 2020-08-11 12:40:13 +02:00
Lorenz Hilpert
47e468b585 Detailseite für Warenausgabe bestellt/nachbestellt 2020-08-11 12:38:58 +02:00
Sebastian
891d2723c8 Fix Autocomplete Selection Changes Pending Filters 2020-07-30 17:57:55 +02:00
Sebastian
1b65354900 Fix Filters Empty on First Open 2020-07-30 17:20:23 +02:00
Sebastian
5a8c6111ff (WiP) Patch Form 2020-07-30 17:01:03 +02:00
Sebastian
fd1e2bfd84 (WiP) Create OrderNumber Edit Component 2020-07-30 12:11:30 +02:00
Sebastian
e388ca553e (WiP) Bearbeiten Seite Ui 2020-07-29 18:10:23 +02:00
Sebastian
cf6fbf9799 (WiP) Add Item Edit Form 2020-07-28 18:24:52 +02:00
Sebastian Neumair
56a2fce2b3 Merged PR 241: Add Intersection Observer Polyfill
+ Update Core Services due to changes in OMS

Related work items: #885
2020-07-28 14:38:21 +00:00
Sebastian Neumair
87397a9c1a Merged PR 240: #859 #860 #861 #862 #863 #864
Related work items: #859, #860, #861, #862, #863, #864
2020-07-28 14:38:10 +00:00
Lorenz Hilpert
8c2a7c0800 Added changeStatus Action and Effect for Shelf 2020-07-28 16:16:52 +02:00
Sebastian
a177c78dda Add .npmrc 2020-07-28 16:15:34 +02:00
Sebastian
5a8b9a8c12 Update Core Services Depending on OMS and Cat 2020-07-28 16:08:40 +02:00
Sebastian
8859265986 Add Intersection Observer Polyfill
+ Remove npmrc
2020-07-28 14:50:12 +02:00
Sebastian
eadbbff776 (WiP) Add Edit Order Item Header 2020-07-28 10:46:57 +02:00
Sebastian
91541e7282 (WiP) Basic General Form
+ Fix Unit Tests
2020-07-27 22:49:14 +02:00
Sebastian
bad1a4de6a Merge #578 (WiP) to access details page 2020-07-24 19:20:25 +02:00
Sebastian
6a7cc2f5c5 (WiP) Commit Initial SetUp Pages
WiP


WiP
2020-07-24 17:36:55 +02:00
Lorenz Hilpert
fa2da7d37b Store, Datepicker, Shelf Details by OrderNumber 2020-07-24 17:20:16 +02:00
Lorenz Hilpert
442c4a7b92 Merge branch 'feature/189-Warenausgabe/578-Details-bestellt/main' of ssh.dev.azure.com:v3/hugendubel/ISA/ISA-Frontend into feature/189-Warenausgabe/578-Details-bestellt/main 2020-07-24 14:29:39 +02:00
Lorenz Hilpert
ab62bc5de8 Update ISA OMS Swagger Generated Files 2020-07-24 14:29:21 +02:00
Sebastian
aae2039f3b Merge remote-tracking branch 'origin/feature/189-Warenausgabe/264-Bearbeiten/main' into feature/189-Warenausgabe/264-Bearbeiten/main 2020-07-24 12:06:40 +02:00
Sebastian
607c770d7d #864 Fix Resetting Filters To Default on Open - Close FIlter Overlay
+ Refactor pendingFilters in FilterService
2020-07-24 12:05:28 +02:00
Sebastian
eafff18078 #863 Hide Autocomplete Results on Click Outside 2020-07-24 12:05:28 +02:00
Sebastian
66973323e9 #863 Add Unit Test for ClickOutside Directive 2020-07-24 12:05:28 +02:00
Sebastian
e86c3a9355 #861 Update Filter Button Inactive Color to #9cb1c6 2020-07-24 12:05:28 +02:00
Sebastian
4d2d653cfa #860 Update Derivation of Wording on Reset / SelectAll Button 2020-07-24 12:05:28 +02:00
Sebastian
685e401e2d #859 Reset Filters on Warenausgabe Start Page (Search Page) 2020-07-24 12:05:28 +02:00
Sebastian Neumair
6f99586bd5 Merged PR 239: #860 #861 #862 #863 #864
Related work items: #860, #861, #862, #863, #864
2020-07-24 07:58:18 +00:00
Sebastian
918298f5fa Add Unit Tests for LogHeader, LogBody and History Log Component 2020-07-23 11:29:01 +02:00
Sebastian
9dd0d00cd7 Show All Log Entries 2020-07-22 22:30:52 +02:00
Sebastian
c491896291 Merge branch 'fix/864-Reset-Filters-On-SearchResults' into feature/189-Warenausgabe/277-Filter/main 2020-07-22 14:42:16 +02:00
Sebastian
15264399d3 #864 Fix Resetting Filters To Default on Open - Close FIlter Overlay
+ Refactor pendingFilters in FilterService
2020-07-22 14:35:11 +02:00
Sebastian
cb80c8d02c Merge branch 'feature/863-Close-Autocomplete-On-Click-Outside' into feature/189-Warenausgabe/277-Filter/main 2020-07-22 11:28:18 +02:00
Sebastian
1b02f2a9d3 #863 Hide Autocomplete Results on Click Outside 2020-07-22 11:22:56 +02:00
Sebastian
7fd7c2625b #863 Add Unit Test for ClickOutside Directive 2020-07-21 22:51:29 +02:00
Sebastian
c885942690 Merge branch 'fix/861-Filter-Button-Color-Module-Customer' into feature/189-Warenausgabe/277-Filter/main 2020-07-21 21:22:10 +02:00
Sebastian
118a987b4e #861 Update Filter Button Inactive Color to #9cb1c6 2020-07-21 21:21:52 +02:00
Sebastian
6b91b232ac Merge branch 'fix/860-Remove-All-Filters-sWording-In-Select-Filter' into feature/189-Warenausgabe/277-Filter/main 2020-07-21 21:09:51 +02:00
Sebastian
69556e3f06 #860 Update Derivation of Wording on Reset / SelectAll Button 2020-07-21 21:09:22 +02:00
Sebastian
6e435685e4 Merge remote-tracking branch 'origin/feature/189-Warenausgabe/277-Filter/main' into feature/189-Warenausgabe/277-Filter/main 2020-07-21 20:02:37 +02:00
Sebastian
2da58b28d9 Add Header Component and Add Reload History to refetch data 2020-07-21 17:41:38 +02:00
Sebastian Neumair
9139c5e135 Merged PR 238: #859 Reset Filters on Warenausgabe Start Page (Search Page)
Related work items: #859
2020-07-21 13:14:27 +00:00
Sebastian Neumair
b23b58925c Merged PR 237: #859 Reset Filters on Warenausgabe Start Page (Search Page)
Related work items: #859
2020-07-21 13:14:16 +00:00
Sebastian
17785bf0d4 #859 Reset Filters on Warenausgabe Start Page (Search Page) 2020-07-21 15:00:22 +02:00
Sebastian
e78c2fa8a0 #805 Add Timeline (css only) 2020-07-21 12:15:08 +02:00
Sebastian
ef656eef67 [WiP] Add Content And Styling for History Page 2020-07-21 10:22:09 +02:00
Sebastian
283f3da39d [Navigation] Set Up Store Operations to Allow fo Back Button To Work
Move History Page Navigiation to ShelfNavigationService
2020-07-21 10:22:09 +02:00
Sebastian
a36f0cc0a3 Get History for OrderItemSubsetId and Add Unit Tests for Effects 2020-07-21 10:22:09 +02:00
Sebastian
a2194ef191 Set Up Provisional Navigation To History 2020-07-21 10:22:09 +02:00
Sebastian Neumair
f6f36eba23 Merged PR 235: #850 #851 #852 Change Error Message Color Searchbar and Wording | Change Color on Select All and Arrow Up And Down in Filter Overlay | Remove Box Shadow From Shelf FIlter Overlay Select Filter Arrow
Related work items: #850, #851, #852
2020-07-21 08:00:18 +00:00
Sebastian Neumair
259266d138 Merged PR 233: #848 Show ResetButton On Filter Overlay Despite No Selected Filters | #849 Changing Primary Filters Does Not Affect Select Filters
Related work items: #848, #849
2020-07-21 07:59:51 +00:00
Sebastian Neumair
30eb82cca7 Merged PR 236: #850 #851 #852 Change Error Message Color Searchbar and Wording | Change Color on Select All and Arrow Up And Down in Filter Overlay | Remove Box Shadow From Shelf FIlter Overlay Select Filter Arrow
Related work items: #850, #851, #852
2020-07-21 07:59:39 +00:00
Sebastian Neumair
f87ebc2e55 Merged PR 232: #805 Fix Update Current Availability in validateAvailability
#805 Fix Update Current Availability in validateAvailability

+ Update Unit Tests

Related work items: #805
2020-07-21 07:59:26 +00:00
Sebastian
23535b63aa Merge branch 'fix/850-851-852-Styling-And-Color-Code-Fixes-For-Warenausgabe-Filters' into feature/189-Warenausgabe/277-Filter/main 2020-07-21 00:49:25 +02:00
Sebastian
eb80bd8447 #851 Change Color on Select All and Arrow Up And Down in Filter Overlay 2020-07-21 00:45:38 +02:00
Sebastian
a63fa7cebd #852 Remove Box Shadow From Shelf FIlter Overlay Select Filter Arrow 2020-07-21 00:37:56 +02:00
Sebastian
d239ddf651 #850 Change Error Message Color Searchbar and Wording 2020-07-21 00:32:49 +02:00
Sebastian
469340a305 Merge branch 'fix/848-849-Filter-Reset-On-Unselected-Filters-And-PrimaryFilters-Not-Affects-Selected-Filters' into feature/189-Warenausgabe/277-Filter/main 2020-07-21 00:14:01 +02:00
Sebastian
77e771980c #749 Show ResetButton On Filter Overlay Despite No Selected Filters 2020-07-21 00:10:56 +02:00
Sebastian
294712f6e0 #849 Changing Primary Filters Does Not Affect Select Filters 2020-07-20 23:19:21 +02:00
Sebastian
2e6f7a828b #805 Fix Update Current Availability in validateAvailability
+ Update Unit Tests
2020-07-20 21:15:48 +02:00
Michael Auer
6475f509f6 Merge tag '843-remove-address-validation-before-redirect-in-customer-search-result' into develop
ISA-1.0.893
2020-07-17 14:44:13 +02:00
Michael Auer
2e3bcf3cf4 Merge tag '835-gastkundenanlage-not-possible' into develop
ISA-1.0.883

# Conflicts:
#	apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.ts
2020-07-17 12:36:41 +02:00
Sebastian Neumair
1e7ffce711 Merged PR 229: #805 #659 #841 Bestellpostensplit - Availability is sum of all supplier qtys Fix Disabled Guest Button In Create Customer Component & Set PreferredSupplier Availability for download articles
Related work items: #659, #805, #841
2020-07-17 00:08:41 +00:00
Sebastian Neumair
ebd0d31948 Merged PR 230: #737 Store LastFilterGroupChanged based on current filter & target
Related work items: #737
2020-07-17 00:08:22 +00:00
Sebastian Neumair
203fd91b5f Merged PR 231: #806 Prevent the filter apply button from jumping on open & close
Related work items: #806
2020-07-17 00:08:11 +00:00
Sebastian
386dd9263d #806 Prevent the filter apply button from jumping on open & close 2020-07-16 15:19:40 +02:00
Sebastian
9c779e4027 #737 Store LastFilterGroupChanged based on current filter & target
+ Add Unit Tests
2020-07-16 10:32:15 +02:00
Sebastian
98666063ce #841 Set PreferredSupplier Availability for download articles 2020-07-15 17:59:06 +02:00
Sebastian
50aa8716ae #805 #659 Bestellpostensplit - Availability is sum of all supplier qtys
Fix unneccessary console.log
2020-07-15 14:54:39 +02:00
Sebastian Neumair
3fa8fc8fd1 Merged PR 225: #810 #833 #830 Fix Mapping of DestinationDTO | Fix Backspace Searchbar Bug | Fix Filter Overlay Clear Results
Related work items: #810, #830, #833
2020-07-15 10:06:37 +00:00
Sebastian Neumair
407a812ce4 Merged PR 227: #823 Implement wew Logic to only reset select filters on "Alle Filter Zuruecksetzen"
Related work items: #823
2020-07-15 10:05:48 +00:00
Sebastian
8ed6d60ad5 Merge branch 'feature/189-Warenausgabe/277-Filter/685-Filterbereich' into feature/189-Warenausgabe/277-Filter/main 2020-07-14 23:13:54 +02:00
Sebastian
22d6cae3a6 Handle no result in FetchResultsDone
+ Improve Desktop Filter Overlay Layout
2020-07-14 23:09:01 +02:00
Sebastian
96b9f8cf16 Merge branch 'feature/189-Warenausgabe/277-Filter/823-Reset-Filters-Instead-Of-Delete-Filters' into feature/189-Warenausgabe/277-Filter/main 2020-07-14 16:59:26 +02:00
Sebastian
7647503cc6 #823 Reset Filters Now Only Resets Select Filter Options 2020-07-14 16:56:27 +02:00
Sebastian
8d3d095500 Merge branch 'feature/189-Warenausgabe/276-Startseite/828-Use-Search-Query-From-Searchbar-In-Filter-Overlay' into feature/189-Warenausgabe/276-Startseite/main 2020-07-14 13:32:36 +02:00
Sebastian
0aaf1d8f40 828 Share Query Across Searchbars (Search Page<--> FilterOverlay)
+ Updated Wording on search page
2020-07-14 13:28:09 +02:00
Sebastian Neumair
10cc8e75b8 Merged PR 224: #833 Fix Backspace Behaviour in Searchbar
Related work items: #833
2020-07-13 16:00:58 +00:00
Sebastian
2409651dc7 Merge branch 'feature/189-Warenausgabe/276-Startseite/833-Autocomplete-Searchbar-On-Backspace' into feature/189-Warenausgabe/276-Startseite/main 2020-07-13 17:51:57 +02:00
Sebastian
31a4774ba0 #833 Fix Backspace Behaviour in Searchbar 2020-07-13 17:42:28 +02:00
Sebastian Neumair
543cf21354 Merged PR 223: #810 Fix Mapping of DestinationDTO
+ NgRx Store Setup für Customer (der Store wird noch nicht verwendet, ich würde aber versuchen nach und nach den Customer Store von ngxs zu NgRx umzuziehen)
Der ngxs Store sowie die gesamte Logik ist undurchschaubar und wird uns mittelfristig vor Probleme stellen.

Related work items: #810, #811, #829, #832
2020-07-13 14:04:37 +00:00
Sebastian
f13a3e4782 Merge remote-tracking branch 'origin/feature/829-Get-And-Set-Delivery-And-Invoice-Address-On-Customer' into feature/829-Get-And-Set-Delivery-And-Invoice-Address-On-Customer 2020-07-13 16:00:50 +02:00
Sebastian
dee2f77151 #832 Fix Wrong Delivery Address in Order Checkout 2020-07-13 15:55:43 +02:00
Sebastian
72bebedd70 Merge remote-tracking branch 'origin/feature/189-Warenausgabe/276-Startseite/main' into feature/189-Warenausgabe/276-Startseite/main 2020-07-13 13:56:38 +02:00
Sebastian
9c4ea77045 #830 Fix Filter Overlay Close Results Cleared Error 2020-07-13 13:34:34 +02:00
Sebastian
57be60e452 #832 Fix Wrong Delivery Address in Order Checkout 2020-07-13 13:29:37 +02:00
Sebastian
cef1fa1e6f Remove VS Code Workbench Color Customization Settings 2020-07-13 12:43:32 +02:00
Lorenz Hilpert
653a0f8b51 Merged PR 222: Fehlermeldung beim starten => .reduce of undefined
Fehlermeldung beim starten => .reduce of undefined
2020-07-13 10:34:52 +00:00
Sebastian
21d91b99d5 #810 Fix Mapping of DestinationDTO 2020-07-13 12:22:48 +02:00
Lorenz Hilpert
fcaf694f0a Fehlermeldung beim starten => .reduce of undefined 2020-07-13 12:17:28 +02:00
Lorenz Hilpert
c45344f6b2 Merged PR 221: No optimization for test build
No optimization for test build
2020-07-13 09:31:08 +00:00
Lorenz Hilpert
245528a548 No optimization for test build 2020-07-13 11:15:56 +02:00
Sebastian Neumair
8a3271a3de Merged PR 219: #823 Reset Filters in Shelf Filter Overlay
Related work items: #666, #667, #668, #683, #685, #772, #773, #816, #823
2020-07-13 08:34:44 +00:00
Sebastian Neumair
e0115348a4 Merged PR 220: #830 Fix Filter Overlay Close Results Cleared Error
Related work items: #830
2020-07-13 08:32:32 +00:00
Sebastian
59405c41f6 Merge branch 'feature/189-Warenausgabe/276-Startseite/816-Einmalige-Abfrage-der-Suchergebnisse' into feature/189-Warenausgabe/276-Startseite/main 2020-07-13 08:44:21 +02:00
Sebastian
f6a4e3e413 #830 Fix Filter Overlay Close Results Cleared Error 2020-07-13 08:41:22 +02:00
Sebastian
f701c7dd46 #829 Initial NgRx Customers Store SetUp
Add Effects (WiP)


Further Implement Customer Store incl. first Unit Tests
2020-07-12 21:04:23 +02:00
Sebastian Neumair
c868ccc761 Merged PR 217: #823 Reset Filters in Shelf Filter Overlay
Related work items: #823
2020-07-10 13:21:00 +00:00
Lorenz Hilpert
d48cc25f96 Added vscode recommendations 2020-07-10 15:14:30 +02:00
Sebastian
9fdcc5bfad Merge branch 'feature/189-Warenausgabe/277-Filter/823-Reset-Filters-Instead-Of-Delete-Filters' into feature/189-Warenausgabe/277-Filter/main 2020-07-10 14:19:33 +02:00
Sebastian
bc6e5774c6 Fix Unit Tests 2020-07-10 14:19:13 +02:00
Lorenz Hilpert
f7d951d95e Added Prettier and Husky 2020-07-10 13:04:20 +02:00
Sebastian
c1c51eb45c Merge branch 'feature/189-Warenausgabe/277-Filter/823-Reset-Filters-Instead-Of-Delete-Filters' into feature/189-Warenausgabe/277-Filter/main 2020-07-09 19:02:49 +02:00
Sebastian
b08fab4266 #823 Reset Filters in Shelf Filter Overlay 2020-07-09 18:58:39 +02:00
Sebastian Neumair
7a645d3b94 Merged PR 216: #666 #816 iPad Scanning and Remove HitsOnly Call & Retrieve first Order Results on SearchPage
Related work items: #666, #816
2020-07-09 08:49:55 +00:00
Sebastian Neumair
fb751b0094 Merged PR 215: #816 Remove HitsOnly Call & Retrieve first Order Results on SearchPage
Fix Order Service Call to Get Warenausgabe Results

Related work items: #816
2020-07-09 01:28:44 +00:00
Sebastian
807928c67a Merge branch 'feature/189-Warenausgabe/276-Startseite/816-Einmalige-Abfrage-der-Suchergebnisse' into feature/189-Warenausgabe/276-Startseite/main 2020-07-08 21:59:35 +02:00
Sebastian
b1f1fe4133 #816 Remove HitsOnly Call & Retrieve first Order Results on SearchPage
Fix Order Service Call to Get Warenausgabe Results
2020-07-08 21:58:57 +02:00
Nico Hanus
bec683c654 enable nginx for testing 2020-07-08 15:22:07 +02:00
Sebastian Neumair
7885ed3207 Merged PR 214: #666 [iPad Scanning] Open Scanner on Scan Icon Click
+ Fix Set Filters in Search Page Call
+ Update Autocomplete Selection OnClick
+ Remove Autoresults on Searchbar X Icon

Related work items: #666
2020-07-08 08:30:50 +00:00
Sebastian
27a3b02ae3 Merge branch 'feature/189-Warenausgabe/276-Startseite/666-Ipad-Scanning' into feature/189-Warenausgabe/276-Startseite/main 2020-07-08 09:52:32 +02:00
Sebastian
86817060f3 [iPad Scanning] Open Scanner on Scan Icon Click
[Fix] Select Filters In HitsOnly Call {Search}

Set Autocomplete Result on Click


Close Autoresults on Searchbar X Icon


Reset Focus on Input after Clicking Autocomplete Result
2020-07-08 08:18:43 +02:00
Lorenz Hilpert
74053040bc Merged PR 213: merge integration into develop with resolved merge conflict
Related work items: #43, #268, #608, #612, #616, #622, #623, #624, #631, #635, #648, #651, #652, #653, #654, #657, #661, #663, #724, #729, #733, #742, #761, #763, #771, #787, #788
2020-07-07 13:09:16 +00:00
Lorenz Hilpert
321470797b Merge branch 'integration' into develop 2020-07-07 15:05:33 +02:00
Sebastian Neumair
86cde05804 Merged PR 211: #804 Fix Country Errors Mapping
#804 Fix Country Errors Mapping

Related work items: #804
2020-07-07 12:47:18 +00:00
Sebastian
d011bebba5 #804 Fix Country Errors Mapping 2020-07-07 12:20:23 +02:00
Sebastian Neumair
470c58a165 Merged PR 210: #276 #274 #277 [Warenausgabe] --- [Startseite] [Filter] [Trefferliste]
Related work items: #664, #665, #666, #667, #668, #671, #680, #681, #682, #683, #684, #685, #686, #687
2020-07-07 09:50:54 +00:00
Sebastian Neumair
0a02bfca1d Merged PR 209: #667 #668 #772 #683 #685 #773 Autocomplete &Filters from Backend
Related work items: #667, #668, #683, #685, #772, #773
2020-07-07 08:43:06 +00:00
Sebastian
76afd571df Fix Imports from Merge 2020-07-07 10:05:08 +02:00
Sebastian
1dbdd0b5d4 Merge Main Feature Branch 2020-07-07 09:59:22 +02:00
Sebastian
1bcbaca4bc Merge branch 'feature/189-Warenausgabe/276-Startseite/667-Autovervollstaendigung' into feature/189-Warenausgabe/276-Startseite/main 2020-07-07 09:47:34 +02:00
Sebastian
03f77de3d7 #667 #668 #772 #683 #685 #773
Autocomplete and Filters from Backend
2020-07-07 09:47:20 +02:00
Sebastian
93359a8f10 Merge remote-tracking branch 'origin/feature/189-Warenausgabe/276-Startseite/main' into feature/189-Warenausgabe/276-Startseite/main 2020-07-06 17:33:14 +02:00
Sebastian
bbb476329f Add Unit Test for History State Reducer 2020-07-06 17:32:54 +02:00
Lorenz Hilpert
0c74a80c56 Merged PR 208: #673 #677 #678 #679 Trefferliste fertiggestellt
#673 #677 #678 #679 Trefferliste fertiggestellt
2020-07-06 13:32:19 +00:00
Lorenz Hilpert
f588e23b7a #673 #677 #678 #679 Trefferliste fertiggestellt 2020-07-06 14:30:22 +02:00
Sebastian
03e46f33a7 Merge branch 'feature/189-Warenausgabe/594-Historie/719-Navigation' into feature/189-Warenausgabe/594-Historie/main 2020-07-03 11:48:15 +02:00
Sebastian
72236cbec2 Add Unit Test for History State Reducer 2020-07-03 11:44:19 +02:00
Sebastian Neumair
ccaefc4a03 Merged PR 207: Update Search for Orders in Warenausgabe
+ WiP for History Page (Store)
2020-07-03 09:06:06 +00:00
Sebastian
4bdff93db9 Update call to search for orders in Warenausgabe 2020-07-02 17:58:23 +02:00
Sebastian
0b706743b8 [History] Basic Store SetUp (WiP) 2020-07-02 16:52:30 +02:00
Lorenz Hilpert
5f16f8ec64 TASKS.md Upgedated 2020-07-02 13:17:36 +02:00
Lorenz Hilpert
3e6733f75b Merge branch 'feature/189-Warenausgabe/main' of ssh.dev.azure.com:v3/hugendubel/ISA/ISA-Frontend into feature/189-Warenausgabe/main 2020-07-02 13:09:49 +02:00
Lorenz Hilpert
e54c842c48 Added TASKS.md file 2020-07-02 13:09:25 +02:00
Lorenz Hilpert
2187775833 Merged PR 206: Trefferliste 2020-07-02 10:57:09 +00:00
Lorenz Hilpert
9ffe988573 Merge branch 'feature/189-Warenausgabe/main' into feature/189-Warenausgabe/274-Trefferliste/main 2020-07-02 12:54:55 +02:00
Lorenz Hilpert
a0470d24f7 Trefferliste Positionierung Vormerker 2020-07-02 11:40:41 +02:00
Sebastian Neumair
c1b12297bb Merged PR 205: Warenausgabe Suche und Filter Overlay (ohne Fetching der Filter und Autovervollständigung da BE noch nicht fertig=
Sobald das Backend fertig ist werden die restlichen ToDos erledigt.

Related work items: #664, #665, #666, #667, #668, #671, #680, #681, #682, #683, #684, #685, #686, #687
2020-07-02 08:34:48 +00:00
Lorenz Hilpert
e96826c175 #678 [Trefferliste] [Kachel] Bookmark - Hinzugefügt 2020-07-02 10:31:15 +02:00
Lorenz Hilpert
aa587de5ac Store SearchFacade.getResultGroupedByCustomer teile ausgelagert 2020-07-02 10:30:26 +02:00
Sebastian
47e9518353 Merge branch 'feature/189-Warenausgabe/277-Filter/685-Filterbereich' into feature/189-Warenausgabe/277-Filter/main 2020-06-30 22:21:18 +02:00
Sebastian
b8c717a071 #685 Manage Focus for Searchbar on Filter Overlay Close 2020-06-30 22:03:18 +02:00
Lorenz Hilpert
9c6e1e063c #679 [Trefferliste] [Kachel] Bezahlt Marker - pro Item 2020-06-30 17:18:43 +02:00
Lorenz Hilpert
91f52b22cd #679 [Trefferliste] [Kachel] Bezahlt Marker 2020-06-30 17:13:00 +02:00
Sebastian
f15cbbaf93 #685 add FetchFillter & FetchFilterDone to get filters for shelf overlay
+ Remove Icon Component for Close Buttons in FIlter Overlays
2020-06-30 16:33:37 +02:00
Sebastian
8d68647d45 #685 Add Customer Theme to Shelf Filter Overlay
+ Set Focus on Searchbar Submit Button on Filter Selection
2020-06-30 14:12:51 +02:00
Nico Hanus
6a34553c9f added version in docker to npm package.json 2020-06-30 11:46:54 +02:00
Sebastian
8df2ee5018 #685 Autocomplete Suggestion Positioning 2020-06-30 09:44:23 +02:00
Sebastian
006a124e4b #685 Filterbereich 2020-06-29 18:14:07 +02:00
Lorenz Hilpert
b0a42948c8 Styling 2020-06-29 17:45:15 +02:00
Lorenz Hilpert
6795bc560e #675 #677 Trefferliste Anzeige udn Styling 2020-06-29 17:41:41 +02:00
Sebastian
8c25634fd0 Merge branch 'feature/189-Warenausgabe/277-Filter/684-Suchfeld' into feature/189-Warenausgabe/277-Filter/main 2020-06-29 15:44:46 +02:00
Sebastian
53d8213002 #684 Add Searchbar to Remisison Overlay 2020-06-29 15:42:15 +02:00
Sebastian
7f8b31f8f3 #684 [Refactor] Remove Scandit Imports in Shared Lib 2020-06-29 15:42:15 +02:00
Sebastian
d8e04dd50d #684 [Refactor] Search Component for all use cases
Remove unused imports and change default for allowScan


Update Imports
2020-06-29 15:42:15 +02:00
Sebastian
3f83e2c08d #684 [Store] Add Selectors for PrimaryFilters and SelectedFilters
Fix Imports to prevent circular dependencies
2020-06-29 15:42:15 +02:00
Sebastian
60c3cbc44d [Store] Add Selectors for PrimaryFilters and SelectedFilters 2020-06-29 10:12:26 +02:00
Sebastian Neumair
5d3a503d86 Merged PR 204: #788 Hide Truck Icon when primary CtA "In den Warenkorb" is dissbled
#788 Hide Truck Icon when primary CtA "In den Warenkorb" is dissbled

Related work items: #787, #788
2020-06-29 08:09:29 +00:00
Sebastian
46f85de55c Fix Imports To Prevent Circular Dependencies 2020-06-29 10:03:04 +02:00
Sebastian
36a2770d1d #788 Hide Truck Icon when primary CtA "In den Warenkorb" is dissbled 2020-06-29 09:49:33 +02:00
Sebastian
fb6c69fd89 Merge Store Changes from Main Branch 2020-06-26 11:46:21 +02:00
Lorenz Hilpert
5aa9e26be7 Merged PR 202: Store für Shelf Anpassungen 2020-06-26 08:48:33 +00:00
Lorenz Hilpert
affdf6fe05 Shelf State Data FetchResults 2020-06-26 10:42:42 +02:00
Sebastian
3a571ab3f9 Merge branch 'feature/189-Warenausgabe/277-Filter/681-Filter-View' into feature/189-Warenausgabe/277-Filter/main 2020-06-26 10:41:59 +02:00
Sebastian
0bda33a327 #683 Add Chips to Filter View 2020-06-26 10:39:14 +02:00
Sebastian
a012599f27 #681 Open Shelf Filter Overlay 2020-06-25 14:38:35 +02:00
Sebastian Neumair
e382e1a562 Merged PR 201: #722 Remove erroneous false value for undefined addresses
Logik Setzung des Kommas im Address-String hat false returned. Jetzt mit ternary geloest.

Related work items: #722
2020-06-25 11:45:44 +00:00
Sebastian
1fd09e5ded Merge branch 'feature/189-Warenausgabe/277-Filter/680-Statusleiste' into feature/189-Warenausgabe/277-Filter/main 2020-06-25 11:07:29 +02:00
Sebastian
6930f44633 #680 [Filter] Statusleiste 2020-06-25 10:28:11 +02:00
Sebastian
cccf7d1d70 #722 Remove erroneous false value for undefined addresses 2020-06-24 15:32:12 +02:00
Sebastian
7aa258ac9e Update Store by Adding Set and Clear Filters 2020-06-24 15:26:48 +02:00
Lorenz Hilpert
03bb8c3484 SearchState anpassungen 2020-06-24 13:36:58 +02:00
Lorenz Hilpert
98ccc48424 Shelf State Erweiterung 2020-06-24 12:17:06 +02:00
Sebastian
8c246803ad Merge branch 'feature/189-Warenausgabe/276-Startseite/668-Suchverhalten' into feature/189-Warenausgabe/276-Startseite/main 2020-06-24 11:55:42 +02:00
Sebastian
b0eae87a5d Set Search Input in Ngrx Store 2020-06-24 11:30:37 +02:00
Sebastian
03e441f5af Merge Ngrx Store Base 2020-06-24 10:24:07 +02:00
Sebastian
4f16bef6e3 [Refactor] CollectingShelfService Method searchWarenausgabe 2020-06-24 10:19:53 +02:00
Sebastian
e9061b4ef0 Merge remote-tracking branch 'refs/remotes/origin/feature/189-Warenausgabe/276-Startseite/main'
Conflicts:
	apps/sales/src/scss/_theme.scss
	apps/sales/src/scss/_variables.scss
2020-06-24 09:46:42 +02:00
Sebastian
3e387a3390 #667 Add Automplete Result Styling 2020-06-24 09:21:23 +02:00
Sebastian
ba7be52b85 #665 Customize Searchbar for Desktop 2020-06-24 09:20:43 +02:00
Sebastian
a2c35ec67b #664 Add Searchbar Component incl. Data Retrieval and Navigation Logic
[Shelf Searchbar iPad] Basic Styling Setup


Add AutoFocus to search input


Add Logic For Switching Between Search and Scan Icon


#664 Add Searchbar Component incl. Data Retrieval and Navigation Logic
2020-06-24 09:20:43 +02:00
Lorenz Hilpert
4ab9603238 State für Warenausgabe initial erstellt
Co-authored-by: s.neumair@paragon-data.de <s.neumair@paragon-data.de>
2020-06-23 18:35:09 +02:00
Lorenz Hilpert
c8e22cb19c Merged PR 200: Merge from develop 2020-06-23 16:04:43 +00:00
Sebastian Neumair
f41a7142e3 Merged PR 199: [Fix] TaskCalendar State
[Fix] TaskCalendar State
2020-06-23 16:03:34 +00:00
Sebastian
720e6c293e [Fix] TaskCalendar State 2020-06-23 18:02:02 +02:00
Lorenz Hilpert
24c4df5b9f Merged PR 198: [DISABLED] Merge Tätigkeitskalender into develop
Navigation zur Seite Tätigkeitskalender ist nicht aktiv

Related work items: #563, #568
2020-06-23 14:44:31 +00:00
Lorenz Hilpert
f23140cba5 Merge branch 'develop' into feature/ISA-9-Filiale-Taetigkeitskalender 2020-06-23 16:29:40 +02:00
Lorenz Hilpert
613c928ec4 Routing für task-calendar entfernt 2020-06-23 16:05:41 +02:00
Sebastian
0f80935e76 Merge branch 'feature/189-Warenausgabe/276-Startseite/667-Autovervollstaendigung' into feature/189-Warenausgabe/276-Startseite/main 2020-06-23 14:50:13 +02:00
Sebastian
ce43e0261e #667 Add Automplete Result Styling 2020-06-23 14:43:17 +02:00
Nico Hanus
0dd86af01d added version in docker to npm package.json 2020-06-23 14:32:27 +02:00
Lorenz Hilpert
bf8a11ea08 Merged PR 197: #537 - Meldetext von Downloads und NonBooks richtig anzeigen
#537 -  Meldetext von Downloads und NonBooks richtig anzeigen
2020-06-23 10:42:27 +00:00
Lorenz Hilpert
46cbda0357 Merge remote-tracking branch 'origin/develop' into develop 2020-06-23 12:40:18 +02:00
Lorenz Hilpert
2f42c6c8c8 #537 - Meldetext von Downloads und NonBooks richtig anzeigen 2020-06-23 12:32:15 +02:00
Nico Hanus
923e8a1dd4 fix docker build with pull 2020-06-23 08:42:37 +02:00
Sebastian
50694b1e26 Merge branch 'feature/189-Warenausgabe/276-Startseite/665-Desktop-Suchfeld' into feature/189-Warenausgabe/276-Startseite/main 2020-06-22 19:01:41 +02:00
Sebastian
1d09cf0dc2 #665 Customize Searchbar for Desktop 2020-06-22 18:58:21 +02:00
Lorenz Hilpert
d3e61d5ab8 Merged PR 195: #759 Meldetext // Für downloads anzeigen
#759 Meldetext // Für downloads anzeigen
2020-06-22 16:39:22 +00:00
Lorenz Hilpert
4add376957 #759 Meldetext // Für downloads anzeigen 2020-06-22 17:36:08 +02:00
Sebastian
86e802f4b8 Merge branch 'feature/189-Warenausgabe/276-Startseite/664-Ipad-Suchfeld' into feature/189-Warenausgabe/276-Startseite/main 2020-06-22 15:58:35 +02:00
Sebastian
1bddf2b4f1 #664 Add Searchbar Component incl. Data Retrieval and Navigation Logic
[Shelf Searchbar iPad] Basic Styling Setup


Add AutoFocus to search input


Add Logic For Switching Between Search and Scan Icon


#664 Add Searchbar Component incl. Data Retrieval and Navigation Logic
2020-06-22 15:57:45 +02:00
Lorenz Hilpert
6b8423e5c5 Merge branch 'integration' into develop 2020-06-18 17:52:14 +02:00
Sebastian Neumair
3717f56665 Merged PR 131: Fix Import selectTaskById in EditTaskComponent
Fix Import selectTaskById in EditTaskComponent
2020-06-02 14:36:03 +00:00
Sebastian
45fca71f3b Fix Import selectTaskById in EditTaskComponent 2020-06-02 16:34:43 +02:00
Sebastian Neumair
f8faffca41 Merged PR 129: Add addImageToTask to TaskCalendarFacade to upload confirmation image
Add addImageToTask to TaskCalendarFacade to upload confirmation image
2020-06-02 14:20:31 +00:00
Sebastian
93e9b232cf Add addImageToTask to TaskCalendarFacade to upload confirmation image 2020-06-02 16:04:03 +02:00
Sebastian
18df1c7a96 Merge remote-tracking branch 'origin/feature/ISA-9-Filiale-Taetigkeitskalender' into feature/ISA-9-Filiale-Taetigkeitskalender 2020-05-26 16:32:53 +02:00
Sebastian
cdeade29d7 Add Border to Task Items 2020-05-26 13:54:15 +02:00
Lorenz Hilpert
235023ae9f Merged PR 92: Aufgabe erledigen: Store Methoden und Service-Aufrufe in Effekten
Related work items: #563
2020-05-26 11:35:11 +00:00
Lorenz Hilpert
aadf5efc5e State for Task Articles 2020-05-26 12:39:56 +02:00
Sebastian
04389de476 Add Overflow Scroll to Calender View Component
Add Sticky Nav


Add Media Query for Calendar Component Height

Update Layout Border Radius
2020-05-26 11:41:14 +02:00
Sebastian Neumair
a2da0da586 Merged PR 88: Modal Dialog Service + Basic Component Styling
Related work items: #568
2020-05-25 15:20:20 +00:00
Sebastian
969e5d74e5 Update npmrc 2020-05-25 15:55:18 +02:00
Sebastian
1fbbe1161b Add Basic Layout Styling for TaskViewComponent & Modal Edit Task 2020-05-25 14:57:03 +02:00
Lorenz Hilpert
711cb2cce7 Store Actions And Effects Get Files 2020-05-25 14:35:59 +02:00
Sebastian
8226bd69f5 Add Components for Modal Dialoue + Icons 2020-05-25 09:57:42 +02:00
Sebastian
157d1f8942 Merge branch 'feature/572-Modaler-Dialog-Styling' into feature/ISA-568-Add-Shared-Modal-Dialogue-Service 2020-05-22 12:13:54 +02:00
Sebastian
e50afa3306 Update Modal Dialog Service 2020-05-22 12:10:55 +02:00
Lorenz Hilpert
baa8b21a15 Update Task Calendar Actions 2020-05-22 12:08:23 +02:00
Lorenz Hilpert
6ac461be61 Scss Datei Für Modalen Dialog Sytling 2020-05-22 10:45:20 +02:00
Sebastian
1b46534bf0 Add ModalService 2020-05-20 17:52:21 +02:00
Sebastian
ed59777e04 Show Tasks in Task List View
Show Item in Task List Component
2020-05-20 13:58:57 +02:00
Sebastian
fe300effa8 Add Routing to Tasks 2020-05-19 18:07:30 +02:00
Sebastian
489dc9a014 Get Current Branch, Set Default Filters and Show Fetched Items 2020-05-19 18:07:15 +02:00
Sebastian
9c5c4b4880 Merge branch 'feature/2020-02-item13-taetigkeitskalendar' into feature/ISA-9-Filiale-Taetigkeitskalender 2020-05-19 14:41:39 +02:00
Sebastian
3b26c27a80 Get, Set, Patch Tasks in Redux Store 2020-05-19 13:01:52 +02:00
Lorenz Hilpert
e5732e70b7 @swagger/eis lib angelegt & @ngrx/store basis angelegt 2020-05-18 18:59:14 +02:00
Lorenz Hilpert
91939a0fc9 Merge develop into feature/2020-02-item13-taetigkeitskalendar 2020-05-18 12:57:05 +02:00
Sebastian Neumair
91432a649b Add calendar component 2020-01-31 17:05:55 +01:00
Sebastian Neumair
9b94d716e7 Add routing to calendar component 2020-01-30 16:01:59 +01:00
Sebastian Neumair
a618beb8e6 Add Icon for Taetigkeitskalender inactive state 2020-01-30 15:04:26 +01:00
Sebastian Neumair
e9bef54215 Set up Store (WIP) 2020-01-29 11:30:59 +01:00
5346 changed files with 147647 additions and 100066 deletions

7
.browserslistrc Normal file
View File

@@ -0,0 +1,7 @@
last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 iOS major versions
safari > 11
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

2
.gitignore vendored
View File

@@ -31,9 +31,11 @@ speed-measure-plugin.json
.history/*
# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
/testresults
/libpeerconnection.log
npm-debug.log
yarn-error.log

14
.npmrc
View File

@@ -1,13 +1 @@
registry=https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/
always-auth=true
; Treat this auth token like a password. Do not share it with anyone, including Microsoft support. This token expires on or before 25.08.2020.
; begin auth token
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/:username=hugendubel
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/:_password=M2JkaDdwNjIzbWVoZGlmeDU3N2Ficjc3M252NXBkaWg1M2VtaW94dXp5amwyejNkaW5yYQ==
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/:email=npm requires email to be set but doesn't use the value
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/:username=hugendubel
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/:_password=M2JkaDdwNjIzbWVoZGlmeDU3N2Ficjc3M252NXBkaWg1M2VtaW94dXp5amwyejNkaW5yYQ==
//pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/:email=npm requires email to be set but doesn't use the value
; end auth token
@paragondata:registry=https://npm.pkg.github.com

10
.prettierignore Normal file
View File

@@ -0,0 +1,10 @@
# Add files here to ignore them from prettier formatting
/dist
/coverage
/helmvalues
/apps/swagger
/ng-swagger-gen
*.json
*.yml

5
.prettierrc.json Normal file
View File

@@ -0,0 +1,5 @@
{
"singleQuote": true,
"printWidth": 140
}

8
.vscode/extensions.json vendored Normal file
View File

@@ -0,0 +1,8 @@
{
"recommendations": [
"johnpapa.angular2",
"esbenp.prettier-vscode",
"angular.ng-template",
"eg2.vscode-npm-script"
]
}

35
.vscode/launch.json vendored
View File

@@ -1,22 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.11.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome",
"url": "https://192.168.2.112:4200",
"webRoot": "${workspaceFolder}",
"sourceMaps": true,
"sourceMapPathOverrides": {
"/./*": "${webRoot}/*",
"/src/*": "${webRoot}/*",
"/*": "*",
"/./~/*": "${webRoot}/node_modules/*"
}
}
]
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "ISA-App Chrome",
"url": "https://localhost:4200",
"webRoot": "${workspaceFolder}",
}
]
}

View File

@@ -8,5 +8,8 @@
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
},
"css.validate": false,
"less.validate": false,
"scss.validate": false
}

View File

@@ -1,13 +1,29 @@
#stage 1
FROM node:10-stretch as node
FROM node:18 as base
ARG IS_PRODUCTION=false
ARG SEMVERSION=1.0.0
ARG BuildUniqueID
LABEL build.uniqueid="${BuildUniqueID:-1}"
WORKDIR /app
COPY . .
RUN umask 0022
RUN npm version ${SEMVERSION}
RUN npm install --always-auth=false
RUN if [ "${IS_PRODUCTION}" = "true" ] ; then npm run-script build-prod ; else npm run-script build ; fi
# stage 2
FROM nginx:alpine
COPY --from=node /app/dist/sales /usr/share/nginx/html
COPY --from=node /app/nginx.conf /etc/nginx/conf.d/default.conf
# stage final
FROM nginx:alpine as publish
ARG BuildUniqueID
LABEL build.uniqueid="${BuildUniqueID:-1}"
COPY --from=base /app/dist/isa-app /usr/share/nginx/html
COPY --from=base /app/nginx.conf /etc/nginx/conf.d/default.conf
# stage npm test
FROM base as test
ARG BuildUniqueID
LABEL build.uniqueid="${BuildUniqueID:-1}"
RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -q -O /tmp/chrome.deb && apt update && apt install -y /tmp/chrome.deb
# ignore exitcode, sonst gibts keinen container
RUN npm test || true
ENTRYPOINT [ "/bin/sleep", "60000" ]

4
TASKS.md Normal file
View File

@@ -0,0 +1,4 @@
- Neue Icon Module (z.B. mit SVG sprites)
- Breadcrumb Navigation (Neu)
- Remissions Produkt Liste (Refactoring / Neu)
- Angular Version (Upgrade)

View File

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,25 @@
# Scan
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.0.
## Code scaffolding
Run `ng generate component component-name --project scan` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project scan`.
> Note: Don't forget to add `--project scan` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build scan` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build scan`, go to the dist folder `cd dist/scan` and run `npm publish`.
## Running unit tests
Run `ng test scan` to execute the unit tests via [Karma](https://karma-runner.github.io).
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/adapter/scan",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,11 @@
{
"name": "@adapter/scan",
"version": "0.0.1",
"peerDependencies": {
"@angular/common": "^12.2.0",
"@angular/core": "^12.2.0"
},
"dependencies": {
"tslib": "^2.3.0"
}
}

View File

@@ -0,0 +1,43 @@
import { Injectable, isDevMode } from '@angular/core';
import { EnvironmentService } from '@core/environment';
import { PromptModalData, UiModalService, UiPromptModalComponent } from '@ui/modal';
import { Observable } from 'rxjs';
import { ScanAdapter } from './scan-adapter';
@Injectable()
export class DevScanAdapter implements ScanAdapter {
readonly name = 'Dev';
constructor(private _modal: UiModalService, private _environmentService: EnvironmentService) {}
async init(): Promise<boolean> {
return new Promise((resolve, reject) => {
resolve(isDevMode());
});
}
scan(): Observable<string> {
return new Observable((observer) => {
const modalRef = this._modal.open({
content: UiPromptModalComponent,
title: 'Scannen',
data: {
message: 'Diese Eingabemaske dient nur zu Entwicklungs und Testzwecken.',
placeholder: 'Scan Code',
confirmText: 'weiter',
cancelText: 'abbrechen',
} as PromptModalData,
});
const sub = modalRef.afterClosed$.subscribe((result) => {
observer.next(result.data);
observer.complete();
});
return () => {
modalRef.close();
sub.unsubscribe();
};
});
}
}

View File

@@ -0,0 +1,5 @@
describe('Dummy', () => {
it('should work', () => {
expect(true).toBeTruthy();
});
});

View File

@@ -0,0 +1,26 @@
import { Injectable } from '@angular/core';
import { NativeContainerService } from 'native-container';
import { Observable } from 'rxjs';
import { filter, map, take } from 'rxjs/operators';
import { ScanAdapter } from './scan-adapter';
@Injectable()
export class NativeScanAdapter implements ScanAdapter {
readonly name = 'Native';
constructor(private readonly nativeContainerService: NativeContainerService) {}
init(): Promise<boolean> {
return new Promise((resolve, reject) => {
resolve(this.nativeContainerService.isNative);
});
}
scan(): Observable<string> {
return this.nativeContainerService.openScanner('scanBook').pipe(
filter((result) => result.status === 'SUCCESS'),
map((result) => result.data),
take(1)
);
}
}

View File

@@ -0,0 +1,18 @@
import { Observable } from 'rxjs';
export interface ScanAdapter {
/**
* Name to identify the adapter
*/
readonly name: string;
/**
* @returns true if this adapter can be used
*/
init(): Promise<boolean>;
/**
* scan for a barcode
*/
scan(): Observable<string>;
}

View File

@@ -0,0 +1,19 @@
import { NgModule } from '@angular/core';
import { DevScanAdapter } from './dev.scan-adapter';
import { NativeScanAdapter } from './native.scan-adapter';
import { SCAN_ADAPTER } from './tokens';
@NgModule({})
export class ScanAdapterModule {
static forRoot() {
return {
ngModule: ScanAdapterModule,
providers: [
{ provide: SCAN_ADAPTER, useClass: NativeScanAdapter, multi: true },
{ provide: SCAN_ADAPTER, useClass: DevScanAdapter, multi: true },
],
// Use for testing:
// providers: [{ provide: SCAN_ADAPTER, useClass: dev ? DevScanAdapter : NativeScanAdapter, multi: true }],
};
}
}

View File

@@ -0,0 +1,52 @@
import { Inject, Injectable } from '@angular/core';
import { Observable, throwError } from 'rxjs';
import { ScanAdapter } from './scan-adapter';
import { SCAN_ADAPTER } from './tokens';
@Injectable({
providedIn: 'root',
})
export class ScanAdapterService {
private _readyAdapters: Record<string, boolean> = {};
constructor(@Inject(SCAN_ADAPTER) private readonly scanAdapters: ScanAdapter[]) {}
async init(): Promise<void> {
for (const adapter of this.scanAdapters) {
const isReady = await adapter.init();
this._readyAdapters[adapter.name] = isReady;
}
}
adapters(): ScanAdapter[] {
return [...this.scanAdapters];
}
getAdapter(name: string): ScanAdapter | undefined {
return this._readyAdapters[name] && this.scanAdapters.find((adapter) => adapter.name === name);
}
isReady(): boolean {
return Object.values(this._readyAdapters).some((ready) => ready);
}
scan(): Observable<string> {
const adapterOrder = ['Native', 'Scandit', 'Dev'];
let adapter: ScanAdapter;
for (const name of adapterOrder) {
adapter = this.getAdapter(name);
if (adapter) {
break;
}
}
if (!adapter) {
return throwError('No adapter found');
}
return adapter.scan();
}
}

View File

@@ -0,0 +1,3 @@
export * from './scandit-overlay.component';
export * from './scandit-scan-adapter.module';
export * from './scandit.scan-adapter';

View File

@@ -0,0 +1,20 @@
:host {
@apply block relative;
}
.scanner-container {
width: 100vw;
max-width: 95vw;
max-height: calc(95vh - 120px);
}
.close-scanner {
@apply block px-6 py-4 bg-white text-brand border-2 border-solid border-brand rounded-full text-lg font-bold mx-auto mt-4;
}
@screen desktop {
.scanner-container {
max-width: 900px;
max-height: 900px;
}
}

View File

@@ -0,0 +1,4 @@
<div class="scanner-container" #scanContainer></div>
<button class="close-scanner" type="button" (click)="close()">
Scan abbrechen
</button>

View File

@@ -0,0 +1,100 @@
import { Component, ChangeDetectionStrategy, ElementRef, ViewChild, NgZone, AfterViewInit, OnDestroy } from '@angular/core';
import { UiMessageModalComponent, UiModalService } from '@ui/modal';
import { Barcode, BarcodePicker, ScanResult, ScanSettings } from 'scandit-sdk';
@Component({
selector: 'app-scandit-overlay',
templateUrl: 'scandit-overlay.component.html',
styleUrls: ['scandit-overlay.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ScanditOverlayComponent implements AfterViewInit, OnDestroy {
private _barcodePicker: BarcodePicker;
private _onScan?: (code: string) => void;
private _onClose?: () => void;
@ViewChild('scanContainer', { read: ElementRef, static: true }) scanContainer: ElementRef;
constructor(private _zone: NgZone, private _modal: UiModalService) {}
ngAfterViewInit(): void {
this.createBarcodePicker()
.then(() => {
this._barcodePicker.on('scan', (scanResult) => {
this._zone.run(() => this.handleScanrResult(scanResult));
});
})
.catch((err: Error) => {
this._modal
.open({
content: UiMessageModalComponent,
title: 'Zugriff auf Kamera verweigert',
data: { message: 'Falls Sie den Zugriff erlauben möchten, können Sie das über die Webseiteinstellung Ihres Browsers.' },
})
.afterClosed$.subscribe(() => {
this._onClose?.();
});
});
}
async createBarcodePicker() {
this._barcodePicker = await BarcodePicker.create(this.scanContainer.nativeElement, {
playSoundOnScan: true,
vibrateOnScan: true,
});
this._barcodePicker.applyScanSettings(this.getScanSettings());
}
getScanSettings(): ScanSettings {
return new ScanSettings({
blurryRecognition: false,
enabledSymbologies: [
Barcode.Symbology.EAN8,
Barcode.Symbology.EAN13,
Barcode.Symbology.UPCA,
Barcode.Symbology.UPCE,
Barcode.Symbology.CODE128,
Barcode.Symbology.CODE39,
Barcode.Symbology.CODE93,
Barcode.Symbology.INTERLEAVED_2_OF_5,
Barcode.Symbology.QR,
],
codeDuplicateFilter: 1000,
});
}
onScan(fn: (code: string) => void) {
this._onScan = fn;
}
onClose(fn: () => void) {
this._onClose = fn;
}
handleScanrResult(scanRestul: ScanResult) {
let result: string | undefined;
if (scanRestul.barcodes.length) {
result = scanRestul.barcodes[0].data;
} else if (scanRestul.texts.length) {
result = scanRestul.texts[0].value;
}
if (result) {
this._onScan?.(result);
}
}
close() {
this._onClose?.();
}
ngOnDestroy(): void {
this._zone.runOutsideAngular(() => {
this._barcodePicker?.destroy(true);
});
}
}

View File

@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ScanditOverlayComponent } from './scandit-overlay.component';
import { ScanditScanAdapter } from './scandit.scan-adapter';
import { SCAN_ADAPTER } from '../tokens';
@NgModule({
imports: [CommonModule],
exports: [ScanditOverlayComponent],
declarations: [ScanditOverlayComponent],
})
export class ScanditScanAdapterModule {
static forRoot() {
return {
ngModule: ScanditScanAdapterModule,
providers: [{ provide: SCAN_ADAPTER, useClass: ScanditScanAdapter, multi: true }],
};
}
}

View File

@@ -0,0 +1,82 @@
import { Injectable } from '@angular/core';
import { Observable, Subscriber } from 'rxjs';
import { ScanAdapter } from '../scan-adapter';
import { Overlay } from '@angular/cdk/overlay';
import { configure } from 'scandit-sdk';
// import { ScanditModalComponent } from './scandit-modal';
import { Config } from '@core/config';
import { ComponentPortal } from '@angular/cdk/portal';
import { ScanditOverlayComponent } from './scandit-overlay.component';
import { EnvironmentService } from '@core/environment';
@Injectable()
export class ScanditScanAdapter implements ScanAdapter {
readonly name = 'Scandit';
constructor(private readonly _config: Config, private _overlay: Overlay, private _environmentService: EnvironmentService) {}
async init(): Promise<boolean> {
if (this._environmentService.isTablet()) {
await configure(this._config.get('licence.scandit'), {
engineLocation: '/scandit/',
});
return true;
}
return false;
}
scan(): Observable<string> {
return new Observable((observer) => {
const overlay = this.createOverlay();
const portal = this.createPortal();
const ref = overlay.attach(portal);
const sub = new Subscriber();
const complete = () => {
overlay.detach();
ref.destroy();
sub.unsubscribe();
sub.complete();
observer.complete();
};
sub.add(
overlay.backdropClick().subscribe(() => {
complete();
})
);
ref.instance.onScan((code) => {
observer.next(code);
complete();
});
ref.instance.onClose(() => {
complete();
});
return complete;
});
}
createOverlay() {
const overlay = this._overlay.create({
positionStrategy: this._overlay.position().global().centerHorizontally().centerVertically(),
hasBackdrop: true,
});
return overlay;
}
createPortal() {
const portal = new ComponentPortal(ScanditOverlayComponent);
return portal;
}
}

View File

@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import { ScanAdapter } from './scan-adapter';
export const SCAN_ADAPTER = new InjectionToken<ScanAdapter>('SCAN_ADAPTER');

View File

@@ -0,0 +1,11 @@
/*
* Public API Surface of scan
*/
export * from './lib/scandit';
export * from './lib/dev.scan-adapter';
export * from './lib/native.scan-adapter';
export * from './lib/scan-adapter';
export * from './lib/scan.module';
export * from './lib/scan.service';
export * from './lib/tokens';

View File

@@ -0,0 +1,19 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
}

View File

@@ -0,0 +1,10 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.lib.json",
"compilerOptions": {
"declarationMap": false
},
"angularCompilerOptions": {
"compilationMode": "partial"
}
}

View File

@@ -0,0 +1,14 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/spec",
"types": [
"jasmine"
]
},
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
}

View File

@@ -0,0 +1,25 @@
# ProductImage
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.1.2.
## Code scaffolding
Run `ng generate component component-name --project product-image` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project product-image`.
> Note: Don't forget to add `--project product-image` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build product-image` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build product-image`, go to the dist folder `cd dist/product-image` and run `npm publish`.
## Running unit tests
Run `ng test product-image` to execute the unit tests via [Karma](https://karma-runner.github.io).
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/cdn/product-image",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,11 @@
{
"name": "@cdn/product-image",
"version": "0.0.1",
"peerDependencies": {
"@angular/common": "^10.1.2",
"@angular/core": "^10.1.2"
},
"dependencies": {
"tslib": "^2.0.0"
}
}

View File

@@ -0,0 +1,9 @@
import { NgModule } from '@angular/core';
import { ProductImagePipe } from './product-image.pipe';
@NgModule({
declarations: [ProductImagePipe],
imports: [],
exports: [ProductImagePipe],
})
export class ProductImageModule {}

View File

@@ -0,0 +1,12 @@
import { Pipe, PipeTransform } from '@angular/core';
import { ProductImageService } from './product-image.service';
@Pipe({
name: 'productImage',
})
export class ProductImagePipe implements PipeTransform {
constructor(private imageService: ProductImageService) {}
transform(imageId: string, width?: number, height?: number, showDummy?: boolean): any {
return this.imageService.getImageUrl({ imageId, width, height, showDummy });
}
}

View File

@@ -0,0 +1,20 @@
import { Config } from '@core/config';
import { createServiceFactory, SpectatorService } from '@ngneat/spectator';
import { ProductImageService } from './product-image.service';
describe('ProductImageService', () => {
let spectator: SpectatorService<ProductImageService>;
const createService = createServiceFactory({
service: ProductImageService,
mocks: [Config],
});
beforeEach(() => {
spectator = createService();
});
it('should be created', () => {
expect(spectator.service).toBeTruthy();
});
});

View File

@@ -0,0 +1,24 @@
import { Inject, Injectable } from '@angular/core';
import { Config } from '@core/config';
import { CDN_PRODUCT_IMAGE } from './tokens';
@Injectable({
providedIn: 'root',
})
export class ProductImageService {
constructor(private readonly _config: Config) {}
getImageUrl({
imageId,
width = 150,
height = 150,
showDummy = true,
}: {
imageId: string;
width?: number;
height?: number;
showDummy?: boolean;
}): string {
return `${this._config.get('@cdn/product-image.url')}/${imageId}_${width}x${height}.jpg?showDummy=${showDummy}`;
}
}

View File

@@ -0,0 +1,3 @@
import { InjectionToken } from '@angular/core';
export const CDN_PRODUCT_IMAGE = new InjectionToken<string>('cdn.product.image');

View File

@@ -0,0 +1,8 @@
/*
* Public API Surface of product-image
*/
export * from './lib/product-image.service';
export * from './lib/product-image.module';
export * from './lib/product-image.pipe';
export * from './lib/tokens';

View File

@@ -0,0 +1,24 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
},
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
}

View File

@@ -0,0 +1,10 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.lib.json",
"compilerOptions": {
"declarationMap": false
},
"angularCompilerOptions": {
"compilationMode": "partial"
}
}

View File

@@ -0,0 +1,14 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/spec",
"types": [
"jasmine"
]
},
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
}

View File

@@ -0,0 +1,17 @@
{
"extends": "../../../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"cdn",
"camelCase"
],
"component-selector": [
true,
"element",
"cdn",
"kebab-case"
]
}
}

25
apps/core/README.md Normal file
View File

@@ -0,0 +1,25 @@
# Core
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.0.0.
## Code scaffolding
Run `ng generate component component-name --project core` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project core`.
> Note: Don't forget to add `--project core` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build core` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build core`, go to the dist folder `cd dist/core` and run `npm publish`.
## Running unit tests
Run `ng test core` to execute the unit tests via [Karma](https://karma-runner.github.io).
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/application",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,23 @@
import { NgModule, ModuleWithProviders } from '@angular/core';
import { StoreModule } from '@ngrx/store';
import { applicationReducer } from './store';
import { ApplicationService } from './application.service';
@NgModule({
declarations: [],
imports: [],
exports: [],
})
export class CoreApplicationModule {
static forRoot(): ModuleWithProviders<CoreApplicationModule> {
return {
ngModule: RootCoreApplicationModule,
};
}
}
@NgModule({
imports: [StoreModule.forFeature('core-application', applicationReducer)],
providers: [ApplicationService],
})
export class RootCoreApplicationModule {}

View File

@@ -0,0 +1,233 @@
// import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator';
// import { Store } from '@ngrx/store';
// import { Observable, of } from 'rxjs';
// import { first } from 'rxjs/operators';
// import { ApplicationProcess } from './defs';
// import { ApplicationService } from './application.service';
// import * as actions from './store/application.actions';
// describe('ApplicationService', () => {
// let spectator: SpectatorService<ApplicationService>;
// let store: SpyObject<Store>;
// const createService = createServiceFactory({
// service: ApplicationService,
// mocks: [Store],
// });
// beforeEach(() => {
// spectator = createService({});
// store = spectator.inject(Store);
// });
// it('should be created', () => {
// expect(spectator.service).toBeTruthy();
// });
// describe('activatedProcessId$', () => {
// it('should return an observable', () => {
// expect(spectator.service.activatedProcessId$).toBeInstanceOf(Observable);
// });
// });
// describe('activatedProcessId', () => {
// it('should return the process id as a number', () => {
// spyOnProperty(spectator.service['activatedProcessIdSubject'] as any, 'value').and.returnValue(2);
// expect(spectator.service.activatedProcessId).toBe(2);
// });
// });
// describe('getProcesses$()', () => {
// it('should call select on store and return all selected processes', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang', type: 'cart', section: 'customer', data: { count: 1 } },
// { id: 2, name: 'Vorgang', type: 'task-calendar', section: 'branch' },
// ];
// store.select.and.returnValue(of(processes));
// const result = await spectator.service.getProcesses$().pipe(first()).toPromise();
// expect(result).toEqual(processes);
// expect(store.select).toHaveBeenCalled();
// });
// it('should call select on store and return all section customer processes', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang', type: 'cart', section: 'customer', data: { count: 1 } },
// { id: 2, name: 'Vorgang', type: 'task-calendar', section: 'branch' },
// ];
// store.select.and.returnValue(of(processes));
// const result = await spectator.service.getProcesses$('customer').pipe(first()).toPromise();
// expect(result).toEqual([processes[0]]);
// expect(store.select).toHaveBeenCalled();
// });
// it('should call select on store and return all section branch processes', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang', type: 'cart', section: 'customer', data: { count: 1 } },
// { id: 2, name: 'Vorgang', type: 'task-calendar', section: 'branch' },
// ];
// store.select.and.returnValue(of(processes));
// const result = await spectator.service.getProcesses$('branch').pipe(first()).toPromise();
// expect(result).toEqual([processes[1]]);
// expect(store.select).toHaveBeenCalled();
// });
// });
// describe('getProcessById$()', () => {
// it('should return the process by id', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang 1', section: 'customer' },
// { id: 2, name: 'Vorgang 2', section: 'customer' },
// ];
// spyOn(spectator.service, 'getProcesses$').and.returnValue(of(processes));
// const process = await spectator.service.getProcessById$(1).toPromise();
// expect(process.id).toBe(1);
// });
// });
// describe('getSection$()', () => {
// it('should return the selected section branch', async () => {
// const section = 'branch';
// store.select.and.returnValue(of(section));
// const result = await spectator.service.getSection$().pipe(first()).toPromise();
// expect(result).toEqual(section);
// expect(store.select).toHaveBeenCalled();
// });
// });
// describe('getActivatedProcessId$', () => {
// it('should return the current selected activated process id', async () => {
// const activatedProcessId = 2;
// store.select.and.returnValue(of({ id: activatedProcessId }));
// const result = await spectator.service.getActivatedProcessId$().pipe(first()).toPromise();
// expect(result).toEqual(activatedProcessId);
// expect(store.select).toHaveBeenCalled();
// });
// });
// describe('activateProcess()', () => {
// it('should dispatch action setActivatedProcess with argument activatedProcessId and action type', () => {
// const activatedProcessId = 2;
// spectator.service.activateProcess(activatedProcessId);
// expect(store.dispatch).toHaveBeenCalledWith({ activatedProcessId, type: actions.setActivatedProcess.type });
// });
// });
// describe('removeProcess()', () => {
// it('should dispatch action removeProcess with argument processId and action type', () => {
// const processId = 2;
// spectator.service.removeProcess(processId);
// expect(store.dispatch).toHaveBeenCalledWith({ processId, type: actions.removeProcess.type });
// });
// });
// describe('createProcess()', () => {
// it('should dispatch action addProcess with process', async () => {
// const process: ApplicationProcess = {
// id: 1,
// name: 'Vorgang 1',
// section: 'customer',
// type: 'cart',
// };
// const timestamp = 100;
// spyOn(spectator.service as any, '_createTimestamp').and.returnValue(timestamp);
// spyOn(spectator.service, 'getProcessById$').and.returnValue(of(undefined));
// await spectator.service.createProcess(process);
// expect(store.dispatch).toHaveBeenCalledWith({
// type: actions.addProcess.type,
// process: {
// ...process,
// activated: 0,
// created: timestamp,
// },
// });
// });
// it('should throw an error if the process id is already existing', async () => {
// const process: ApplicationProcess = {
// id: 1,
// name: 'Vorgang 1',
// section: 'customer',
// type: 'cart',
// };
// spyOn(spectator.service, 'getProcessById$').and.returnValue(of(process));
// await expectAsync(spectator.service.createProcess(process)).toBeRejectedWithError('Process Id existiert bereits');
// });
// it('should throw an error if the process id is not a number', async () => {
// const process: ApplicationProcess = {
// id: undefined,
// name: 'Vorgang 1',
// section: 'customer',
// type: 'cart',
// };
// spyOn(spectator.service, 'getProcessById$').and.returnValue(of({ id: 5, name: 'Vorgang 2', section: 'customer' }));
// await expectAsync(spectator.service.createProcess(process)).toBeRejectedWithError('Process Id nicht gesetzt');
// });
// });
// describe('patchProcess', () => {
// it('should dispatch action patchProcess with changes', async () => {
// const process: ApplicationProcess = {
// id: 1,
// name: 'Vorgang 1',
// section: 'customer',
// type: 'cart',
// };
// await spectator.service.patchProcess(process.id, process);
// expect(store.dispatch).toHaveBeenCalledWith({
// type: actions.patchProcess.type,
// processId: process.id,
// changes: {
// ...process,
// },
// });
// });
// });
// describe('setSection()', () => {
// it('should dispatch action setSection with argument section and action type', () => {
// const section = 'customer';
// spectator.service.setSection(section);
// expect(store.dispatch).toHaveBeenCalledWith({ section, type: actions.setSection.type });
// });
// });
// describe('getLastActivatedProcessWithSectionAndType()', () => {
// it('should return the last activated process by section and type', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang 1', section: 'customer', type: 'cart', activated: 100 },
// { id: 2, name: 'Vorgang 2', section: 'customer', type: 'cart', activated: 200 },
// { id: 3, name: 'Vorgang 3', section: 'customer', type: 'goodsOut', activated: 300 },
// ];
// spyOn(spectator.service, 'getProcesses$').and.returnValue(of(processes));
// expect(await spectator.service.getLastActivatedProcessWithSectionAndType$('customer', 'cart').pipe(first()).toPromise()).toBe(
// processes[1]
// );
// });
// });
// describe('getLastActivatedProcessWithSection()', () => {
// it('should return the last activated process by section', async () => {
// const processes: ApplicationProcess[] = [
// { id: 1, name: 'Vorgang 1', section: 'customer', activated: 100 },
// { id: 2, name: 'Vorgang 2', section: 'customer', activated: 200 },
// { id: 3, name: 'Vorgang 3', section: 'customer', activated: 300 },
// ];
// spyOn(spectator.service, 'getProcesses$').and.returnValue(of(processes));
// expect(await spectator.service.getLastActivatedProcessWithSection$('customer').pipe(first()).toPromise()).toBe(processes[2]);
// });
// });
// describe('_createTimestamp', () => {
// it('should return the current timestamp in ms', () => {
// expect(spectator.service['_createTimestamp']()).toBeCloseTo(Date.now());
// });
// });
// });

View File

@@ -0,0 +1,141 @@
import { Injectable } from '@angular/core';
import { DomainAvailabilityService } from '@domain/availability';
import { Store } from '@ngrx/store';
import { BranchDTO } from '@swagger/checkout';
import { isBoolean, isNumber } from '@utils/common';
import { BehaviorSubject, Observable } from 'rxjs';
import { first, map, switchMap } from 'rxjs/operators';
import { ApplicationProcess } from './defs';
import {
removeProcess,
selectSection,
selectProcesses,
setSection,
addProcess,
setActivatedProcess,
selectActivatedProcess,
patchProcess,
patchProcessData,
} from './store';
@Injectable()
export class ApplicationService {
/** @deprecated */
private activatedProcessIdSubject = new BehaviorSubject<number>(undefined);
/** @deprecated */
get activatedProcessId() {
return this.activatedProcessIdSubject.value;
}
/** @deprecated */
get activatedProcessId$() {
return this.activatedProcessIdSubject.asObservable();
}
constructor(private store: Store) {}
getProcesses$(section?: 'customer' | 'branch') {
const processes$ = this.store.select(selectProcesses);
return processes$.pipe(map((processes) => processes.filter((process) => (section ? process.section === section : true))));
}
getProcessById$(processId: number): Observable<ApplicationProcess> {
return this.getProcesses$().pipe(map((processes) => processes.find((process) => process.id === processId)));
}
getSection$() {
return this.store.select(selectSection);
}
/** @deprecated */
getActivatedProcessId$() {
return this.store.select(selectActivatedProcess).pipe(map((process) => process?.id));
}
activateProcess(activatedProcessId: number) {
this.store.dispatch(setActivatedProcess({ activatedProcessId }));
this.activatedProcessIdSubject.next(activatedProcessId);
}
removeProcess(processId: number) {
this.store.dispatch(removeProcess({ processId }));
}
patchProcess(processId: number, changes: Partial<ApplicationProcess>) {
this.store.dispatch(patchProcess({ processId, changes }));
}
patchProcessData(processId: number, data: Record<string, any>) {
this.store.dispatch(patchProcessData({ processId, data }));
}
getSelectedBranch$(processId?: number): Observable<BranchDTO> {
if (!processId) {
return this.activatedProcessId$.pipe(
switchMap((processId) => this.getProcessById$(processId).pipe(map((process) => process?.data?.selectedBranch)))
);
}
return this.getProcessById$(processId).pipe(map((process) => process?.data?.selectedBranch));
}
async createProcess(process: ApplicationProcess) {
const existingProcess = await this.getProcessById$(process?.id).pipe(first()).toPromise();
if (existingProcess?.id === process?.id) {
throw new Error('Process Id existiert bereits');
}
if (!isNumber(process.id)) {
throw new Error('Process Id nicht gesetzt');
}
if (!isBoolean(process.closeable)) {
process.closeable = true;
}
if (!isBoolean(process.confirmClosing)) {
process.confirmClosing = true;
}
process.created = this._createTimestamp();
process.activated = 0;
this.store.dispatch(addProcess({ process }));
}
setSection(section: 'customer' | 'branch') {
this.store.dispatch(setSection({ section }));
}
getLastActivatedProcessWithSectionAndType$(section: 'customer' | 'branch', type: string): Observable<ApplicationProcess> {
return this.getProcesses$(section).pipe(
map((processes) =>
processes
?.filter((process) => process.type === type)
?.reduce((latest, current) => {
if (!latest) {
return current;
}
return latest?.activated > current?.activated ? latest : current;
}, undefined)
)
);
}
getLastActivatedProcessWithSection$(section: 'customer' | 'branch'): Observable<ApplicationProcess> {
return this.getProcesses$(section).pipe(
map((processes) =>
processes?.reduce((latest, current) => {
if (!latest) {
return current;
}
return latest?.activated > current?.activated ? latest : current;
}, undefined)
)
);
}
private _createTimestamp() {
return Date.now();
}
}

View File

@@ -0,0 +1,11 @@
export interface ApplicationProcess {
id: number;
created?: number;
activated?: number;
name: string;
section: 'customer' | 'branch';
type?: string;
data?: { [key: string]: any };
closeable?: boolean;
confirmClosing?: boolean;
}

View File

@@ -0,0 +1,3 @@
// start:ng42.barrel
export * from './application-process';
// end:ng42.barrel

View File

@@ -0,0 +1,6 @@
// start:ng42.barrel
export * from './application.module';
export * from './application.service';
export * from './defs';
export * from './store';
// end:ng42.barrel

View File

@@ -0,0 +1,16 @@
import { createAction, props } from '@ngrx/store';
import { ApplicationProcess } from '..';
const prefix = '[CORE-APPLICATION]';
export const setSection = createAction(`${prefix} Set Section`, props<{ section: 'customer' | 'branch' }>());
export const addProcess = createAction(`${prefix} Add Process`, props<{ process: ApplicationProcess }>());
export const removeProcess = createAction(`${prefix} Remove Process`, props<{ processId: number }>());
export const setActivatedProcess = createAction(`${prefix} Set Activated Process`, props<{ activatedProcessId: number }>());
export const patchProcess = createAction(`${prefix} Patch Process`, props<{ processId: number; changes: Partial<ApplicationProcess> }>());
export const patchProcessData = createAction(`${prefix} Patch Process Data`, props<{ processId: number; data: Record<string, any> }>());

View File

@@ -0,0 +1,200 @@
import { INITIAL_APPLICATION_STATE } from './application.state';
import * as actions from './application.actions';
import { applicationReducer } from './application.reducer';
import { ApplicationProcess } from '../defs';
import { ApplicationState } from './application.state';
describe('applicationReducer', () => {
describe('setSection()', () => {
it('should return modified state with section customer', () => {
const initialState = INITIAL_APPLICATION_STATE;
const action = actions.setSection({ section: 'customer' });
const state = applicationReducer(initialState, action);
expect(state).toEqual({
...initialState,
section: 'customer',
});
});
it('should return modified state with section branch', () => {
const initialState = INITIAL_APPLICATION_STATE;
const action = actions.setSection({ section: 'branch' });
const state = applicationReducer(initialState, action);
expect(state).toEqual({
...initialState,
section: 'branch',
});
});
});
describe('addProcess()', () => {
it('should return modified state with new process if no processes are registered in the state', () => {
const initialState = INITIAL_APPLICATION_STATE;
const process: ApplicationProcess = {
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
data: {},
};
const action = actions.addProcess({ process });
const state = applicationReducer(initialState, action);
expect(state.processes[0]).toEqual(process);
});
});
describe('patchProcess()', () => {
it('should return modified state with updated process when id is found', () => {
const initialState = INITIAL_APPLICATION_STATE;
const process: ApplicationProcess = {
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
};
const action = actions.patchProcess({ processId: process.id, changes: { ...process, name: 'Test' } });
const state = applicationReducer(
{
...initialState,
processes: [process],
},
action
);
expect(state.processes[0].name).toEqual('Test');
});
it('should return unmodified state when id is not existing', () => {
const initialState = INITIAL_APPLICATION_STATE;
const process: ApplicationProcess = {
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
};
const action = actions.patchProcess({ processId: process.id, changes: { ...process, id: 2 } });
const state = applicationReducer(
{
...initialState,
processes: [process],
},
action
);
expect(state.processes).toEqual([process]);
});
});
describe('removeProcess()', () => {
it('should return initial state if no processes are registered in the state', () => {
const initialState = INITIAL_APPLICATION_STATE;
const action = actions.removeProcess({ processId: 2 });
const state = applicationReducer(initialState, action);
expect(state).toEqual(initialState);
});
it('should return the unmodified state if processId not found', () => {
const initialState = INITIAL_APPLICATION_STATE;
const modifiedState: ApplicationState = {
...initialState,
section: 'customer',
processes: [
{
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
},
{
id: 4,
name: 'Vorgang',
section: 'customer',
type: 'goods-out',
},
] as ApplicationProcess[],
};
const action = actions.removeProcess({ processId: 2 });
const state = applicationReducer(modifiedState, action);
expect(state).toEqual(modifiedState);
});
it('should return modified state, after process gets removed', () => {
const initialState = INITIAL_APPLICATION_STATE;
const modifiedState: ApplicationState = {
...initialState,
section: 'customer',
processes: [
{
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
},
{
id: 2,
name: 'Vorgang',
section: 'customer',
type: 'goods-out',
},
] as ApplicationProcess[],
};
const action = actions.removeProcess({ processId: 2 });
const state = applicationReducer(modifiedState, action);
expect(state.processes).toEqual([
{
id: 1,
name: 'Vorgang',
section: 'customer',
type: 'cart',
},
]);
});
});
describe('setActivatedProcess()', () => {
it('should return modified state with process.activated value', () => {
const process: ApplicationProcess = {
id: 3,
name: 'Vorgang 3',
section: 'customer',
};
const initialState: ApplicationState = {
...INITIAL_APPLICATION_STATE,
processes: [process],
};
const action = actions.setActivatedProcess({ activatedProcessId: 3 });
const state = applicationReducer(initialState, action);
expect(state.processes[0].activated).toBeDefined();
});
it('should return modified state without process.activated value when activatedProcessId doesnt exist', () => {
const process: ApplicationProcess = {
id: 1,
name: 'Vorgang 3',
section: 'customer',
};
const initialState: ApplicationState = {
...INITIAL_APPLICATION_STATE,
processes: [process],
};
const action = actions.setActivatedProcess({ activatedProcessId: 3 });
const state = applicationReducer(initialState, action);
expect(state.processes[0].activated).toBeUndefined();
});
});
});

View File

@@ -0,0 +1,47 @@
import { Action, createReducer, on } from '@ngrx/store';
import { setSection, addProcess, removeProcess, setActivatedProcess, patchProcess, patchProcessData } from './application.actions';
import { ApplicationState, INITIAL_APPLICATION_STATE } from './application.state';
const _applicationReducer = createReducer(
INITIAL_APPLICATION_STATE,
on(setSection, (state, { section }) => ({ ...state, section })),
on(addProcess, (state, { process }) => ({ ...state, processes: [...state.processes, { data: {}, ...process }] })),
on(removeProcess, (state, { processId }) => {
const processes = state?.processes?.filter((process) => process.id !== processId) || [];
return { ...state, processes };
}),
on(setActivatedProcess, (state, { activatedProcessId }) => {
const processes = state.processes.map((process) => {
if (process.id === activatedProcessId) {
return { ...process, activated: Date.now() };
}
return process;
});
return { ...state, processes };
}),
on(patchProcess, (state, { processId, changes }) => {
const processes = state.processes.map((process) => {
if (process.id === processId) {
return { ...process, ...changes, id: processId };
}
return process;
});
return { ...state, processes };
}),
on(patchProcessData, (state, { processId, data }) => {
const processes = state.processes.map((process) => {
if (process.id === processId) {
return { ...process, data: { ...(process.data || {}), ...data } };
}
return process;
});
return { ...state, processes };
})
);
export function applicationReducer(state: ApplicationState, action: Action) {
return _applicationReducer(state, action);
}

View File

@@ -0,0 +1,35 @@
import { ApplicationState } from './application.state';
import { ApplicationProcess } from '../defs';
import * as selectors from './application.selectors';
describe('applicationSelectors', () => {
it('should select the processes', () => {
const processes: ApplicationProcess[] = [{ id: 1, name: 'Vorgang 1', section: 'customer' }];
const state: ApplicationState = {
processes,
section: 'customer',
};
expect(selectors.selectProcesses.projector(state)).toEqual(processes);
});
it('should select the section', () => {
const state: ApplicationState = {
processes: [],
section: 'customer',
};
expect(selectors.selectSection.projector(state)).toEqual('customer');
});
it('should select the activatedProcess', () => {
const processes: ApplicationProcess[] = [
{ id: 1, name: 'Vorgang 1', section: 'customer', activated: 100 },
{ id: 2, name: 'Vorgang 2', section: 'customer', activated: 300 },
{ id: 3, name: 'Vorgang 3', section: 'customer', activated: 200 },
];
const state: ApplicationState = {
processes,
section: 'customer',
};
expect(selectors.selectActivatedProcess.projector(state)).toEqual(processes[1]);
});
});

View File

@@ -0,0 +1,16 @@
import { createFeatureSelector, createSelector } from '@ngrx/store';
import { ApplicationState } from './application.state';
export const selectApplicationState = createFeatureSelector<ApplicationState>('core-application');
export const selectSection = createSelector(selectApplicationState, (s) => s.section);
export const selectProcesses = createSelector(selectApplicationState, (s) => s.processes);
export const selectActivatedProcess = createSelector(selectApplicationState, (s) =>
s?.processes?.reduce((process, current) => {
if (!process) {
return current;
}
return process.activated > current.activated ? process : current;
}, undefined)
);

View File

@@ -0,0 +1,11 @@
import { ApplicationProcess } from '../defs';
export interface ApplicationState {
processes: ApplicationProcess[];
section: 'customer' | 'branch';
}
export const INITIAL_APPLICATION_STATE: ApplicationState = {
processes: [],
section: 'customer',
};

View File

@@ -0,0 +1,6 @@
// start:ng42.barrel
export * from './application.actions';
export * from './application.reducer';
export * from './application.selectors';
export * from './application.state';
// end:ng42.barrel

View File

@@ -0,0 +1,5 @@
/*
* Public API Surface of application
*/
export * from './lib';

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/auth",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,21 @@
import { ModuleWithProviders, NgModule } from '@angular/core';
import { AuthService } from './auth.service';
import { OAuthModule } from 'angular-oauth2-oidc';
import { IfRoleDirective } from './if-role.directive';
@NgModule({
declarations: [IfRoleDirective],
exports: [IfRoleDirective],
})
export class AuthModule {
static forRoot(): ModuleWithProviders<AuthModule> {
return {
ngModule: AuthModule,
providers: [
AuthService,
OAuthModule.forRoot({
resourceServer: { sendAccessToken: true },
}).providers,
],
};
}
}

View File

@@ -0,0 +1,151 @@
import { Config } from '@core/config';
import { SpectatorService, createServiceFactory, SpyObject } from '@ngneat/spectator';
import { OAuthService } from 'angular-oauth2-oidc';
import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
import { Observable } from 'rxjs';
import { AuthService } from './auth.service';
describe('AuthService', () => {
let spectator: SpectatorService<AuthService>;
const createService = createServiceFactory({
service: AuthService,
mocks: [Config, OAuthService],
});
let config: SpyObject<Config>;
let oAuthService: SpyObject<OAuthService>;
beforeEach(() => {
spectator = createService();
config = spectator.inject(Config);
oAuthService = spectator.inject(OAuthService);
});
it('should be created', () => {
expect(spectator.service).toBeTruthy();
});
describe('init()', () => {
it('should configure the oAuthService', () => {
config.get.and.returnValue({});
spectator.service.init();
expect(oAuthService.configure).toHaveBeenCalledWith({
redirectUri: window.location.origin,
silentRefreshRedirectUri: window.location.origin + '/silent-refresh.html',
useSilentRefresh: true,
});
expect(oAuthService.tokenValidationHandler).toBeInstanceOf(JwksValidationHandler);
expect(oAuthService.setupAutomaticSilentRefresh).toHaveBeenCalled();
});
it('should load the discovery document', async () => {
config.get.and.returnValue({});
oAuthService.loadDiscoveryDocumentAndTryLogin.and.returnValue(Promise.resolve(true));
spyOn(spectator.service['_initialized'], 'next');
await spectator.service.init();
expect(oAuthService.loadDiscoveryDocumentAndTryLogin).toHaveBeenCalled();
expect(spectator.service['_initialized'].next).toHaveBeenCalledWith(true);
});
it('should throw an error if its already initialized', async () => {
spyOn(spectator.service['_initialized'], 'getValue').and.returnValue(true);
await expectAsync(spectator.service.init()).toBeRejectedWithError('AuthService is already initialized');
});
});
describe('isAuthenticated()', () => {
it('should call hasValidIdToken() and return its value', () => {
oAuthService.hasValidIdToken.and.returnValue(true);
expect(spectator.service.isAuthenticated()).toBeTrue();
expect(oAuthService.hasValidIdToken).toHaveBeenCalled();
});
});
describe('getToken()', () => {
it('should call getAccessToken() and return its value', () => {
oAuthService.getAccessToken.and.returnValue('token');
expect(spectator.service.getToken()).toEqual('token');
expect(oAuthService.getAccessToken).toHaveBeenCalled();
});
});
describe('getClaims()', () => {
it('should call getAccessToken() and return its value', () => {
oAuthService.getAccessToken.and.returnValue('token');
const claims = {
claim1: 'value',
claim2: 'value2',
};
spyOn(spectator.service, 'parseJwt').and.returnValue(claims);
expect(spectator.service.getClaims()).toEqual(claims);
expect(spectator.service.parseJwt).toHaveBeenCalledWith('token');
expect(oAuthService.getAccessToken).toHaveBeenCalled();
});
});
describe('getClaimByKey()', () => {
it('should call getClaims() and return its key value', () => {
spyOn(spectator.service, 'getClaims').and.returnValue({
claim1: 'value',
claim2: 'value2',
});
expect(spectator.service.getClaimByKey('claim1')).toEqual('value');
expect(spectator.service.getClaims).toHaveBeenCalled();
});
it('should return null if getClaims() returns null or undefined', () => {
spyOn(spectator.service, 'getClaims').and.returnValue(null);
expect(spectator.service.getClaimByKey('claim1')).toBeNull();
expect(spectator.service.getClaims).toHaveBeenCalled();
});
});
describe('parseJwt()', () => {
it('should return null if the token is null or undefined', () => {
expect(spectator.service.parseJwt(null)).toBeNull();
expect(spectator.service.parseJwt(undefined)).toBeNull();
});
it('should return the value of the key', () => {
const token =
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ';
expect(spectator.service.parseJwt(token)).toEqual({
sub: '1234567890',
name: 'John Doe',
admin: true,
});
});
});
describe('login()', () => {
it('should call initLoginFlow()', () => {
spectator.service.login();
expect(oAuthService.initLoginFlow).toHaveBeenCalled();
});
});
describe('logout()', () => {
it('should call revokeTokenAndLogout()', async () => {
await spectator.service.logout();
expect(oAuthService.revokeTokenAndLogout).toHaveBeenCalled();
});
});
describe('getToken()', () => {
it('should return getAccessToken()', () => {
spectator.service.getToken();
expect(oAuthService.getAccessToken).toHaveBeenCalled();
});
});
describe('initialized', () => {
it('should return _initialized as Observable', () => {
spyOn(spectator.service['_initialized'], 'asObservable').and.callThrough();
expect(spectator.service.initialized$).toBeInstanceOf(Observable);
expect(spectator.service['_initialized'].asObservable).toHaveBeenCalled();
});
});
});

View File

@@ -0,0 +1,125 @@
import { coerceArray, coerceStringArray } from '@angular/cdk/coercion';
import { Injectable } from '@angular/core';
import { Config } from '@core/config';
import { isNullOrUndefined } from '@utils/common';
import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
import { asapScheduler, BehaviorSubject } from 'rxjs';
@Injectable({
providedIn: 'root',
})
export class AuthService {
private readonly _initialized = new BehaviorSubject<boolean>(false);
get initialized$() {
return this._initialized.asObservable();
}
private _authConfig: AuthConfig;
constructor(private _config: Config, private readonly _oAuthService: OAuthService) {
this._oAuthService.events?.subscribe((event) => {
if (event.type === 'token_received') {
console.log('SSO Token Expiration:', new Date(this._oAuthService.getAccessTokenExpiration()));
}
});
}
async init() {
if (this._initialized.getValue()) {
throw new Error('AuthService is already initialized');
}
this._authConfig = this._config.get('@core/auth');
this._authConfig.redirectUri = window.location.origin;
this._authConfig.silentRefreshRedirectUri = window.location.origin + '/silent-refresh.html';
this._authConfig.useSilentRefresh = true;
this._oAuthService.configure(this._authConfig);
this._oAuthService.tokenValidationHandler = new JwksValidationHandler();
this._oAuthService.setupAutomaticSilentRefresh();
try {
await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
} catch (error) {
this.login();
}
this._initialized.next(true);
}
isAuthenticated() {
return this._oAuthService.hasValidIdToken();
}
getToken() {
return this._oAuthService.getAccessToken();
}
getClaims() {
const token = this._oAuthService.getAccessToken();
return this.parseJwt(token);
}
getClaimByKey(key: string) {
const claims = this.getClaims();
if (isNullOrUndefined(claims)) {
return null;
}
return claims[key];
}
parseJwt(token: string) {
if (isNullOrUndefined(token)) {
return null;
}
const base64Url = token.split('.')[1];
const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
const encoded = window.atob(base64);
return JSON.parse(encoded);
}
login() {
this._oAuthService.initLoginFlow();
}
setKeyCardToken(token: string) {
this._oAuthService.customQueryParams = {
temp_token: token,
};
}
async logout() {
await this._oAuthService.revokeTokenAndLogout();
// asapScheduler.schedule(() => {
// window.location.reload();
// }, 250);
}
hasRole(role: string | string[]) {
const roles = coerceArray(role);
const userRoles = this.getClaimByKey('role');
if (isNullOrUndefined(userRoles)) {
return false;
}
return roles.every((r) => userRoles.includes(r));
}
async refresh() {
try {
if (this._authConfig.responseType.includes('code') && this._authConfig.scope.includes('offline_access')) {
await this._oAuthService.refreshToken();
} else {
await this._oAuthService.silentRefresh();
}
} catch (error) {
console.error(error);
}
}
}

View File

@@ -0,0 +1,65 @@
// import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator';
// import { IfRoleDirective } from './if-role.directive';
// import { AuthService } from './auth.service';
// import { TemplateRef, ViewContainerRef } from '@angular/core';
// describe('IfRoleDirective', () => {
// let spectator: SpectatorDirective<IfRoleDirective>;
// const createDirective = createDirectiveFactory({
// directive: IfRoleDirective,
// mocks: [AuthService],
// });
// it('should create an instance', () => {
// spectator = createDirective(`<div *ifRole="'admin'"></div>`);
// expect(spectator.directive).toBeTruthy();
// });
// it('should render template when user has the role', () => {
// spectator = createDirective(`<div *ifRole="'admin'"></div>`);
// const authService = spectator.inject(AuthService);
// const viewContainerRef = spectator.inject(ViewContainerRef);
// const templateRef = spectator.inject(TemplateRef);
// authService.hasRole.and.returnValue(true);
// spectator.directive.ngOnChanges();
// expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(templateRef, spectator.directive.getContext());
// });
// it('should render else template when user does not have the role', () => {
// authService.hasRole.and.returnValue(false);
// const elseTemplateRef = {} as TemplateRef<any>;
// spectator = createDirective(`<ng-template #elseTemplateRef></ng-template><div *ifRole="'admin'; else elseTemplateRef"></div>`, {
// hostProps: {
// elseTemplateRef,
// },
// });
// spectator.directive.ngOnChanges();
// expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(elseTemplateRef, spectator.directive.getContext());
// });
// it('should render else template when user does not have the role using ifNotRole input', () => {
// authService.hasRole.and.returnValue(false);
// const elseTemplateRef = {} as TemplateRef<any>;
// spectator = createDirective(`<ng-template #elseTemplateRef></ng-template><div *ifNotRole="'admin'; else elseTemplateRef"></div>`, {
// hostProps: {
// elseTemplateRef,
// },
// });
// spectator.directive.ngOnChanges();
// expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(elseTemplateRef, spectator.directive.getContext());
// });
// it('should clear view when user does not have the role and elseTemplateRef is not defined', () => {
// authService.hasRole.and.returnValue(false);
// spectator = createDirective(`<div *ifRole="'admin'"></div>`);
// spectator.directive.ngOnChanges();
// expect(viewContainerRef.clear).toHaveBeenCalled();
// });
// it('should set $implicit to ifRole or ifNotRole input', () => {
// spectator = createDirective(`<div *ifRole="'admin'"></div>`);
// expect(spectator.directive.getContext().$implicit).toEqual('admin');
// spectator.setInput('ifNotRole', 'user');
// expect(spectator.directive.getContext().$implicit).toEqual('user');
// });
// });

View File

@@ -0,0 +1,59 @@
import { Directive, Input, OnChanges, TemplateRef, ViewContainerRef } from '@angular/core';
import { AuthService } from './auth.service';
@Directive({
selector: '[ifRole],[ifRoleElse],[ifNotRole],[ifNotRoleElse]',
})
export class IfRoleDirective implements OnChanges {
@Input()
ifRole: string | string[];
@Input()
ifRoleElse: TemplateRef<any>;
@Input()
ifNotRole: string | string[];
@Input()
ifNotRoleElse: TemplateRef<any>;
get renderTemplateRef() {
if (this.ifRole) {
return this._authService.hasRole(this.ifRole);
}
if (this.ifNotRole) {
return !this._authService.hasRole(this.ifNotRole);
}
return false;
}
get elseTemplateRef() {
return this.ifRoleElse || this.ifNotRoleElse;
}
constructor(private _templateRef: TemplateRef<any>, private _viewContainer: ViewContainerRef, private _authService: AuthService) {}
ngOnChanges() {
this.render();
}
render() {
if (this.renderTemplateRef) {
this._viewContainer.createEmbeddedView(this._templateRef, this.getContext());
return;
}
if (this.elseTemplateRef) {
this._viewContainer.createEmbeddedView(this.elseTemplateRef, this.getContext());
return;
}
this._viewContainer.clear();
}
getContext(): { $implicit: string | string[] } {
return {
$implicit: this.ifRole || this.ifNotRole,
};
}
}

View File

@@ -0,0 +1,4 @@
// start:ng42.barrel
export * from './auth.module';
export * from './auth.service';
// end:ng42.barrel

View File

@@ -0,0 +1,5 @@
/*
* Public API Surface of auth
*/
export * from './lib';

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/breadcrumb",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,34 @@
import { TestBed } from '@angular/core/testing';
import { Store } from '@ngrx/store';
import { isNumber } from '@utils/common';
import { of } from 'rxjs';
import { BreadcrumbService } from './breadcrumb.service';
import { Breadcrumb } from './defs';
import * as actions from './store/breadcrumb.actions';
import * as selectors from './store/breadcrumb.selectors';
describe('Breadcrumb Service', () => {
let store: jasmine.SpyObj<Store<any>>;
let service: BreadcrumbService;
beforeEach(() => {
store = jasmine.createSpyObj<Store<any>>('Store', ['select', 'dispatch']);
TestBed.configureTestingModule({
providers: [BreadcrumbService, { provide: Store, useValue: store }],
});
service = TestBed.inject(BreadcrumbService);
});
describe('addBreadcrumb', () => {
it('should call store.dispatch with the addBreadecrumb action and retuns a breadcrumb with an id', () => {
let breadcrumb: Breadcrumb = { name: 'unit-test', key: 'hello-key', path: 'Run The Test', section: 'customer' };
breadcrumb = service.addBreadcrumb(breadcrumb);
expect(store.dispatch).toHaveBeenCalledWith(actions.addBreadcrumb({ breadcrumb }));
expect(isNumber(breadcrumb.id)).toBeTruthy();
expect(isNumber(breadcrumb.timestamp)).toBeTruthy();
});
});
});

View File

@@ -0,0 +1,143 @@
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import { getNumberId } from '@utils/id';
import { Observable } from 'rxjs';
import { first, map, take } from 'rxjs/operators';
import { Breadcrumb } from './defs';
import * as actions from './store/breadcrumb.actions';
import * as selectors from './store/breadcrumb.selectors';
@Injectable()
export class BreadcrumbService {
constructor(private store: Store<any>) {}
getAll$() {
return this.store.select(selectors.selectBreadcrumbs);
}
getByKey$(key: string): Observable<Breadcrumb[]> {
return this.store.select(selectors.selectBreadcrumbsByKey, key);
}
getBreadcrumbById$(id: number): Observable<Breadcrumb> {
return this.store.select(selectors.selectBreadcrumbById, id);
}
getBreadcrumbByKey$(key: string | number): Observable<Breadcrumb[]> {
return this.store.select(selectors.selectBreadcrumbsByKey, key);
}
getLastActivatedBreadcrumbByKey$(key: string | number): Observable<Breadcrumb> {
return this.getBreadcrumbByKey$(key).pipe(
map((crumbs) =>
crumbs.reduce((latest, current) => {
if (!latest) {
return current;
}
return latest.timestamp > current.timestamp ? latest : current;
}, undefined)
)
);
}
addBreadcrumb(breadcrumb: Breadcrumb): Breadcrumb {
const newBreadcrumb: Breadcrumb = { ...breadcrumb, id: getNumberId(), timestamp: Date.now(), changed: Date.now() };
this.store.dispatch(actions.addBreadcrumb({ breadcrumb: newBreadcrumb }));
return newBreadcrumb;
}
patchBreadcrumb(breadcrumbId: number, changes: Partial<Breadcrumb>) {
this.store.dispatch(actions.updateBreadcrumb({ id: breadcrumbId, changes: { ...changes, changed: Date.now() } }));
}
async patchBreadcrumbByKeyAndTags(key: string | number, tags: string[], changes: Partial<Breadcrumb>) {
const crumbs = await this.getBreadcrumbsByKeyAndTags$(key, tags).pipe(first()).toPromise();
crumbs.forEach((crumb) => this.patchBreadcrumb(crumb.id, changes));
}
async addBreadcrumbIfNotExists(breadcrumb: Breadcrumb) {
const crumbs = await this.getBreadcrumbsByKeyAndTags$(breadcrumb.key, breadcrumb.tags).pipe(take(1)).toPromise();
if (crumbs.length === 0) {
return this.addBreadcrumb(breadcrumb);
}
return crumbs[0];
}
async addOrUpdateBreadcrumbIfNotExists(breadcrumb: Breadcrumb) {
const crumbs = await this.getBreadcrumbsByKeyAndTags$(breadcrumb.key, breadcrumb.tags).pipe(take(1)).toPromise();
if (crumbs.length === 0) {
return this.addBreadcrumb(breadcrumb);
}
return this.patchBreadcrumb(crumbs[0].id, breadcrumb);
}
getBreadcrumbsByKeyAndTag$(key: string | number, tag: string): Observable<Breadcrumb[]> {
return this.store.select(selectors.selectBreadcrumbsByKeyAndTag, { key, tag });
}
getBreadcrumbsByKeyAndTags$(key: string | number, tags: string[]): Observable<Breadcrumb[]> {
return this.store.select(selectors.selectBreadcrumbsByKeyAndTags, { key, tags });
}
async removeBreadcrumbsAfter(breadcrumbId: number, withTags: string[] = []) {
const breadcrumb = await this.getBreadcrumbById$(breadcrumbId).pipe(take(1)).toPromise();
if (!breadcrumb) {
return;
}
let breadcrumbs: Breadcrumb[];
if (withTags?.length > 0) {
breadcrumbs = await this.getBreadcrumbsByKeyAndTags$(breadcrumb.key, withTags).pipe(take(1)).toPromise();
} else {
breadcrumbs = await this.getBreadcrumbByKey$(breadcrumb.key).pipe(take(1)).toPromise();
}
if (!breadcrumbs?.length) {
return;
}
const breadcrumbsToRemove = breadcrumbs.filter((crumb) => crumb.timestamp > breadcrumb.timestamp);
if (!breadcrumbsToRemove.length) {
return;
}
this.store.dispatch(actions.removeManyBreadcrumb({ ids: breadcrumbsToRemove.map((crumb) => crumb.id) }));
}
async removeBreadcrumb(breadcrumbId: number, recursive: boolean = true) {
const breadcrumb = await this.getBreadcrumbById$(breadcrumbId).pipe(take(1)).toPromise();
if (!breadcrumb) {
return;
}
let breadcrumbsToRemove = [breadcrumb];
if (recursive) {
const breadcrumbs = await this.getBreadcrumbByKey$(breadcrumb.key).pipe(take(1)).toPromise();
breadcrumbsToRemove = [...breadcrumbsToRemove, ...breadcrumbs.filter((crumb) => crumb.timestamp > breadcrumb.timestamp)];
}
if (!breadcrumbsToRemove.length) {
return;
}
this.store.dispatch(actions.removeManyBreadcrumb({ ids: breadcrumbsToRemove.map((crumb) => crumb.id) }));
}
async removeBreadcrumbsByKeyAndTags(key: number | string, tags: string[]) {
const crumbs = await this.getBreadcrumbsByKeyAndTags$(key, tags).pipe(first()).toPromise();
crumbs.forEach((crumb) => this.removeBreadcrumb(crumb.id));
}
getLatestBreadcrumbForSection(section: 'customer' | 'branch') {
return this.store
.select(selectors.selectBreadcrumbsBySection, { section })
.pipe(map((crumbs) => crumbs.sort((a, b) => b.changed - a.changed).find((f) => true)));
}
}

View File

@@ -0,0 +1,22 @@
import { ModuleWithProviders, NgModule } from '@angular/core';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { BreadcrumbService } from './breadcrumb.service';
import { BreadcrumbEffects } from './store/breadcrumb.effect';
import { breadcrumbReducer } from './store/breadcrumb.reducer';
import { featureName } from './store/breadcrumb.state';
@NgModule()
export class CoreBreadcrumbModule {
static forRoot(): ModuleWithProviders<CoreBreadcrumbModule> {
return {
ngModule: CoreBreadcrumbForRootModule,
};
}
}
@NgModule({
imports: [StoreModule.forFeature(featureName, breadcrumbReducer), EffectsModule.forFeature([BreadcrumbEffects])],
providers: [BreadcrumbService],
})
export class CoreBreadcrumbForRootModule {}

View File

@@ -0,0 +1,46 @@
export interface Breadcrumb {
/**
* Eindeutige ID für die Entity
*/
id?: number;
/**
* Identifier für ein Teilbereich/ProzessId der Applikation
*/
key: number | string;
/**
* Tags
*/
tags?: string[];
/**
* Anzeigename
*/
name: string;
/**
* Url
*/
path: string;
/**
* Query Parameter
*/
params?: Object;
/**
* Timestamp
*/
timestamp?: number;
/**
* Cahnged
*/
changed?: number;
/**
* Applicatiuon Section
*/
section: string;
}

View File

@@ -0,0 +1,3 @@
// start:ng42.barrel
export * from './breadcrumb.model';
// end:ng42.barrel

View File

@@ -0,0 +1 @@
describe('Breadcrumb Actions', () => {});

View File

@@ -0,0 +1,24 @@
import { createAction, props } from '@ngrx/store';
import { Breadcrumb } from '../defs';
const prefix = '[CORE-BREADCRUMB]';
/**
* Action um Breadcrumb zum State hinzufügen
*/
export const addBreadcrumb = createAction(`${prefix} Add Breadcrumb`, props<{ breadcrumb: Breadcrumb }>());
/**
* Action um Breadcrumb im State zu ändern
*/
export const updateBreadcrumb = createAction(`${prefix} Update Breadcrumb`, props<{ id: number; changes: Partial<Breadcrumb> }>());
/**
* Action um Breadcrumb im State zu entfernen
*/
export const removeBreadcrumb = createAction(`${prefix} Remove Breadcrumb`, props<{ id: number }>());
/**
* Action um mehrere Breadcrumbs im State zu entfernen
*/
export const removeManyBreadcrumb = createAction(`${prefix} Remove Many Breadcrumb`, props<{ ids: number[] }>());

View File

@@ -0,0 +1,27 @@
import { Injectable } from '@angular/core';
import { removeProcess } from '@core/application';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { NEVER } from 'rxjs';
import { mergeMap, tap, first, map } from 'rxjs/operators';
import { BreadcrumbService } from '../breadcrumb.service';
@Injectable()
export class BreadcrumbEffects {
removeProcess$ = createEffect(
() =>
this.actions$.pipe(
ofType(removeProcess),
mergeMap((action) =>
this.breadcrumb.getBreadcrumbByKey$(action.processId).pipe(
first(),
tap((breadcrumbs) => {
breadcrumbs?.forEach((crumb) => this.breadcrumb.removeBreadcrumb(crumb.id));
})
)
)
),
{ dispatch: false }
);
constructor(private actions$: Actions, private breadcrumb: BreadcrumbService) {}
}

View File

@@ -0,0 +1,92 @@
import { Breadcrumb } from '../defs';
import * as action from './breadcrumb.actions';
import { breadcrumbReducer } from './breadcrumb.reducer';
import { INIT } from './breadcrumb.state';
describe('Breadcrumb Reducer', () => {
it('should return the initial state if the current state is empty', () => {
const fixture = breadcrumbReducer(undefined, { type: '' });
expect(fixture).toEqual(INIT);
});
describe('addBreadcrumb', () => {
it('should add the breadcrumb to the state', () => {
const breadcrumb: Breadcrumb = {
id: 1,
key: 'unit-test',
name: 'Test Name',
path: 'Test Patch',
section: 'customer',
};
const fixture = breadcrumbReducer(INIT, action.addBreadcrumb({ breadcrumb }));
expect(fixture.entities[1]).toEqual(breadcrumb);
});
});
describe('updateBreadcrumb', () => {
it('should update an existing breadcrumb', () => {
const breadcrumb: Breadcrumb = {
id: 1,
key: 'unit-test',
name: 'Test Name',
path: 'Test Patch',
section: 'customer',
};
const expected = {
...breadcrumb,
name: 'Test Name 2',
};
const state = breadcrumbReducer(INIT, action.addBreadcrumb({ breadcrumb }));
const fixture = breadcrumbReducer(state, action.updateBreadcrumb({ id: breadcrumb.id, changes: { name: 'Test Name 2' } }));
expect(fixture.entities[breadcrumb.id]).toEqual(expected);
});
});
describe('removeBreadcrumb', () => {
it('should remove the breadcrumb', () => {
const breadcrumb: Breadcrumb = {
id: 1,
key: 'unit-test',
name: 'Test Name',
path: 'Test Patch',
section: 'customer',
};
const state = breadcrumbReducer(INIT, action.addBreadcrumb({ breadcrumb }));
const fixture = breadcrumbReducer(state, action.removeBreadcrumb({ id: breadcrumb.id }));
expect(fixture.entities[breadcrumb.id]).toBeUndefined();
});
});
describe('removeManyBreadcrumb', () => {
it('should remove all breadcrumbs for the given ids', () => {
const breadcrumb1: Breadcrumb = {
id: 1,
key: 'unit-test',
name: 'Test Name',
path: 'Test Patch',
section: 'customer',
};
const breadcrumb2 = { ...breadcrumb1, id: 2 };
const breadcrumb3 = { ...breadcrumb1, id: 3 };
let state = breadcrumbReducer(INIT, action.addBreadcrumb({ breadcrumb: breadcrumb1 }));
state = breadcrumbReducer(state, action.addBreadcrumb({ breadcrumb: breadcrumb2 }));
state = breadcrumbReducer(state, action.addBreadcrumb({ breadcrumb: breadcrumb3 }));
const fixture = breadcrumbReducer(state, action.removeManyBreadcrumb({ ids: [1, 3] }));
expect(Object.keys(fixture.entities).length).toEqual(1);
expect(fixture.entities[breadcrumb2.id]).toEqual(breadcrumb2);
});
});
});

View File

@@ -0,0 +1,16 @@
import { Action, createReducer, on } from '@ngrx/store';
import { breadcrumbAdapter, BreadcrumbState, INIT } from './breadcrumb.state';
import * as actions from './breadcrumb.actions';
const _breadcrumbReducer = createReducer(
INIT,
on(actions.addBreadcrumb, (s, a) => breadcrumbAdapter.addOne(a.breadcrumb, s)),
on(actions.updateBreadcrumb, (s, a) => breadcrumbAdapter.updateOne(a, s)),
on(actions.removeBreadcrumb, (s, a) => breadcrumbAdapter.removeOne(a.id, s)),
on(actions.removeManyBreadcrumb, (s, a) => breadcrumbAdapter.removeMany(a.ids, s))
);
export function breadcrumbReducer(state: BreadcrumbState, action: Action) {
return _breadcrumbReducer(state, action);
}

View File

@@ -0,0 +1,57 @@
import * as selector from './breadcrumb.selectors';
import * as action from './breadcrumb.actions';
import { breadcrumbReducer } from './breadcrumb.reducer';
import { BreadcrumbState, INIT } from './breadcrumb.state';
describe('Breadcrumb Selectors', () => {
let state: BreadcrumbState;
beforeEach(() => {
state = breadcrumbReducer(
INIT,
action.addBreadcrumb({ breadcrumb: { id: 1, key: 'unit-test-1', path: '', name: 'Unit Test 1', section: 'customer' } })
);
state = breadcrumbReducer(
state,
action.addBreadcrumb({
breadcrumb: { id: 2, key: 'unit-test-1', path: '', name: 'Unit Test 1', tags: ['details'], section: 'customer' },
})
);
state = breadcrumbReducer(
state,
action.addBreadcrumb({ breadcrumb: { id: 3, key: 'unit-test-2', path: '', name: 'Unit Test 1', section: 'customer' } })
);
state = breadcrumbReducer(
state,
action.addBreadcrumb({ breadcrumb: { id: 4, key: 'unit-test-3', path: '', name: 'Unit Test 1', section: 'customer' } })
);
state = breadcrumbReducer(
state,
action.addBreadcrumb({
breadcrumb: { id: 5, key: 'unit-test-3', path: '', name: 'Unit Test 1', tags: ['details'], section: 'customer' },
})
);
});
describe('selectBreadcrumbsByKey', () => {
it('should return all breadcrumbs with the key unit-test-1', () => {
const fixture = selector.selectBreadcrumbsByKey.projector(Object.values(state.entities), 'unit-test-1');
expect(fixture.length).toBe(2);
expect(fixture[0].key).toBe('unit-test-1');
expect(fixture[1].key).toBe('unit-test-1');
});
});
describe('selectBreadcrumbsByKeyAndTag', () => {
it('should return all breadcrumbs with the key unit-test-3 and tag details', () => {
const fixture = selector.selectBreadcrumbsByKeyAndTag.projector(Object.values(state.entities), {
key: 'unit-test-3',
tag: 'details',
});
expect(fixture.length).toBe(1);
expect(fixture[0].key).toBe('unit-test-3');
expect(fixture[0].tags).toContain('details');
});
});
});

View File

@@ -0,0 +1,48 @@
import { createSelector, createFeatureSelector } from '@ngrx/store';
import { Breadcrumb } from '../defs';
import { breadcrumbAdapter, BreadcrumbState, featureName } from './breadcrumb.state';
import { isArray } from '@utils/common';
const selectFeature = createFeatureSelector<BreadcrumbState>(featureName);
const { selectAll, selectEntities } = breadcrumbAdapter.getSelectors(selectFeature);
/**
* Gibt alle Breadcrumb Entities als Array zurück
*/
export const selectBreadcrumbs = selectAll;
/**
* Gibt alle Breadcrumb Entities als Array zurück die den key enthalten
*/
export const selectBreadcrumbById = createSelector(selectEntities, (entities, id: number) => entities[id]);
/**
* Gibt alle Breadcrumb Entities als Array zurück die den key enthalten
*/
export const selectBreadcrumbsByKey = createSelector(selectAll, (entities, key: string) => entities.filter((crumb) => crumb.key == key));
/**
* Gibt alle Breadcrumb Entities als Array zurück die den key und tag enthalten
*/
export const selectBreadcrumbsByKeyAndTag = createSelector(
selectAll,
(entities: Breadcrumb[], { key, tag }: { key: string; tag: string }) =>
entities.filter((crumb) => crumb.key == key && isArray(crumb.tags) && crumb.tags.includes(tag))
);
/**
* Gibt alle Breadcrumb Entities als Array zurück die den key und tags enthalten
*/
export const selectBreadcrumbsByKeyAndTags = createSelector(
selectAll,
(entities: Breadcrumb[], { key, tags }: { key: string; tags: string[] }) =>
entities.filter((crumb) => crumb.key == key && isArray(crumb.tags) && tags.every((tag) => crumb.tags.includes(tag)))
);
/**
* Gibt alle Breadcrumb Entities als Array zurück die die tags enthalten
*/
export const selectBreadcrumbsBySection = createSelector(selectAll, (entities: Breadcrumb[], { section }: { section: string }) =>
entities.filter((crumb) => crumb.section === section)
);

View File

@@ -0,0 +1,12 @@
import { createEntityAdapter, EntityState } from '@ngrx/entity';
import { Breadcrumb } from '../defs';
export interface BreadcrumbState extends EntityState<Breadcrumb> {}
export const featureName = 'core-breadcrumb';
export const breadcrumbAdapter = createEntityAdapter<Breadcrumb>();
export const INIT: BreadcrumbState = {
...breadcrumbAdapter.getInitialState(),
};

View File

@@ -0,0 +1,7 @@
/*
* Public API Surface of breadcrumb
*/
export * from './lib/breadcrumb.service';
export * from './lib/core-breadcrumb.module';
export * from './lib/defs';

7
apps/core/cache/ng-package.json vendored Normal file
View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/cache",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,4 @@
export interface CacheOptions {
ttl?: number;
persist?: boolean;
}

View File

@@ -0,0 +1,8 @@
import { NgModule } from '@angular/core';
@NgModule({
declarations: [],
imports: [],
exports: [],
})
export class CacheModule {}

View File

@@ -0,0 +1,80 @@
import { Injectable } from '@angular/core';
import { CacheOptions } from './cache-options';
import { Cached } from './cached';
@Injectable({
providedIn: 'root',
})
export class CacheService {
constructor() {}
set(token: Object, data: any, options?: CacheOptions) {
const persist = options?.persist;
const ttl = options?.ttl;
const cached: Cached = {
data,
};
if (ttl) {
cached.until = Date.now() + ttl;
}
if (persist) {
localStorage.setItem(this.getKey(token), this.serialize(cached));
} else {
sessionStorage.setItem(this.getKey(token), this.serialize(cached));
}
Object.freeze(cached);
return cached;
}
get<T = any>(token: Object, from: 'session' | 'persist' = 'session'): T {
let cached: Cached;
if (from === 'session') {
cached = this.deserialize(sessionStorage.getItem(this.getKey(token)));
} else if (from === 'persist') {
cached = this.deserialize(localStorage.getItem(this.getKey(token)));
}
if (!cached) {
return undefined;
}
if (cached.until < Date.now()) {
this.delete(token, from);
return undefined;
}
return cached.data;
}
delete(token: Object, from: 'session' | 'persist' = 'session') {
if (from === 'session') {
sessionStorage.removeItem(this.getKey(token));
} else if (from === 'persist') {
localStorage.removeItem(this.getKey(token));
}
}
private getKey(token: Object) {
return this.hash(JSON.stringify(token));
}
private hash(data: string): string {
let hash = 0;
for (let i = 0; i < data.length; i++) {
hash = data.charCodeAt(i) + ((hash << 5) - hash);
}
return hash.toString(16);
}
private serialize(data: Cached): string {
return JSON.stringify(data);
}
private deserialize(data: string): Cached {
return JSON.parse(data);
}
}

4
apps/core/cache/src/lib/cached.ts vendored Normal file
View File

@@ -0,0 +1,4 @@
export interface Cached {
until?: number;
data?: any;
}

6
apps/core/cache/src/public-api.ts vendored Normal file
View File

@@ -0,0 +1,6 @@
/*
* Public API Surface of cache
*/
export * from './lib/cache.service';
export * from './lib/cache.module';

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/command",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,6 @@
import { CommandService } from './command.service';
export abstract class ActionHandler<T = any> {
constructor(readonly action: string) {}
abstract handler(data: T, service?: CommandService): Promise<T>;
}

View File

@@ -0,0 +1,25 @@
import { ModuleWithProviders, NgModule, Provider, Type } from '@angular/core';
import { ActionHandler } from './action-handler.interface';
import { CommandService } from './command.service';
import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
export function provideActionHandlers(actionHandlers: Type<ActionHandler>[]): Provider[] {
return [CommandService, actionHandlers.map((handler) => ({ provide: FEATURE_ACTION_HANDLERS, useClass: handler, multi: true }))];
}
@NgModule({})
export class CoreCommandModule {
static forRoot(actionHandlers: Type<ActionHandler>[]): ModuleWithProviders<CoreCommandModule> {
return {
ngModule: CoreCommandModule,
providers: [CommandService, actionHandlers.map((handler) => ({ provide: ROOT_ACTION_HANDLERS, useClass: handler, multi: true }))],
};
}
static forChild(actionHandlers: Type<ActionHandler>[]): ModuleWithProviders<CoreCommandModule> {
return {
ngModule: CoreCommandModule,
providers: [CommandService, actionHandlers.map((handler) => ({ provide: FEATURE_ACTION_HANDLERS, useClass: handler, multi: true }))],
};
}
}

View File

@@ -0,0 +1,16 @@
// import { TestBed } from '@angular/core/testing';
// import { CommandService } from './command.service';
// describe('CommandService', () => {
// let service: CommandService;
// beforeEach(() => {
// TestBed.configureTestingModule({});
// service = TestBed.inject(CommandService);
// });
// it('should be created', () => {
// expect(service).toBeTruthy();
// });
// });

View File

@@ -0,0 +1,40 @@
import { Injectable, Injector, Optional, SkipSelf } from '@angular/core';
import { ActionHandler } from './action-handler.interface';
import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
@Injectable()
export class CommandService {
constructor(private injector: Injector, @Optional() @SkipSelf() private _parent: CommandService) {}
async handleCommand<T>(command: string, data?: T): Promise<T> {
const actions = this.getActions(command);
for (const action of actions) {
const handler = this.getActionHandler(action);
if (!handler) {
console.error('CommandService.handleCommand', 'Action Handler does not exist', { action });
throw new Error('Action Handler does not exist');
}
data = await handler.handler(data, this);
}
return data;
}
getActions(command: string) {
return command?.split('|') || [];
}
getActionHandler(action: string): ActionHandler | undefined {
const featureActionHandlers: ActionHandler[] = this.injector.get(FEATURE_ACTION_HANDLERS, []);
const rootActionHandlers: ActionHandler[] = this.injector.get(ROOT_ACTION_HANDLERS, []);
let handler = [...featureActionHandlers, ...rootActionHandlers].find((handler) => handler.action === action);
if (this._parent && !handler) {
handler = this._parent.getActionHandler(action);
}
return handler;
}
}

View File

@@ -0,0 +1,6 @@
// start:ng42.barrel
export * from './action-handler.interface';
export * from './command.module';
export * from './command.service';
export * from './tokens';
// end:ng42.barrel

View File

@@ -0,0 +1,6 @@
import { InjectionToken } from '@angular/core';
import { ActionHandler } from './action-handler.interface';
export const ROOT_ACTION_HANDLERS = new InjectionToken<ActionHandler[]>('@core/domain ROOT_ACTION_HANDLER');
export const FEATURE_ACTION_HANDLERS = new InjectionToken<ActionHandler[]>('@core/domain FEATURE_ACTION_HANDLER');

View File

@@ -0,0 +1,5 @@
/*
* Public API Surface of command
*/
export * from './lib';

View File

@@ -0,0 +1,7 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/core/config",
"lib": {
"entryFile": "src/public-api.ts"
}
}

View File

@@ -0,0 +1,8 @@
import { Observable } from 'rxjs';
/**
* Config loader interface for loading configurations
*/
export interface ConfigLoader {
load(): Promise<any>;
}

View File

@@ -0,0 +1,4 @@
// start:ng42.barrel
export * from './config-loader';
export * from './json.config-loader';
// end:ng42.barrel

Some files were not shown because too many files have changed in this diff Show More