Compare commits

...

761 Commits

Author SHA1 Message Date
Lorenz Hilpert
58b0fde3f8 Merge branch 'develop' into feature/4736-retoure 2024-10-18 14:43:29 +02:00
Lorenz Hilpert
301f5878c2 Refactor button class in pickup-shelf-out-details.component.html 2024-10-18 13:44:58 +02:00
Lorenz Hilpert
39c8a512f4 Merged PR 1814: #4827 Warenausgabe // Bei Workflow Rücklagebestellung mit Business Konto klic...
#4827 Warenausgabe // Bei Workflow Rücklagebestellung mit Business Konto klick auf "abgehollt und Lieferschein drucken" wirft Fehlermeldung
2024-10-17 12:01:43 +00:00
Lorenz Hilpert
f37dfd41f1 Merged PR 1813: Strukturanpassung
Related work items: #4832
2024-10-16 14:07:57 +00:00
Lorenz Hilpert
a518fc50e2 Refactor observables in DomainCatalogService 2024-10-15 13:05:53 +02:00
Lorenz Hilpert
c9236f191b Merged PR 1812: #4825 Refactor publicationDate$ observable in ArticleDetailsComponent
#4825 Refactor publicationDate$ observable in ArticleDetailsComponent
2024-10-14 14:40:51 +00:00
Lorenz Hilpert
d1584d1edb Merged PR 1811: #3693 ISA Übergreifend // Suche Abbrechen
#3693 ISA Übergreifend // Suche Abbrechen

Related work items: #3693
2024-10-14 14:39:09 +00:00
Lorenz Hilpert
5f34b514ef Merged PR 1810: Changed the way observables restore the cache
Changed the way observables restore the cache

Related work items: #4824
2024-10-14 10:09:15 +00:00
Lorenz Hilpert
7a1ef06a4c Merged PR 1809: PDP-EVT-Datum-anpassen
Related work items: #4825
2024-10-11 08:14:12 +00:00
Lorenz Hilpert
acc2f7f664 Merged PR 1808: Bugfix Abruf Key aus IndexedDB
Bugfix Abruf Key aus IndexedDB

Related work items: #4824
2024-10-08 16:22:01 +00:00
Lorenz Hilpert
ad08e999a2 Merged PR 1807: #4825 Refactor article-details.component.ts to format and display the publica...
#4825 Refactor article-details.component.ts to format and display the publication date of an article

Related work items: #4825
2024-10-08 16:15:48 +00:00
Lorenz Hilpert
92d760b8b4 Merged PR 1806: Sortiment // Preisänderung // Lange Titel hat mit anderen Text Überschneidung
Related work items: #4801
2024-10-07 15:33:02 +00:00
Nino Righi
294be5dcb4 Merged PR 1804: #2573 Fix Validator
#2573 Fix Validator
2024-10-07 14:30:31 +00:00
Nino Righi
9a2c520ab4 Merged PR 1803: #4822 HSC Quick Fix #4687 HSC, WA, AHF Changes to View, Added Organisation Input Field
#4822 Quick Fix #4687 Changes to View, Added Organisation Input Field
2024-10-04 16:34:54 +00:00
Nino Righi
13d41a7a81 Merged PR 1802: #2573 Postal Code Validation only for Webshop, Webshop+Card and B2B | +Bugfix Determination of B2B Customer in Customer Edit Page
#2573 Postal Code Validation only for Webshop, Webshop+Card and B2B | +Bugfix Determination of B2B Customer in Customer Edit Page
2024-10-04 16:32:52 +00:00
Lorenz Hilpert
79b0a1324c #4816 User State // Local Storage und User State nach Vorgang schliessen prüfen 2024-10-02 11:32:56 +02:00
Lorenz Hilpert
0fd94273ce Merge branch 'indexeddb' into develop 2024-10-02 10:16:49 +02:00
Lorenz Hilpert
44abd4698e #4801 Sortiment // Preisänderung // Lange Titel hat mit anderen Text Überschneidung 2024-10-02 10:14:16 +02:00
Lorenz Hilpert
2b262cc8be #4821 PWA // Offline-Verhalten verbessern (Part 3) 2024-10-01 13:34:44 +02:00
Lorenz Hilpert
5775e444b8 Indexeddb Implementaion 2024-10-01 13:14:25 +02:00
Nino Righi
cdfe88c1cc Merged PR 1801: #4813 Fix Multiple EVT Items
#4813 Fix Multiple EVT Items
2024-09-26 15:53:17 +00:00
Nino Righi
c71d1f8886 Merged PR 1800: #4794 HSC List Update Fix after Action (SilentRefresh)
#4794 HSC List Update Fix after Action (SilentRefresh)
2024-09-26 15:39:40 +00:00
Nino Righi
a09eef038e Merged PR 1799: #2573 Bugfixing and Adjusted Error Message
#2573 Bugfixing and Adjusted Error Message
2024-09-26 15:08:05 +00:00
Nino Righi
f0a0189523 Merged PR 1797: #4813 #4710 Bugfix Preselection Purchase Options
#4813 #4710 Bugfix Preselection Purchase Options
2024-09-25 18:21:33 +00:00
Lorenz Hilpert
4d42c4ea45 Merged PR 1798: PDP // Preis von Hug.Dig anzeigt
PDP // Preis von Hug.Dig anzeigt

Related work items: #4812
2024-09-25 15:18:50 +00:00
Lorenz Hilpert
cad2926c45 Merged PR 1796: #4801 Sortiment // Preisänderung // Lange Titel hat mit anderen Text Überschn...
#4801 Sortiment // Preisänderung // Lange Titel hat mit anderen Text Überschneidung
2024-09-25 15:17:34 +00:00
Nino Righi
161d9c6fea Merged PR 1795: #4608 Customer Form Information Adjustments For Online and CustomerCard Users
#4608 Customer Form Information Adjustments For Online and CustomerCard Users
2024-09-25 11:07:46 +00:00
Nino Righi
1b33258728 Merged PR 1794: #2573 Added Zip Code Validator to Customer Page
#2573 Added Zip Code Validator to Customer Page
2024-09-24 18:00:15 +00:00
Nino Righi
73b6133306 Merged PR 1793: #4813 Show EVT Date if Item has Quantity and EVT exists and is After Todays Date
#4813 Show EVT Date if Item has Quantity and EVT exists and is After Todays Date
2024-09-24 17:56:49 +00:00
Nino Righi
eb6e93149e Merged PR 1792: #4610 Disable Option to Unselect Selected Customer Type
#4610 Disable Option to Unselect Selected Customer Type
2024-09-24 17:51:52 +00:00
Lorenz Hilpert
8723f7aa7e Merge tag '3.2' into develop
Finish Release 3.2 3.2
2024-09-24 16:47:21 +02:00
Lorenz Hilpert
03815586f7 Merge branch 'release/3.2' 2024-09-24 16:47:03 +02:00
Nino Righi
86a11ff07a Merged PR 1791: #4715 Disable option for Staff to Add new Billing Adresses and only show the...
#4715 Disable option for Staff to Add new Billing Adresses and only show the very first attached to their accounts
2024-09-24 14:25:48 +00:00
Nino Righi
41be8533dc Merged PR 1790: #4776 Suchbegriff in der Artikelsuche soll bei Klick auf Filter bestehen blei...
#4776 Suchbegriff in der Artikelsuche soll bei Klick auf Filter bestehen bleiben (Trefferliste)
2024-09-24 13:42:17 +00:00
Nino Righi
186afbc828 Merged PR 1789: #4687 WA, Abholfach, HSC - First and Lastname Update on Buyer just on Order
#4687 WA, Abholfach, HSC - First and Lastname Update on Buyer just on Order
2024-09-24 13:39:57 +00:00
Nino Righi
c3561339a9 Merged PR 1788: #4794 Adjusted Route Error Handling
#4794 Adjusted Route Error Handling
2024-09-24 13:01:43 +00:00
Nino Righi
5312073184 Merged PR 1787: #4710 Initially Select All Possible Items Inside Purchase Options Modal
#4710 Initially Select All Possible Items Inside Purchase Options Modal
2024-09-24 12:45:49 +00:00
Lorenz Hilpert
4dfe3bfa11 Merge tag 'KameraOffline' into develop
Kamera kann nur geöffnet werden wenn man Online ist. KameraOffline
2024-09-24 14:39:19 +02:00
Lorenz Hilpert
9b7a1b1c21 Merge branch 'hotfix/skip-open-camera-when-offline' 2024-09-24 14:39:11 +02:00
Lorenz Hilpert
a290d3b249 Kamera öffnet sich nur wenn man Online ist 2024-09-24 14:37:48 +02:00
Lorenz Hilpert
ad348af551 Merge branch 'master' into release/3.2 2024-09-17 10:56:13 +02:00
Lorenz Hilpert
f1bdba5d10 Merge tag 'online-offline-verhalten' into develop
Merge Online Offline Verhalten online-offline-verhalten
2024-09-16 16:46:38 +02:00
Lorenz Hilpert
c4134e7f99 Merge branch 'hotfix/online-offline-network' 2024-09-16 16:46:28 +02:00
Lorenz Hilpert
b7a16f5d30 IPad 6 Fehlermeldung word wrap 2024-09-16 14:39:00 +02:00
Lorenz Hilpert
4105709286 Added Styles instead of classes for word wrapping 2024-09-16 14:23:11 +02:00
Lorenz Hilpert
0c3b322fbd Ipad 4 Error Anzeige 2024-09-16 13:31:00 +02:00
Lorenz Hilpert
12096754c7 Set Max Screen Width Error 2024-09-16 12:28:25 +02:00
Lorenz Hilpert
453d921a99 Nachricht angepasst 2024-09-16 11:54:52 +02:00
Lorenz Hilpert
bad05fd098 Offline und Online Banner
Initialisierung Wartet auf Netzwerk
2024-09-13 17:30:08 +02:00
Lorenz Hilpert
363daf1e35 console.log entfernt 2024-09-13 16:08:21 +02:00
Lorenz Hilpert
e0cb0974cf Initialisierung gibt ein Feedback an den Benutzer aus. Feedback wenn Benutzer offline ist. 2024-09-13 16:05:54 +02:00
Lorenz Hilpert
c3d9274766 Merge branch 'hotfix/pwa-camera-dialog-size' 2024-09-13 11:03:04 +02:00
Lorenz Hilpert
bc16b841fb Kamera Overlay Größe
(cherry picked from commit d5dc4e053d)
2024-09-13 11:02:30 +02:00
Lorenz Hilpert
d5dc4e053d Kamera Overlay Größe 2024-09-12 18:03:07 +02:00
Lorenz Hilpert
3c6833988c Change Variables in pipeline Minor from 1 to 2 2024-09-04 17:58:00 +02:00
Lorenz Hilpert
28fb4ebb48 Merge tag '3.1' into develop 2024-09-04 17:56:06 +02:00
Lorenz Hilpert
2118bd996a Merge branch 'release/3.1' 2024-09-04 17:52:55 +02:00
Lorenz Hilpert
8a6448cc17 Merge branch 'develop' into release/3.1 2024-08-19 15:01:59 +02:00
Lorenz Hilpert
f2c7d57ad6 Fix Remi Filter 2024-08-16 14:17:11 +02:00
Lorenz Hilpert
9c9ddfaeec #4774 Remi // Wannennummer nur einmal am Tag benutzbar 2024-08-14 15:45:39 +02:00
Lorenz Hilpert
6eaa347de5 Merge branch 'master' into develop 2024-08-13 11:04:36 +02:00
Lorenz Hilpert
a16f355396 Merge branch 'hotfix/scandit-lizenz-erneuern' 2024-08-13 11:02:16 +02:00
Lorenz Hilpert
8b8db6e335 Update Scandit Lizenz 2024-08-12 13:39:32 +02:00
Lorenz Hilpert
06e248d615 Kundensuche abbrechen 2024-06-27 15:47:41 +02:00
Lorenz Hilpert
c68706b54f Merged PR 1786: #4760 Fehler bei Abholpreisberechnung in Filiale Darmstadt Ernst-Ludwig-Straße
#4760 Fehler bei Abholpreisberechnung in Filiale Darmstadt Ernst-Ludwig-Straße
2024-06-10 12:22:36 +00:00
Lorenz Hilpert
b271ce9711 Merged PR 1785: Angular 17 Update + Cleanup Packages 2024-06-06 13:31:02 +00:00
Nino Righi
94888213b1 Merged PR 1784: #4758 Loading Indicator if Date gets Patched on OrderItemSubset
#4758 Loading Indicator if Date gets Patched on OrderItemSubset
2024-06-05 17:04:41 +00:00
Nino Righi
1041d92486 Merged PR 1783: #4750 Code improvements, Check if Icon gets loaded
#4750 Code improvements, Check if Icon gets loaded
2024-06-04 16:02:53 +00:00
Nino Righi
43d8d220c9 Merged PR 1782: #4750 Check if Icon File exists
#4750 Check if Icon File exists
2024-05-28 16:03:15 +00:00
Nino Righi
e0993d9c46 Merged PR 1781: #4599 Fix Routing After Click on Continue Shopping CTA - On Tablet Size or Sm...
#4599 Fix Routing After Click on Continue Shopping CTA - On Tablet Size or Smaller
2024-05-28 15:57:54 +00:00
Nino Righi
82656d9b27 Merged PR 1780: #4314 Navigation on Product Cover Click
#4314 Navigation on Product Cover Click
2024-05-28 15:57:31 +00:00
Lorenz Hilpert
df36d0934d Merged PR 1779: #4752 Performance in der WA verbessert -> Details Seite
#4752 Performance in der WA verbessert -> Details Seite
2024-05-28 13:48:00 +00:00
Lorenz Hilpert
22b0c57fb0 Styling Produktinfo in Retoure Details angepasst 2024-05-17 20:34:50 +02:00
Lorenz Hilpert
e59ddaf6a6 Anpassung Label und Felder in Retoure Details 2024-05-15 17:09:24 +02:00
Lorenz Hilpert
a74b4ed791 Details Page um mehrere Felder erweitert
Select Logik erweitert
Templates für Date felder angelegt
2024-05-14 19:05:29 +02:00
Lorenz Hilpert
3017f341af Mengenauswahl Input Styling angepasst 2024-05-14 11:54:48 +02:00
Lorenz Hilpert
c75a6d87f9 Improved Quantity Selector 2024-05-14 11:46:33 +02:00
Lorenz Hilpert
b85b69f078 Artikelmenge wurde nicht korrekt angezeigt 2024-05-13 18:11:35 +02:00
Lorenz Hilpert
93c050f09a Aktuallisierung des Breadcrumbs wenn sie der Suchparameter ändert 2024-05-13 17:28:29 +02:00
Lorenz Hilpert
23b2a05d47 Loader für die Details-Page
 Loader für die Items in der List-Page
 Breadcrumb in der List und Details Page eingebunden
 Nachladen von Items wenn Ende des ScrollContainers erreicht wurde
 Mengenauswahl eingebunden
2024-05-13 17:05:20 +02:00
Lorenz Hilpert
bd746f9915 Retoure Styling und data-table komponente 2024-05-10 18:56:52 +02:00
Nino Righi
920b8eb8e3 Merged PR 1778: #4004 Changed Minimum Birth Date for Kubi Case
#4004 Changed Minimum Birth Date for Kubi Case
2024-05-06 12:00:58 +00:00
Lorenz Hilpert
91f70b0503 Removed race to catch fetch result 2024-05-03 15:39:45 +02:00
Nino Righi
4db28b1aa7 Merged PR 1777: Merge Develop -> Release/3.1
Merge Develop -> Release/3.1
2024-05-03 13:00:46 +00:00
Lorenz Hilpert
3237dff1bc Suche und Anzeige von Retouren 2024-05-03 14:42:10 +02:00
Nino Righi
3a9820aa54 Merged PR 1776: #4721 Removed unnecessary check for scrolling to item
#4721 Removed unnecessary check for scrolling to item
2024-05-02 19:21:52 +00:00
Nino Righi
30ad99332e Merged PR 1775: #3751 ProductGroup and ProductGroupDetails Update
#3751 ProductGroup and ProductGroupDetails Update
2024-04-22 13:31:20 +00:00
Lorenz Hilpert
4b48275910 Merged PR 1774: AHF Performance 2024-04-19 09:54:54 +00:00
Lorenz Hilpert
d3e3316459 Merge branch 'master' into develop 2024-04-17 16:25:02 +02:00
Nino Righi
4ef1bd4df6 Merged PR 1771: #4720 Hotfix Navigation Pickup Shelf Out
#4720 Hotfix Navigation Pickup Shelf Out
2024-04-17 14:21:30 +00:00
Nino Righi
0c2a23e5d2 Merged PR 1773: #3751 Reservation List Show Compartment and ProductGroup from InStock
#3751 Reservation List Show Compartment and ProductGroup from InStock
2024-04-17 08:46:32 +00:00
Nino Righi
36bd2c1eba Merged PR 1772: #4004 Kubi Check If Customer is 18 Years old
#4004 Kubi Check If Customer is 18 Years old
2024-04-15 12:34:14 +00:00
Nino Righi
a38d2eede6 Merged PR 1770: #4709 Removed Save Special Comment CTA on Checkout Cart Review
#4709 Removed Save Special Comment CTA on Checkout Cart Review
2024-04-12 10:37:43 +00:00
Lorenz Hilpert
ed7dc10246 Bump Version 2024-04-09 10:43:39 +02:00
Lorenz Hilpert
f5251d9069 Merge tag '3.0' into develop
3.0
2024-04-09 09:35:54 +02:00
Lorenz Hilpert
2bd21e168a Merge branch 'release/3.0' 2024-04-09 09:34:33 +02:00
Lorenz Hilpert
3661bf7580 Merge branch 'develop' into release/3.0 2024-04-03 11:59:12 +02:00
Lorenz Hilpert
9f2a6633f7 Anpasssung Selector Für E2E - Lieferadresse, Rechnugsadresse 2024-04-03 11:30:07 +02:00
Nino
3c4d0ea56c Merge branch 'release/3.0' into develop 2024-03-20 12:10:17 +01:00
Nino
56bb784c83 Added Classes and Data Attributes to package-inspection for e2e testing 2024-03-20 12:06:05 +01:00
Nino Righi
c687570b1f Merged PR 1769: #4712 Removed isShippingEnabled check from availabilities modal
#4712 Removed isShippingEnabled check from availabilities modal
2024-03-20 10:42:59 +00:00
Nino Righi
afe5d3468a Merged PR 1768: Merge Develop to Release 3.0
Merge Develop to Release 3.0
2024-03-15 10:21:12 +00:00
Nino Righi
65f43d22ee Merged PR 1767: #4706 AHF Fix History Navigation after Switching Tabs
#4706 AHF Fix History Navigation after Switching Tabs
2024-03-13 14:17:15 +00:00
Nino Righi
67203a8506 Merged PR 1766: #4696 Bugfix Cover Items
#4696 Bugfix Cover Items
2024-03-13 14:12:08 +00:00
Nino Righi
92e522dedf Merged PR 1765: #4696 PickupShelfIn Details Page Clear Previous Selected OrderItemSubsetId fr...
#4696 PickupShelfIn Details Page Clear Previous Selected OrderItemSubsetId from Store after Leaving Page to avoid side effects
2024-03-12 15:31:21 +00:00
Nino Righi
fb46d329dc Merged PR 1764: #4547 WE Updated Annotation Implementation
#4547 WE Updated Annotation Implementation
2024-03-12 14:43:00 +00:00
Lorenz Hilpert
64d0a9fdb9 Merged PR 1763: #4547 Wareneingang // Kontrolle der Service Packstücke
#4547 Wareneingang // Kontrolle der Service Packstücke
2024-03-11 14:51:46 +00:00
Nino Righi
8f47163627 Merged PR 1762: #4692 Hotfix Undefined Values in Route Url
#4692 Hotfix Undefined Values in Route Url
2024-03-07 14:33:36 +00:00
Nino Righi
49f2a44461 Merged PR 1761: #4691 Small Fixes Customer Create
#4691 Small Fixes Customer Create
2024-03-06 16:01:27 +00:00
Nino Righi
a209d59ea9 Merged PR 1760: #4532 Fallback Route if Url contains Undefined or Null values
#4532 Fallback Route if Url contains Undefined or Null values
2024-03-06 12:13:13 +00:00
Nino Righi
03124d8736 Merged PR 1759: #4688 Change PickUpShelf Navigation based on Area In or Out
#4688 Change PickUpShelf Navigation based on Area In or Out
2024-03-06 11:55:11 +00:00
Nino Righi
a3330263f8 Merged PR 1758: #4689 Pickup Shelf Out Update Quantity After FETCHED_PARTIAL in Result List
#4689 Pickup Shelf Out Update Quantity After FETCHED_PARTIAL in Result List
2024-03-04 16:45:50 +00:00
Nino Righi
89092a5f6e Merged PR 1757: #4690 PickupShelfOut Details Display FETCHED_PARTIAL Action Correctly
#4690 PickupShelfOut Details Display FETCHED_PARTIAL Action Correctly
2024-03-04 15:54:43 +00:00
Nino
42fa108bb6 Pickup Shelf Out Details with Supplier Id Filter 2024-03-01 10:43:32 +01:00
Nino
2692588357 Changed Checkout Summary Navigation To Pickup Shelf Out Filter to supplier id 16 2024-02-29 12:47:45 +01:00
Nino Righi
ec26b5f4c0 Merged PR 1756: #4684 Routing to Pickup Shelf Out Update
#4684 Routing to Pickup Shelf Out Update
2024-02-28 11:28:26 +00:00
Nino Righi
ff985bda64 Merged PR 1755: #4684 Checkout Summary link to pickup shelf out updated
#4684 Checkout Summary link to pickup shelf out updated
2024-02-27 13:18:41 +00:00
Nino Righi
ca255cb592 Merged PR 1754: #4615 Tracking Link Update Customer Orders
#4615 Tracking Link Update Customer Orders
2024-02-26 16:19:56 +00:00
Nino Righi
8df5052c76 Merged PR 1753: #4684 Fix Navigation from Checkout Summary to Pickup Shelf Out
#4684 Fix Navigation from Checkout Summary to Pickup Shelf Out
2024-02-26 13:29:48 +00:00
Nino Righi
c78ddb5c8c Merged PR 1752: #4615 Tracking Link Implementation Customer Orders
#4615 Tracking Link Implementation Customer Orders
2024-02-23 08:49:54 +00:00
Lorenz Hilpert
5d84b4a55a #4617 Drucken // Pop Up entfernen wenn Drucker bereits ausgewählt ist (Desktop) 2024-02-21 18:52:28 +01:00
Nino Righi
a6142a5d86 Merged PR 1751: #4617 Fix Always Show Modal on Ipad, Fixed Loading Spinner Bug after Modal Close
#4617 Fix Always Show Modal on Ipad, Fixed Loading Spinner Bug after Modal Close
2024-02-21 17:02:38 +00:00
Nino Righi
fdf50fe11e Merged PR 1748: #4676 Removed updateBreadcrumb Function to prevent adding the breadcrumb by c...
#4676 Removed updateBreadcrumb Function to prevent adding the breadcrumb by closing the process
2024-02-21 12:48:04 +00:00
Nino Righi
e8bf922a67 Merged PR 1750: #4617 Added ipad check, Added implementation to checkout summary and added lo...
#4617 Added ipad check, Added implementation to checkout summary and added loading spinner
2024-02-21 10:38:46 +00:00
Nino Righi
f202ff5291 Merged PR 1749: #4679 Fix Catalog Navigation Splitscreen if hits is 1, fixed minor scroll pos...
#4679 Fix Catalog Navigation Splitscreen if hits is 1, fixed minor scroll position bug
2024-02-20 14:08:46 +00:00
Nino Righi
0c25859b6b Merged PR 1746: #4665 Added new Icon and Implemented Shared Icon Badge component, check if promotionPoints > 0
#4665 Added new Icon and Implemented Shared Icon Badge component, check if promotionPoints > 0
2024-02-20 08:44:07 +00:00
Nino Righi
215cb89aff Merged PR 1747: #4675 Show Fetching Spinner even if data is in cache - for user feedback
#4675 Show Fetching Spinner even if data is in cache - for user feedback
2024-02-20 08:43:11 +00:00
Nino Righi
9256a79087 Merged PR 1745: #4665 Catalog Details RedemptionPoints Badge
#4665 Catalog Details RedemptionPoints Badge
2024-02-16 15:25:51 +00:00
Nino Righi
f1ff9c6c55 Merged PR 1744: #4659 PickupShelf, CustomerOrders - Changed Navigation if Action Command incl...
#4659 PickupShelf, CustomerOrders - Changed Navigation if Action Command includes BACKTOSTOCK
2024-02-16 15:25:03 +00:00
Nino Righi
3f05e57554 Merged PR 1743: #4619 Fix removed memorize decorator on canSetCustomer function
#4619 Fix removed memorize decorator on canSetCustomer function
2024-02-16 15:24:04 +00:00
Anastasiia Chetverykova
2062bf3bab Merged PR 1742: #4617 - Drucken-Pop-Up nicht anzeigen, wenn ein Default Drucker bereits ausge...
#4617 - Drucken-Pop-Up nicht anzeigen, wenn ein Default Drucker bereits ausgewählt ist
2024-02-16 15:23:36 +00:00
Nino Righi
2d71a567ff Merged PR 1740: #4634 Remission Filter Reset Filter
#4634 Remission Filter Reset Filter
2024-02-13 17:20:42 +00:00
Lorenz Hilpert
547e615522 #4664 AHF // Bearbeiten - "Abbrechen" führt zu leerer Seite 2024-02-13 17:33:34 +01:00
Lorenz Hilpert
5d904e9d88 Merged PR 1739: #4662 AHF // "vsl. Lieferdatum" ändern ändert Datum für alle Bestellposten
#4662 AHF // "vsl. Lieferdatum" ändern ändert Datum für alle Bestellposten
2024-02-13 15:34:38 +00:00
Lorenz Hilpert
b7ccde4d44 #4663 AHF // Bearbeiten - Mobilnummer eingeben -> kein Refresh 2024-02-13 15:35:26 +01:00
Lorenz Hilpert
b838f4c475 Merge branch 'develop' into release/3.0 2024-02-01 18:33:25 +01:00
Lorenz Hilpert
2bc97ee574 #4633 WK // nach klick auf "Ändern" ("Name, Vorname" oder Adressen) im Warenkorb -> Suche nicht korrekt 2024-01-31 19:29:21 +01:00
Lorenz Hilpert
f054614cfe clearUserState() ist immer zugänglich. 2024-01-31 10:58:00 +01:00
Lorenz Hilpert
0aa1cddf72 Merge branch 'release/3.0' into develop 2024-01-29 17:37:07 +01:00
Lorenz Hilpert
d39521b9f2 Merge branch 'develop' into release/3.0 2024-01-29 17:36:25 +01:00
Lorenz Hilpert
f5468d7f8e #4624 #4623 Fallback wenn keine Versandoption für den Kundentypen vorhanden ist 2024-01-29 16:01:42 +01:00
Lorenz Hilpert
4ad99270bd #4622 AHF // Filter schließt sich nicht 2024-01-29 15:49:45 +01:00
Lorenz Hilpert
4e098ae962 #4620 Suche nach EAN wirft Fehlermeldung 2024-01-29 14:25:08 +01:00
Lorenz Hilpert
8e00e646fb #4621 Preis von Preisgebundenen Artikel wird nach Kundenauswahl nicht richtig übernommen 2024-01-29 14:19:31 +01:00
Lorenz Hilpert
4fad5a7c2f Merge branch 'develop' into release/3.0 2024-01-26 15:39:53 +01:00
Lorenz Hilpert
5ece030ec8 #2062 Fachbodenbeschriftung 2024-01-25 19:56:33 +01:00
Lorenz Hilpert
54d7c525a9 Null Check PriceMaintained und fallback für delivery kaufoptionen 2024-01-24 14:48:51 +01:00
Lorenz Hilpert
41d4dc4663 #4611 Preisunterschiede im Warenkorb 2024-01-24 13:48:52 +01:00
Lorenz Hilpert
c266c51572 #4611 Deadcode entfernt 2024-01-24 11:09:59 +01:00
Lorenz Hilpert
4ea50f68d1 #4611 Preisunterschiede im Warenkorb 2024-01-24 11:09:02 +01:00
Lorenz Hilpert
e5d61c8622 #Preis // Preisunterschiede im Warenkorb 2024-01-23 17:44:28 +01:00
Lorenz Hilpert
d06c64c08a #4613 IPad 6 Breite angepasst - wegen overflow-x 2024-01-22 10:11:12 +01:00
Lorenz Hilpert
91ebc3e27f #2062 text-right hinzugefügt 2024-01-19 16:19:08 +01:00
Lorenz Hilpert
d643c19642 Merged PR 1737: #4611 Preisunterschiede im Warenkorb
#4611 Preisunterschiede im Warenkorb
2024-01-19 13:57:36 +00:00
Nino Righi
afd1f5e302 Merged PR 1736: #2527 Improved Code, fixed navigation error when adding a new item
#2527 Improved Code, fixed navigation error when adding a new item
2024-01-19 13:09:11 +00:00
Lorenz Hilpert
4099aa0a57 #2062 #4613 Remi Liste Anpassungen 2024-01-19 13:51:49 +01:00
Nino Righi
ebe11b75d1 Merged PR 1735: #2527 Navigation Improvements Dummy Modal
#2527 Navigation Improvements Dummy Modal
2024-01-18 15:06:49 +00:00
Lorenz Hilpert
81f7270cf7 #4611 Preisunterschiede im Warenkorb 2024-01-18 15:50:46 +01:00
Nino Righi
570a8800a0 Merged PR 1734: #4010 Removed Cheaper Price Tooltip From Purchasing Options Modal
#4010 Removed Cheaper Price Tooltip From Purchasing Options Modal
2024-01-18 12:47:31 +00:00
Lorenz Hilpert
25aecffafc Merge branch 'release/3.0' into develop 2024-01-17 17:31:21 +01:00
Lorenz Hilpert
7c48c63584 Merge branch 'develop' into release/3.0 2024-01-17 17:30:50 +01:00
Nino Righi
5bf32b2e72 Merged PR 1733: #4603 Select no default gender
#4603 Select no default gender
2024-01-17 16:12:31 +00:00
Lorenz Hilpert
f44fbe3fdb #4598 ngIf angepasst Kundendetails 2024-01-17 13:21:07 +01:00
Lorenz Hilpert
5df075f448 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2024-01-17 13:18:52 +01:00
Lorenz Hilpert
9cee33e286 #4598 Firma soll angezeigt werden wenn eingetragn 2024-01-17 13:18:33 +01:00
Nino Righi
42bf7e4120 Merged PR 1731: #4601 WA, AHF Navigation Dropdown Fix
#4601 WA, AHF Navigation Dropdown Fix
2024-01-17 12:15:25 +00:00
Nino Righi
77ff7ca1a8 Merged PR 1732: #4603 Changed Genders Order
#4603 Changed Genders Order
2024-01-17 12:14:59 +00:00
Lorenz Hilpert
7f195ee627 Merged PR 1730: #4598 Kundendetails // "Geb.-tags"-Feld wird nicht angezeigt, "USt-ID" und "A...
#4598 Kundendetails // "Geb.-tags"-Feld wird nicht angezeigt, "USt-ID" und "Abteilung" dafür immer
2024-01-16 15:12:53 +00:00
Nino Righi
79bec55818 Merged PR 1729: #4600 Fix Product Images Height
#4600 Fix Product Images Height
2024-01-16 14:05:48 +00:00
Nino Righi
35093afaff Merged PR 1728: #4597 Only Print Order Confirmation If Not On Tablet
#4597 Only Print Order Confirmation If Not On Tablet
2024-01-15 16:07:13 +00:00
Nino Righi
358ba3963c Merged PR 1727: #3462 Fix Checkout Review Details Display Name Section if Customer has no shi...
#3462 Fix Checkout Review Details Display Name Section if Customer has no shipping or billing addresses but orderType is shipping
2024-01-15 16:06:49 +00:00
Anastasiia Chetverykova
d47e617f8c Merged PR 1726: #4419 - Pop Up - Wording Änderung
#4419 - Pop Up - Wording Änderung

Related work items: #4419
2024-01-15 12:38:18 +00:00
Nino Righi
55bd001146 Merged PR 1725: #4597 Fix Print Order Confirmation Immediately
#4597 Fix Print Order Confirmation Immediately
2024-01-12 19:50:00 +00:00
Lorenz Hilpert
a9f11426a7 Merge branch 'develop' into release/3.0 2024-01-11 18:47:50 +01:00
Nino Righi
10b86756d2 Merged PR 1724: #4564 Fix customer page empty details view
#4564 Fix customer page empty details view
2024-01-11 16:19:24 +00:00
Lorenz Hilpert
262dd084c1 Merged PR 1723: #4571 - Kundendaten erfassen // Bei Kundenkarten Formular mit Onlinekonto feh...
#4571 - Kundendaten erfassen // Bei Kundenkarten Formular mit Onlinekonto fehlt die Aufklärung über die Konditionen
2024-01-11 10:27:02 +00:00
Nino Righi
abc58c8a78 Merged PR 1722: #4569 Fix Pickup Shelf display searchboxHint correctly
#4569 Fix Pickup Shelf display searchboxHint correctly
2024-01-10 15:39:08 +00:00
Nino Righi
866cd23e41 Merged PR 1721: #4564 Always keep customer updated and check name properties correctly
#4564 Always keep customer updated and check name properties correctly
2024-01-09 19:12:45 +00:00
Lorenz Hilpert
fdcf12c022 Element naming - Vorgangs-ID 2024-01-09 13:54:31 +01:00
Nino Righi
432f1161af Merged PR 1720: #4553 Always take retailPrice from instock request for take away availability
#4553 Always take retailPrice from instock request for take away availability
2024-01-08 12:59:14 +00:00
Nino Righi
82dbce5744 Merged PR 1713: #4291 Gender Refactoring
#4291 Gender Refactoring
2024-01-08 11:46:24 +00:00
Nino
a4b9f5fcf1 Merge branch 'develop' into release/3.0 2024-01-05 14:17:29 +01:00
Nino Righi
7ea9359c30 Merged PR 1719: #4514 Added regex pattern to compartmentCode field inside goods in out order...
#4514 Added regex pattern to compartmentCode field inside goods in out order edit page
2024-01-05 12:09:43 +00:00
Nino Righi
b9a4b0d315 Merged PR 1718: #4552 Added whitespace
#4552 Added whitespace
2024-01-05 09:19:08 +00:00
Anastasiia Chetverykova
7809e7a2b5 Merged PR 1717: #4552 - Packstückprüfung Anzahl Exemplare
#4552 - Packstückprüfung Anzahl Exemplare
2024-01-04 13:35:57 +00:00
Nino Righi
9a8c74b148 Merged PR 1716: #4534 Goods In Out Order Edit Always Show Price with Two Decimal Places
#4534 Goods In Out Order Edit Always Show Price with Two Decimal Places
2024-01-04 10:36:37 +00:00
Nino Righi
ad62e67771 Merged PR 1715: #4525 Improved Scroll Position Handling in Goods In List and Remission Previe...
#4525 Improved Scroll Position Handling in Goods In List and Remission Preview Page
2024-01-04 09:23:28 +00:00
Nino Righi
6feb8079b7 Merged PR 1714: #4550 Fix Multiple Processes Bug
#4550 Fix Multiple Processes Bug
2024-01-04 08:23:31 +00:00
Nino
7f8f48f393 Updated tsconfig 2024-01-03 11:54:03 +01:00
Nino
0fe0c5242d Merge branch 'release/3.0' into develop 2024-01-03 11:52:25 +01:00
Nino
d208bdaf97 Added Package Inspection Class Name in Details Page for Page Objects Targetting 2024-01-02 15:08:19 +01:00
Nino Righi
dc80df4ad4 Merged PR 1712: #4524 Page Article Search Improved Order by Filter Handling
#4524 Page Article Search Improved Order by Filter Handling
2023-12-29 16:12:53 +00:00
Nino Righi
3020609682 Merged PR 1711: #4545 #4548 Fix HSC Breadcrumb and Multiple Processes bug
#4545 #4548 Fix HSC Breadcrumb and Multiple Processes bug
2023-12-29 15:22:26 +00:00
Nino Righi
5c3e1ed2ad Merged PR 1710: #4544 Fix Proveded Store correctly, removed take from filter and cancleSearch...
#4544 Fix Proveded Store correctly, removed take from filter and cancleSearchRequests on process change
2023-12-29 15:12:51 +00:00
Nino Righi
e832feebc5 Merged PR 1709: #4545 Fix Missing Main Breadcrumb
#4545 Fix Missing Main Breadcrumb
2023-12-28 15:10:44 +00:00
Nino Righi
08580d782d Merged PR 1708: #4546 HSC Customer Orders Fixed Navigation Link Active Styling
#4546 HSC Customer Orders Fixed Navigation Link Active Styling
2023-12-28 15:01:40 +00:00
Nino Righi
2d07556341 Merged PR 1707: #4533 Fixed Breadcrumb and Searchbox after Scan
#4533 Fixed Breadcrumb and Searchbox after Scan
2023-12-28 12:23:48 +00:00
Nino Righi
9ad1256019 Merged PR 1706: #4543 Styling Fix Checkout Review for multiple Destinations per OrderType
#4543 Styling Fix Checkout Review for multiple Destinations per OrderType
2023-12-27 16:00:23 +00:00
Nino Righi
250002f057 Merged PR 1705: #4516 Fix Also Show Details Items Group in Pick Up Shelf In
#4516 Fix Also Show Details Items Group in Pick Up Shelf In
2023-12-27 15:59:11 +00:00
Nino Righi
0973b01bf0 Merged PR 1704: #4539 Fix Skip Location Change Filter
#4539 Fix Skip Location Change Filter
2023-12-27 14:39:15 +00:00
Nino Righi
d5254cc150 Merged PR 1703: #4541 Added Errorhandling to Customer Search Store
#4541 Added Errorhandling to Customer Search Store
2023-12-27 08:09:29 +00:00
Nino Righi
adc5a5a280 Merged PR 1702: #4516 WA Implementation of orderType Groups
#4516 WA Implementation of orderType Groups
2023-12-22 16:13:52 +00:00
Nino Righi
2ff033ea55 Merged PR 1701: #4539 Hotfix AHF Open Filter Page does not trigger search request
#4539 Hotfix AHF Open Filter Page does not trigger search request
2023-12-21 17:23:08 +00:00
Nino Righi
cbaac8ed9a Merged PR 1700: #4537 Relocated Component Store provision
#4537 Relocated Component Store provision
2023-12-21 17:19:35 +00:00
Lorenz Hilpert
f0b653fd0f Merged PR 1699: #4533 Breadcrumb wird falsch dargestellt
#4533 Breadcrumb wird falsch dargestellt
2023-12-20 16:17:39 +00:00
Lorenz Hilpert
14eba6e5ea Merged PR 1698: #4485 Kundendaten werden übernommen wenn welche vorhanden sind
#4485 Kundendaten werden übernommen wenn welche vorhanden sind
2023-12-20 14:55:04 +00:00
Lorenz Hilpert
803a8e316c Skip UnitTest for some libs 2023-12-19 17:33:19 +01:00
Nino Righi
83cab7796e Merged PR 1697: #4530 Notification Batch Messages for each type
#4530 Notification Batch Messages for each type

(cherry picked from commit 5073693fc2)
2023-12-19 17:14:37 +01:00
Nino Righi
c70dd30830 Merged PR 1695: #4523 AHF, WA Added other notification types to Email Notification Badge
#4523 AHF, WA Added other notification types to Email Notification Badge

(cherry picked from commit f3cb6236a5)
2023-12-19 17:14:03 +01:00
Lorenz Hilpert
b28bb165d4 Merged PR 1696: #4532 Mitarbeiter klickt auf Einbuchen und erreicht den Tätigkeitskalender
#4532 Mitarbeiter klickt auf Einbuchen und erreicht den Tätigkeitskalender
2023-12-19 13:35:58 +00:00
Nino Righi
5073693fc2 Merged PR 1697: #4530 Notification Batch Messages for each type
#4530 Notification Batch Messages for each type
2023-12-19 13:34:22 +00:00
Nino Righi
f3cb6236a5 Merged PR 1695: #4523 AHF, WA Added other notification types to Email Notification Badge
#4523 AHF, WA Added other notification types to Email Notification Badge
2023-12-15 16:03:34 +00:00
Lorenz Hilpert
4ab9890313 #4485 #4500 Kundenkartenkonto anlage Verhalten and Suche angeglichen 2023-12-15 14:34:24 +01:00
Nino Righi
32d8d81f53 Merged PR 1694: #4526 Hotfix Pickup Shelf Edit show Erneut Senden CTA
#4526 Hotfix Pickup Shelf Edit show Erneut Senden CTA
2023-12-15 10:12:51 +00:00
Nino
0361aa63ff Merge Develop into Release/3.0, corrected itemSize in page catalog list 2023-12-12 16:52:03 +01:00
Nino
2f95c23910 Merge branch 'develop' into release/3.0 2023-12-12 16:35:35 +01:00
Nino Righi
a8cd6ce844 Merged PR 1693: #4522 Pickup Shelf List Added margin-bottom as gap between item groups, remov...
#4522 Pickup Shelf List Added margin-bottom as gap between item groups, removed unused code
2023-12-12 14:18:07 +00:00
Lorenz Hilpert
3bba23cc76 Merged PR 1692: #4380 Abholung als Standard wenn möglich und keine Auswahl getroffen wurde
#4380 Abholung als Standard wenn möglich und keine Auswahl getroffen wurde
2023-12-12 12:43:13 +00:00
Nino Righi
e25f176a7b Merged PR 1691: #4521 Fix Check Page Catalog List if List got already fetched completely
#4521 Fix Check Page Catalog List if List got already fetched completely
2023-12-12 09:39:22 +00:00
Nino Righi
a169d2a4e9 Merged PR 1690: #4518 Fix Pickup Shelf In List additionally Fetch Items after queryParams change
#4518 Fix Pickup Shelf In List additionally Fetch Items after queryParams change
2023-12-11 15:55:32 +00:00
Nino Righi
6a9caa432e Merged PR 1689: #4519 #4520 Page Catalog Search Breadcrumb and Navigation fixes
#4519 #4520 Page Catalog Search Breadcrumb and Navigation fixes
2023-12-11 09:23:35 +00:00
Nino Righi
389948c077 Merged PR 1688: #4510 Fix Time Format in Customer Details
#4510 Fix Time Format in Customer Details
2023-12-08 09:30:29 +00:00
Nino Righi
e7724ed8b9 Merged PR 1687: #4509 Implemented Loading Spinner on Pickup Shelf Details Pages
#4509 Implemented Loading Spinner on Pickup Shelf Details Pages
2023-12-07 10:03:39 +00:00
Nino Righi
c7f1b27fdf Merged PR 1686: #4508 Pickup Shelf In Clear Cover Items after Routing to new Details page
#4508 Pickup Shelf In Clear Cover Items after Routing to new Details page
2023-12-06 15:18:55 +00:00
Lorenz Hilpert
135f0255b8 IPad2 PDP Styling 2023-12-06 16:18:06 +01:00
Nino Righi
65a7aa569d Merged PR 1685: Scroll Position Fix After Process Change
Scroll Position Fix After Process Change
2023-12-05 18:14:32 +00:00
Nino Righi
211eaa6175 Merged PR 1684: Page Catalog Result List - Removed maxBufferSize, Updated ScrollPosition Handling
Page Catalog Result List - Removed maxBufferSize, Updated ScrollPosition Handling
2023-12-05 16:59:23 +00:00
Lorenz Hilpert
8097c6ad9e Merge branch 'performance' into develop 2023-12-05 10:48:17 +01:00
Lorenz Hilpert
b0d76b01d7 Merge branch 'release/3.0' into develop 2023-12-05 10:47:34 +01:00
Lorenz Hilpert
626fd0081f Merge branch 'develop' into release/3.0 2023-12-05 10:47:00 +01:00
Lorenz Hilpert
362fca74bc Warenausgbae list IPad 2 2023-12-04 16:29:14 +01:00
Lorenz Hilpert
b8f0a29f79 IPad 2 Scrolling 2023-12-04 16:22:39 +01:00
Lorenz Hilpert
f54400f00d Merge branch 'develop' into performance 2023-12-04 14:23:30 +01:00
Lorenz Hilpert
54094695b1 #4505 RD // Einbuchen - Bearbeiten Seite wird mal in Split Screen Ansicht mal ohne angezeigt 2023-12-04 13:27:43 +01:00
Nino Righi
1e3e9588da Merged PR 1683: #4501 #4502 Fixed by reverting Changes from #4490
#4501 #4502 Fixed by reverting Changes from #4490
2023-12-04 11:43:07 +00:00
Nino
f04705b659 Merge branch 'release/3.0' into develop 2023-12-01 17:04:02 +01:00
Nino
c22672fad0 Fixed Styling and Layout Issues 2023-12-01 13:07:59 +01:00
Nino
59673a47db Tablet size fix, Navigate After SearchCompleted on Page Catalog and Page Customer Orders 2023-11-30 18:24:32 +01:00
Nino
e56ea0bd4e MaxBufferSize Update Result List Page Catalog 2023-11-30 18:15:58 +01:00
Nino Righi
f8c4d4a842 Merged PR 1682: #4416 RD Checkout, WA, WE, Notifications Component Changes
#4416 RD Checkout, WA, WE, Notifications Component Changes
2023-11-30 16:06:37 +00:00
Lorenz Hilpert
c4dd9214a3 Splitscreen side outlet rendern nur wenn nötig 2023-11-30 16:55:08 +01:00
Nino Righi
4d74b3a89e Merged PR 1679: #4491 Mark Shelf Children Sides Active based on view param
#4491 Mark Shelf Children Sides Active based on view param
2023-11-29 15:31:35 +00:00
Nino Righi
b0b3fd40ce Merged PR 1681: #4490 Improvement added Filter parameter orderitemprocessingstatus on details...
#4490 Improvement added Filter parameter orderitemprocessingstatus on details page request
2023-11-29 15:04:58 +00:00
Lorenz Hilpert
3404c930c5 #4485 - anlage von Kundenkartenkonto - Datenübernahme 2023-11-29 16:04:18 +01:00
Nino Righi
abcd940ed3 Merged PR 1678: #4493 Fix Breadcrumb Navigation if comming from other List
#4493 Fix Breadcrumb Navigation if comming from other List
2023-11-29 10:45:51 +00:00
Nino Righi
c1756942b2 Merged PR 1680: #4492 Added Navigation based On View after certain Actions
#4492 Added Navigation based On View after certain Actions
2023-11-29 10:45:14 +00:00
Lorenz Hilpert
ea4d036066 Merge branch 'develop' into release/3.0 2023-11-24 09:51:21 +01:00
Lorenz Hilpert
101a34bd3f #4484 RD // Online Konto anlegen via "Kundensuche | Keine Suchergebnisse" wirft Fehlermeldung 2023-11-23 18:06:49 +01:00
Lorenz Hilpert
99bad149cb attribute für e2e tests 2023-11-23 13:57:55 +01:00
Lorenz Hilpert
a0bff7164c #4481 RD // Warenkorb - Klick auf "Speichern" bei Benachrichtigung "Email" oder "SMS" enabled "Bestellen"-Button nicht 2023-11-22 15:30:07 +01:00
Lorenz Hilpert
0c4a4130b9 #4488 RD // TK - Artikel-Link führt auf Dashboard 2023-11-21 15:58:38 +01:00
Lorenz Hilpert
8dd1211729 #4487 RD // Abholfach - ändern des vsl. Lieferdatums und "zurückgelegt bis"-Datum wirft Fehler 2023-11-21 10:42:14 +01:00
Lorenz Hilpert
a2f1b8b624 #4478 RD // Abholfach - Routing löst Suche aus 2023-11-20 14:22:32 +01:00
Lorenz Hilpert
98a331ffe5 #4482 RD // Abholfach - Split-Screen raus bei "Bearbeiten" + ""Historie" 2023-11-20 13:38:11 +01:00
Lorenz Hilpert
c0f97c9bae Add doNotTrack option to article search 2023-11-10 18:52:23 +01:00
Lorenz Hilpert
960ffa165f Merge branch 'develop' into release/3.0 2023-11-10 18:33:13 +01:00
Lorenz Hilpert
6bdfbe2eff Refactor breadcrumb filtering in side menu
component
2023-11-10 18:32:56 +01:00
Lorenz Hilpert
80342e61ac #4470 Updated icon names in icons.json 2023-11-10 16:31:27 +01:00
Lorenz Hilpert
6bf3894e4d Add data attributes to pickup shelf list item
component HTML
2023-11-10 15:07:11 +01:00
Lorenz Hilpert
aab29838bf #4470 Add new customer order types to icons and label
colors
2023-11-10 14:35:38 +01:00
Lorenz Hilpert
856ca5651e #4475 Refactor remission-list.component.html button
styles
2023-11-10 14:31:57 +01:00
Lorenz Hilpert
a7d4b8d7fb #4273 Refactor navigation logic in search results and
product card components
2023-11-10 14:09:01 +01:00
Lorenz Hilpert
62d260473c #4474 Refactor clearFilter method to use main_qs from
filter query params
2023-11-09 11:50:02 +01:00
Lorenz Hilpert
bde52a2526 Merge branch 'release/3.0' into develop 2023-11-09 11:39:41 +01:00
Lorenz Hilpert
6243b03cfc #4466 Revert changes to fix display issue in
PickupShelfDetailsBaseComponent
2023-11-08 16:39:03 +01:00
Lorenz Hilpert
d24841800e #4468 Refactor setSelectedOrderItemQuantity to use
updater
2023-11-08 13:39:31 +01:00
Nino Righi
f60628c769 Merged PR 1677: #4467 Fix Display Price even if Price is 0
#4467 Fix Display Price even if Price is 0
2023-11-08 11:55:55 +00:00
Nino Righi
034f697da5 Merged PR 1676: #4462 Added focusSearchbox additionally on side nav click
#4462 Added focusSearchbox additionally on side nav click
2023-11-08 11:55:13 +00:00
Lorenz Hilpert
ec9f80767b Merge branch 'release/3.0' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/3.0 2023-11-08 11:05:32 +01:00
Lorenz Hilpert
a5e569cf05 #4451 #4463 Add name method to PickupShelfInService and
PickupShelfOutService
2023-11-08 11:04:58 +01:00
Nino Righi
b62259f9b4 Merged PR 1675: #4457 Fix Filter Routing on Close
#4457 Fix Filter Routing on Close
2023-11-08 09:42:24 +00:00
Nino Righi
95baeaa8a8 Merged PR 1674: #4462 Cursor Should Select Searchbox on Initial Navigation
#4462 Cursor Should Select Searchbox on Initial Navigation
2023-11-07 16:49:56 +00:00
Nino Righi
a5b9115a91 Merged PR 1673: #4459 Fix Reorder Modal handling after Closing Modal without changes
#4459 Fix Reorder Modal handling after Closing Modal without changes
2023-11-07 16:03:23 +00:00
Lorenz Hilpert
1885c58d86 #4464 Add setSelectedOrderItemQuantity method to update
selected order item quantity
2023-11-07 17:01:57 +01:00
Lorenz Hilpert
add55a47d6 Merge branches 'release/3.0' and 'release/3.0' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/3.0 2023-11-07 16:29:37 +01:00
Lorenz Hilpert
129f49a9ee #4461 Add sharedRegexRouterLinkActive directive to
side-menu component
2023-11-07 16:29:18 +01:00
Nino Righi
9560eb7ad6 Merged PR 1671: #4458 Fixed Process Naming
#4458 Fixed Process Naming
2023-11-07 15:09:18 +00:00
Nino Righi
772ba29a8e Merged PR 1672: #4457 Fixed routing after Filter close
#4457 Fixed routing after Filter close
2023-11-07 15:08:31 +00:00
Nino Righi
8ac8f6cc1f Merged PR 1670: #4459 Removed Side Outlet after REORDER completed
#4459 Removed Side Outlet after REORDER completed
2023-11-07 12:23:46 +00:00
Lorenz Hilpert
a0f496475c #4453 Add customerInfoDTO to createCustomerRoute 2023-11-06 15:21:36 +01:00
Lorenz Hilpert
8979a388ee #4454 Fix button placement and remove unnecessary
sorting in main actions selector
2023-11-06 14:27:08 +01:00
Lorenz Hilpert
8b9a209c49 #4450 Add RunCheckTrigger to
PickupShelfInDetailsComponent and
PickupShelfOutDetailsComponent
2023-11-06 14:07:27 +01:00
Lorenz Hilpert
f4c3e3ceee #4452 Reset selected compartment info in
PickupShelfDetailsBaseComponent
2023-11-06 13:55:40 +01:00
Lorenz Hilpert
5ca8a83f25 Merge branch 'release/3.0' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into release/3.0 2023-11-03 15:19:10 +01:00
Lorenz Hilpert
006011885f #4448 Add "Create new customer" link to search views 2023-11-03 15:18:50 +01:00
Nino Righi
9c9e061f6d Merged PR 1669: #4431 Adjusted Process Tab Logic for Customer Order Area
#4431 Adjusted Process Tab Logic for Customer Order Area
2023-11-03 09:13:10 +00:00
Lorenz Hilpert
c9782a7d29 Merge branch 'develop' into release/3.0 2023-10-30 09:42:49 +01:00
Nino Righi
59de82def8 Merged PR 1668: #4425 HSC Customer Orders Result List Refactor - Cache, Breadcrumb, Branch Dr...
#4425 HSC Customer Orders Result List Refactor - Cache, Breadcrumb, Branch Dropdown, Process and Scroll Position Fixes
2023-10-27 14:57:05 +00:00
Lorenz Hilpert
dc2617bb5d #4429 Refactor orderItems update in
PickupShelfDetailsStore
2023-10-27 15:14:28 +02:00
Lorenz Hilpert
d80e621563 #4424 Add filter functionality to
getOrderItemsByOrderNumberOrCompartmentCode method
2023-10-27 14:56:44 +02:00
Lorenz Hilpert
63c02e4605 #4424 Add orderItemSubsetId to order item details. 2023-10-27 11:57:42 +02:00
Lorenz Hilpert
3f93fe0869 #4423 Add download availability to shopping cart item 2023-10-27 10:51:44 +02:00
Lorenz Hilpert
9011f76e95 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-10-27 10:26:05 +02:00
Lorenz Hilpert
dd88e4ad3e Fix breadcrumb filter in side menu component 2023-10-27 10:25:48 +02:00
Nino Righi
a0869aa4a5 Merged PR 1667: #4421 Reset Filter When Navigate from Article Recommendations
#4421 Reset Filter When Navigate from Article Recommendations
2023-10-26 14:54:05 +00:00
Nino Righi
1107264d7c Merged PR 1665: #4417 Abholfach Listen Routing Breadcrumb
#4417 Abholfach Listen Routing Breadcrumb
2023-10-26 14:31:28 +00:00
Nino Righi
31512546d3 Merged PR 1666: #4420 Fix Customer Area Billing Addresses Added Margin
#4420 Fix Customer Area Billing Addresses Added Margin
2023-10-26 14:31:04 +00:00
Lorenz Hilpert
183e7b6945 Add orderItemSubsetId to
PickupShelfDetailsBaseComponent and remove
unnecessary RxJS operators
2023-10-26 16:28:42 +02:00
Nino
fba465d573 Merge branch 'develop' into release/3.0 2023-10-25 16:17:18 +02:00
Lorenz Hilpert
dd6784e3b3 #4396 Archive pickup shelf services 2023-10-25 15:01:07 +02:00
Lorenz Hilpert
9caa0fc0fa Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-10-25 13:44:03 +02:00
Lorenz Hilpert
1102fb4608 #4396 Add all_branches filter to PickupShelfInService
and PickupShelfOutService
2023-10-25 13:43:46 +02:00
Nino Righi
012cc6ac67 Merged PR 1664: #4411 Fix Routing after Applying Filter
#4411 Fix Routing after Applying Filter
2023-10-25 11:23:43 +00:00
Lorenz Hilpert
72de7efc1d #4410 Refactor checkout-summary.component.html layout 2023-10-25 12:34:13 +02:00
Lorenz Hilpert
b8c7bbec88 Revert "Merged PR 1659: #4396 Fix RD getOrderItems on Details page now with correct filter settings"
This reverts commit 9def487ab8.
2023-10-25 11:25:18 +02:00
Lorenz Hilpert
608513b6dc Merged PR 1662: #4405 Fix navigation and error handling in pickup shelf
Bitte noch nicht freigeben. Möchte im daily noch was klären

#4405 Fix navigation and error handling in pickup shelf
components
2023-10-25 09:21:10 +00:00
Nino Righi
fa78eca087 Merged PR 1663: #4408 Fix Side Nav Dropdown gets opened if route is Active
#4408 Fix Side Nav Dropdown gets opened if route is Active
2023-10-24 18:52:31 +00:00
Lorenz Hilpert
77fda0f939 #1989 Add message modal component for customer details
view.
2023-10-24 20:30:56 +02:00
Lorenz Hilpert
81d210a77b #4407 Refactor getLastActivatedCustomerProcessId$() to
filter processes by type 'cart' and handle
undefined lastCustomerProcess
2023-10-24 16:21:01 +02:00
Lorenz Hilpert
5ab4456040 Merge branch 'develop' into release/3.0 2023-10-24 14:21:59 +02:00
Nino Righi
2db45c900a Merged PR 1661: #4406 No Large increase of Global Font Size possible if on screen size tablet
#4406 No Large increase of Global Font Size possible if on screen size tablet
2023-10-24 11:55:13 +00:00
Nino Righi
705dc23908 Merged PR 1660: #4256 Fix HSC Kundenbestellungen Filter and Search History handling
#4256 Fix HSC Kundenbestellungen Filter and Search History handling
2023-10-24 08:22:26 +00:00
Nino Righi
9def487ab8 Merged PR 1659: #4396 Fix RD getOrderItems on Details page now with correct filter settings
#4396 Fix RD getOrderItems on Details page now with correct filter settings
2023-10-23 16:30:16 +00:00
Lorenz Hilpert
50e08f115a #4392 iPad - WA - langer Titel schiebt sich unter Status 2023-10-23 16:15:29 +02:00
Nino Righi
b15693a914 Merged PR 1657: #4403 Fix Abholfach Einbuchen Code Structure
#4403 Fix Abholfach Einbuchen Code Structure
2023-10-23 12:25:38 +00:00
Nino Righi
cbf23b6f30 Merged PR 1658: #4401 Fix Article Search Results Breadcrumb updates now correctly and fixed N...
#4401 Fix Article Search Results Breadcrumb updates now correctly and fixed Navigation after Applying Filter on all screen sizes
2023-10-23 12:25:08 +00:00
Nino
fc45efb4af Merge branch 'develop' into release/3.0 2023-10-20 16:25:57 +02:00
Nino
b4fbcd6d16 Remission Filter Button Styling, Filter Overlay Max Width Changed 2023-10-20 16:23:39 +02:00
Nino
c54e5c27ae #4396 Removed Filter All Branches on Pickup Shelf Result List Request 2023-10-20 15:52:49 +02:00
Nino
4b80765b26 Merge branch 'develop' into feature/4340-RD-Shell-Nav-Menue-Expand-Dropdown 2023-10-20 15:45:43 +02:00
Nino
d223e064c2 #4397 Fix RD Abholfach Zubuchen mit Zusatz 2023-10-20 15:43:49 +02:00
Nino
1f8d6c5898 #4340 Fix Open Dropdown on Init Side-Menu Component 2023-10-19 15:22:25 +02:00
Nino
66555e9c7e Merge branch 'develop' into feature/4340-RD-Shell-Nav-Menue-Expand-Dropdown 2023-10-19 14:58:25 +02:00
Nino
bb81b8f826 Merge branch 'develop' into release/3.0 2023-10-19 13:26:35 +02:00
Nino Righi
ecb5a77fdd Merged PR 1651: #4389 RD Added Pickup Shelf List In Item Loader and trackByGroupFn
#4389 RD Added Pickup Shelf List In Item Loader and trackByGroupFn
2023-10-19 11:24:58 +00:00
Nino Righi
6652c2f97e Merged PR 1650: #4391 Assign new CompartmentCode if action differs from "book in", otherwise...
#4391 Assign new CompartmentCode if action differs from "book in", otherwise use latestCompartmentCode
2023-10-19 08:51:22 +00:00
Nino Righi
e9f16f72cb Merged PR 1649: #4340 Expand Dropdown on Click if menu is on assigned Section
#4340 Expand Dropdown on Click if menu is on assigned Section
2023-10-19 08:19:28 +00:00
Nino Righi
a687b1771f Merged PR 1648: #4358 Improved implementation by using order$ as observable
#4358 Improved implementation by using order$ as observable
2023-10-19 08:18:56 +00:00
Nino
ec79e315e5 #4340 Expand Dropdown on Click if menu is on assigned Section 2023-10-18 15:52:41 +02:00
Nino Righi
af10e66b1a Merged PR 1647: #4310 Show Button always centered
#4310 Show Button always centered
2023-10-18 09:08:17 +00:00
Lorenz Hilpert
2d8a0f514d #4372 RD/ Scanbutton fehlt in Kundensuche 2023-10-18 11:07:06 +02:00
Lorenz Hilpert
02ade0a377 Skandit SDK Lizenz Update 2023-10-18 10:58:17 +02:00
Nino Righi
c2943037d9 Merged PR 1646: #4390 Customer Area, removed navigation cards
#4390 Customer Area, removed navigation cards
2023-10-17 16:10:18 +00:00
Nino Righi
c30d8fa5fd Merged PR 1645: #4374 #4358 Change EstimatedShippingDate, preferredPickUpDate and pickUpDeadl...
#4374 #4358 Change EstimatedShippingDate, preferredPickUpDate and pickUpDeadline on Shelf In and Out fixed
2023-10-17 14:49:50 +00:00
Nino Righi
4fd10bc8a4 Merged PR 1644: #4364 Check if Order is Kulturpass Order if no customer is available
#4364 Check if Order is Kulturpass Order if no customer is available
2023-10-17 13:46:23 +00:00
Lorenz Hilpert
1d25fec9ff #3025 RD // HSC+ Filiale- Automatische Bestellbestätigung per Mail 2023-10-17 15:41:49 +02:00
Nino Righi
6f77527d59 Merged PR 1643: #4382 Changed Layout inside Purchase Options Modal
#4382 Changed Layout inside Purchase Options Modal
2023-10-16 16:21:38 +00:00
Nino Righi
7a2cd5cef8 Merged PR 1642: #4360 Autocomplete Provider Implementation
#4360 Autocomplete Provider Implementation
2023-10-16 16:20:59 +00:00
Lorenz Hilpert
d1de4d96d8 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-10-16 18:20:45 +02:00
Lorenz Hilpert
dd1652c3a6 Logs entfernt 2023-10-16 18:20:30 +02:00
Lorenz Hilpert
66fd2eed81 #4355 Lieferadresse bearbeiten nicht möglich 2023-10-16 18:20:13 +02:00
Nino Righi
f5d90f97e8 Merged PR 1641: #4370 Only show compartment code if available, never display orderNumber
#4370 Only show compartment code if available, never display orderNumber
2023-10-16 15:39:46 +00:00
Nino Righi
ade3800568 Merged PR 1640: #4348 #4366 Multiple Bugfixes Shelf Edit with changing CompartmentInfo or CompartmentCode
#4348 #4366 Multiple Bugfixes Shelf Edit with changing CompartmentInfo or CompartmentCode
2023-10-16 15:38:48 +00:00
Lorenz Hilpert
486e2e5a28 Fix Build Error 2023-10-16 15:53:22 +02:00
Lorenz Hilpert
86d3b4e3f5 Merge branch 'develop' into release/3.0 2023-10-16 15:51:20 +02:00
Nino Righi
4d669731fb Merged PR 1639: #4376 Styling Fix
#4376 Styling Fix
2023-10-16 13:05:11 +00:00
Nino Righi
5bc81f7048 Merged PR 1638: #4368 Fix Navigation On Filter Close
#4368 Fix Navigation On Filter Close
2023-10-16 13:04:03 +00:00
Nino Righi
6cf6dec001 Merged PR 1636: #4370 Fix dont show compartment or orderNumber if item has processingStatus 1...
#4370 Fix dont show compartment or orderNumber if item has processingStatus 16 or 8192
2023-10-16 13:03:37 +00:00
Nino Righi
526d82752c Merged PR 1637: #4367 Fix Navigation to Shelf Out from Checkout Summary
#4367 Fix Navigation to Shelf Out from Checkout Summary
2023-10-16 07:48:06 +00:00
Nino Righi
7565b2bb54 Merged PR 1635: #4373 Changed Wording and Color of preferredPickUpDate in Checkout Summary
#4373 Changed Wording and Color of preferredPickUpDate in Checkout Summary
2023-10-16 07:45:28 +00:00
Nino Righi
692a32f4d7 Merged PR 1634: #4362 Scroll Position Handling, Bugfix between multiple open Shelf Out processes
#4362 Scroll Position Handling, Bugfix between multiple open Shelf Out processes
2023-10-16 07:44:55 +00:00
Lorenz Hilpert
4039ffdf20 #4365 Weitere Navigationen umgebaut 2023-10-12 16:25:09 +02:00
Lorenz Hilpert
cb39b3b79b #4365 RD // Abholfach - Alte Bestellpostensuche Seite ist erreichbar 2023-10-12 16:18:21 +02:00
Lorenz Hilpert
fe3dfd00ab #4354 Kundendaten erfassen // Rechnungs und Lieferadresse als Standard Adresse festlegen 2023-10-12 16:02:16 +02:00
Nino Righi
08a4b5a2ca Merged PR 1633: #4349 Unselect Items after handle action, update actions on list item
#4349 Unselect Items after handle action, update actions on list item
2023-10-12 13:23:12 +00:00
Lorenz Hilpert
e8a036b6df #4357 Warenausgabe - Trefferliste nachladen unendlich 2023-10-11 17:26:43 +02:00
Lorenz Hilpert
ff698ec6b2 #4345 Warenausgabe - Mehrere Artikel mit verschiedene Status werden zusammen gebunden 2023-10-11 16:40:41 +02:00
Lorenz Hilpert
8644ea515b Merge branch 'feature/splitscreen-pickup-shelf-design' into develop 2023-10-10 14:25:52 +02:00
Lorenz Hilpert
10a77c25e9 Zubuchen im Wareneingang Fix 2023-10-10 14:23:08 +02:00
Lorenz Hilpert
25d3adc28c Bugfix Navigation and Process Creation 2023-10-10 14:03:47 +02:00
Lorenz Hilpert
5cdbbb995f Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-10 12:05:20 +02:00
Lorenz Hilpert
01a26ef57a Console Logs removed 2023-10-10 12:05:06 +02:00
Lorenz Hilpert
3b337ea127 Cleanup Cache 2023-10-10 12:04:40 +02:00
Nino
c66ef5ba91 Trefferlisten Small Desktop Breakpoint, Eingebaut in Artikelsuche, Kundensuche, Warenausgabe, Einbuchen 2023-10-10 11:53:27 +02:00
Nino
b2edcf8a20 #4347 Fix Navigation on Edit Page from Shelf In and Out 2023-10-09 17:41:00 +02:00
Nino
06af33e37e Added compartmentInfo to every compartmentCode navigation 2023-10-09 17:14:26 +02:00
Nino
1a217d0870 Open New Process if navgation on customer area triggers 2023-10-09 16:01:31 +02:00
Nino
d6c52baf53 Navigation and Styling to Edit Pages 2023-10-09 15:15:23 +02:00
Lorenz Hilpert
f923fdefa4 #4344 Warenausgabe - Statusänderung via Bestellposten Details Seite wird nur nach Seiten Refresh angezeigt 2023-10-09 14:18:55 +02:00
Lorenz Hilpert
bd674a0e14 #4338 Warenausgabe - "Bearbeiten" bringt Fehler 2023-10-09 13:34:34 +02:00
Nino
bd3f8af924 Process Id Fix 2023-10-06 17:57:36 +02:00
Nino
5e720876ac Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-06 17:43:25 +02:00
Nino
8543db465b Cover Anzeige und Cover navigation 2023-10-06 17:43:06 +02:00
Lorenz Hilpert
ec4951d8dd #4343 Warenausgabe - Öffnen Bestellposten mit Abholfach-Zusatz navigiert zu leere Seite 2023-10-06 15:02:49 +02:00
Lorenz Hilpert
17f1846c69 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-06 14:15:54 +02:00
Lorenz Hilpert
6b71a544fe renamed selected into displayed for displaying items and added compartment info 2023-10-06 14:15:38 +02:00
Nino
7f1f097179 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-06 14:13:20 +02:00
Nino
a7003b84bf Removed Extends Base Component from Shelf In List 2023-10-06 14:12:59 +02:00
Nino
8a84e69ce3 Fix Pickup Shelf Details In 2023-10-06 14:10:57 +02:00
Lorenz Hilpert
3ebd50a8c1 #4341 Warenausgabe - Kacheln in Trefferliste sind rechts abgeschnitten 2023-10-06 13:43:08 +02:00
Nino
1f7a952c91 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-06 11:25:36 +02:00
Nino
560ef57915 Abholfach Details Selected Item and Filter Back Navigation to Details 2023-10-06 11:21:09 +02:00
Lorenz Hilpert
4fb81526ae Split Screen classes fuer e2e tests 2023-10-06 11:13:11 +02:00
Lorenz Hilpert
4bee8117ee #4342 Warenausgabe - Bearbeiten Seite beinhaltet komische Text 2023-10-06 10:25:01 +02:00
Nino
66991684d2 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-05 17:48:43 +02:00
Nino
06abcbff51 Update Pickup Shelf In Details 2023-10-05 17:48:19 +02:00
Nino
17197461f7 Update Domain Service Shelf In 2023-10-05 17:47:25 +02:00
Lorenz Hilpert
f036190019 Build Error Fix 2023-10-05 17:41:33 +02:00
Lorenz Hilpert
e68975b0f7 Load Cover Items - Implemented In Details Store 2023-10-05 17:26:12 +02:00
Lorenz Hilpert
692c1cb596 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-05 17:16:31 +02:00
Lorenz Hilpert
7ace3b7685 #4338 Warenausgabe - "Bearbeiten" bringt Fehler 2023-10-05 17:16:10 +02:00
Nino
6d6077c54f Added Cover Page and Updated Navigation Routes (added OrderItemSubsetId) 2023-10-05 17:14:23 +02:00
Nino
b60913de3c Shelf In Navigation Update on Shared Components 2023-10-05 15:27:07 +02:00
Nino
357b89f1ea Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-05 15:14:37 +02:00
Nino
c37b05d4b8 Pickup Shelf In List Select Items, Routing and Actions Update 2023-10-05 15:14:21 +02:00
Lorenz Hilpert
94fe011d49 #4337 Warenaugabe - Abholfachnummer wird lanksbündig angezeigt 2023-10-05 14:16:40 +02:00
Lorenz Hilpert
0e458e81d8 #4336 Warenausgabe - automatisches nachladen durch Scrollen 2023-10-05 14:12:15 +02:00
Lorenz Hilpert
efbdb134a9 Cleanup 2023-10-05 11:43:20 +02:00
Lorenz Hilpert
a97d87ed7b #4335 Fehler bei Öffnung einer Bestellung mit Status "eingetroffen" 2023-10-05 11:40:47 +02:00
Lorenz Hilpert
cb56cfcb00 #4332 Upgrade Bestellung ohne Konto" leitet zum Dashboard weiter 2023-10-05 10:58:36 +02:00
Nino
d13cf0ef8d Init PickUpShelfIn page, Navigation and SubPages 2023-10-04 18:06:28 +02:00
Nino
e6afd6887a Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-04 15:29:10 +02:00
Nino
7378b7db53 Removed many unnecessary history endpoint requests 2023-10-04 15:28:53 +02:00
Lorenz Hilpert
70f9bb0f73 Skip fetch while another request is being executed 2023-10-04 15:13:57 +02:00
Lorenz Hilpert
2fa7451716 Notification in Details laden und Fix Request lists 2023-10-04 14:29:03 +02:00
Lorenz Hilpert
871aeaed1f Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-04 13:20:42 +02:00
Lorenz Hilpert
09f0337489 Fetching OrderItemSubsetTasks 2023-10-04 13:19:26 +02:00
Nino
51f36de7dd Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-10-04 12:46:33 +02:00
Nino
0999e1ea51 Fetch Partial Bugfix, Breadcrumb Fix, Details Store Selectors Refactor 2023-10-04 12:45:52 +02:00
Lorenz Hilpert
d079b276cf Attribute für e2e 2023-10-04 10:42:48 +02:00
Nino
e1bd87418c Aufrufe geupdated, bugfixing 2023-10-02 18:10:53 +02:00
Nino
d06af28e11 Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-10-02 17:11:06 +02:00
Nino
c123a29b1d Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-10-02 17:08:01 +02:00
Nino
1398a3bdee Added more/less functionality and Added Nav Menu to Customer Area, Small Styling Adjustments 2023-10-02 17:07:43 +02:00
Lorenz Hilpert
340e866aed Funktion zum updaten der OrderItemSubsets 2023-10-02 16:26:24 +02:00
Nino
9338162906 Added Navigation After Actions on Detail Page 2023-10-02 16:03:50 +02:00
Nino
23d61bfa60 Navigation to History and Edit page, Implementation of Edit page, Centered Edit Page Action Buttons 2023-10-02 14:57:55 +02:00
Lorenz Hilpert
7409053cef #4330 Kundendaten // Upgrade Versandbestellung (oder gemischt)-Kundendatensatz wirft Fehler 2023-09-29 17:54:32 +02:00
Nino
0c372b0245 Updated Store and Base component implementation, Fixed Tags Component (also in Customer-Orders), Added new function declarations to implement, Added History and Edit Breadcrumb management 2023-09-29 16:58:16 +02:00
Lorenz Hilpert
dd68405522 #4331 Bestellung // Button "Bestellen" ist erst lange ausgegraut (wird aber nach eine Zeit klickbar) 2023-09-29 16:55:08 +02:00
Lorenz Hilpert
69e792ae41 Merge tag '4323-WBS-Fehlende-Wannenummer' into develop
4323-WBS-Fehlende-Wannenummer
2023-09-29 16:15:57 +02:00
Lorenz Hilpert
8b6ebd1820 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-09-29 11:08:16 +02:00
Lorenz Hilpert
45cb411e17 #4329 HSC - OLA im Warenkorb 2023-09-29 11:07:54 +02:00
Nino Righi
dec66de61d Merged PR 1632: #4322 Fix Checkout Summary If an Order has no items, dont display that Order
#4322 Fix Checkout Summary If an Order has no items, dont display that Order
2023-09-29 08:54:08 +00:00
Nino
e9a490d7f3 Details Page Completed Store hookup 2023-09-28 17:19:42 +02:00
Nino
280b28a474 Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-09-28 10:16:41 +02:00
Lorenz Hilpert
cfba5f34d4 #4317 AddressSelectionModalComponent - warning entfernt 2023-09-27 18:37:52 +02:00
Nino
582e2d988c Pickup Shelf Out Details Page 2023-09-27 18:16:44 +02:00
Lorenz Hilpert
4c627986d1 #4185 OLA im Warenkorb - spinner ersetzt 2023-09-27 18:01:01 +02:00
Nino
299dab43b9 Init Pickup Shelf Out Details Page and startet Header Implementation 2023-09-26 17:30:28 +02:00
Nino
ce0823a6fd Pickup Shelf Out List Actions Implementation 2023-09-26 17:02:30 +02:00
Nino
e0963e9b65 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-09-25 20:45:37 +02:00
Nino
a88552f975 List Styling Completed 2023-09-25 20:44:16 +02:00
Lorenz Hilpert
66a7bab287 Action Handler Impl 2023-09-25 19:04:37 +02:00
Lorenz Hilpert
088d9e1b6f Group Pipe von UiCommon in eigene Lib ausgelagert 2023-09-25 11:40:43 +02:00
Lorenz Hilpert
29619b2fec Paging Abholfach Store Fix 2023-09-22 17:05:52 +02:00
Nino
a5effc89a7 Merge branch 'feature/splitscreen-pickup-shelf-design' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into feature/splitscreen-pickup-shelf-design 2023-09-22 16:19:25 +02:00
Nino
e7fe2a2676 Update Result List Splitscreen 2023-09-22 16:17:33 +02:00
Lorenz Hilpert
53bb01db2d Fix Process Change 2023-09-22 15:05:59 +02:00
Nino
003d0cbcb2 Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-09-22 10:49:31 +02:00
Nino
a71c627a30 Pickup Shelf List Init 2023-09-22 10:45:15 +02:00
Lorenz Hilpert
261c851514 Caching und State Änderungen für Ausgewählte Items 2023-09-21 17:08:51 +02:00
Nino
58cfcba738 Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-09-21 16:39:25 +02:00
Nino Righi
50dac899c9 Merged PR 1631: #4304 Page Article Search Fixed Routing Bug After Searching Article with EAN...
#4304 Page Article Search Fixed Routing Bug After Searching Article with EAN inside Filter Page with Small Desktop Screen Size
2023-09-21 08:11:23 +00:00
Nino
9fe25f0f73 Added Loading Spinner and Searchbox Hint Message To Search Main and Filter View 2023-09-20 18:09:47 +02:00
Nino
678c961ea9 Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-09-20 17:32:39 +02:00
Lorenz Hilpert
f6b4633ac4 #4303 Kundensuche - kein Splittscreen 2023-09-20 14:45:53 +02:00
Lorenz Hilpert
0ecd2916a2 Caching Abholfach Liste 2023-09-20 14:29:57 +02:00
Lorenz Hilpert
e786b60bfc #4303 Kundensuche - kein Splittscreen 2023-09-20 10:29:31 +02:00
Nino
8c079e9064 Splitscreen Search Main Design 2023-09-19 17:51:32 +02:00
Nino
3b08fe438b Merge branch 'develop' into feature/splitscreen-pickup-shelf-design 2023-09-19 15:55:57 +02:00
Nino
fedbdcc35c Init Splitscreen Routing 2023-09-19 15:30:55 +02:00
Lorenz Hilpert
ac656ddc04 Breadcrumb fue abholfach 2023-09-19 15:23:28 +02:00
Nino
e6d389d848 Added Main Side View Component 2023-09-19 10:58:05 +02:00
Lorenz Hilpert
664053f231 Store for Detail Pages 2023-09-19 09:52:35 +02:00
Nino Righi
18b2230dd7 Merged PR 1629: #4301 RD Design Adjustments
#4301 RD Design Adjustments
2023-09-18 14:05:28 +00:00
Lorenz Hilpert
0876ed3acc Added Directive Shared Scroll Container 2023-09-18 15:48:33 +02:00
Lorenz Hilpert
7b4edbee8b Html Tag Fuer PickupShelfFilter Fix 2023-09-18 15:35:22 +02:00
Lorenz Hilpert
05ef1edfeb Wording Fix WE WA 2023-09-18 15:34:06 +02:00
Lorenz Hilpert
fb8db78bbd Breadcrumb Fix 2023-09-18 15:06:36 +02:00
Lorenz Hilpert
aecc4a477f Fix delayWhenFilterIsNotReady 2023-09-18 14:56:22 +02:00
Lorenz Hilpert
fd63ce8b3c Abholfach Infrastruktur - WE und WA 2023-09-18 14:23:16 +02:00
Nino Righi
b421c8b08c Merged PR 1627: #4298 Removed Add New Process Menu for Tablet
#4298 Removed Add New Process Menu for Tablet
2023-09-14 15:22:30 +00:00
Nino
4304286f48 Fix Show Filter Page on Tablet if Navigation To Filter Triggered from Result Page (Article Search and Customer Orders) 2023-09-14 16:23:50 +02:00
Lorenz Hilpert
1d1221e8c5 Navigation Fix Customer Guard ohne Prozess Id 2023-09-14 10:55:53 +02:00
Lorenz Hilpert
e2a6eac0a2 #4258 Abstände Breadcrumb 2023-09-13 18:43:30 +02:00
Lorenz Hilpert
4e54baf9fb Fix Customer Navigation 2023-09-13 18:38:35 +02:00
Lorenz Hilpert
7593e420de #4258 Abstände 2 2023-09-13 18:17:56 +02:00
Lorenz Hilpert
84ca80a1c9 #4258 Abstände 1 2023-09-13 18:17:43 +02:00
Lorenz Hilpert
7265f4d4ce Shell Navigation Kunden 2023-09-13 16:29:47 +02:00
Lorenz Hilpert
fca1eacc6e Bugfix Navigation Kunden und Prozesserstellung 2023-09-13 16:26:25 +02:00
Lorenz Hilpert
384c32dd1f Merge branch 'split-screen-demo' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into split-screen-demo 2023-09-13 13:22:40 +02:00
Lorenz Hilpert
983d075d5a Umbau Kundenbereich Split Screen 2023-09-13 13:21:53 +02:00
Nino
29ce32f3fe Shared Splitscreen Customer Orders Implementation 2023-09-12 17:48:27 +02:00
Nino
d9e67ec9be Shared Split Screen Checkout Implementation 2023-09-12 15:07:10 +02:00
Nino
a1e7ee2997 Routing Fix on Tablet 2023-09-11 18:20:19 +02:00
Nino
653ed1c1b2 Display Article Search Main and Filter correctly on Tablet 2023-09-11 18:12:20 +02:00
Nino
d7a3641fed Ean Search Bugfix 2023-09-11 16:53:43 +02:00
Nino
71cd95587d Finetuning, corrected naming and fixed breadcrumb bug 2023-09-11 14:53:37 +02:00
Nino
4ca12ba5c7 Merge branch 'develop' into split-screen-demo 2023-09-11 11:51:00 +02:00
Nino
bb189abe01 Side Outlet Clear directly after Navigation 2023-09-11 11:31:29 +02:00
Nino
f4e6d14a9c Product Search Routing Refactor, new Split Screen Router Logic, Clear Side Outlet 2023-09-08 16:31:30 +02:00
Nino Righi
a7f0522d57 Merged PR 1625: #4255 Fixed Publication Date Range Filter issues
#4255 Fixed Publication Date Range Filter issues
2023-09-06 16:09:59 +00:00
Nino Righi
cf38eef3b8 Merged PR 1624: #4272 Menu Items Alignment and Display Icons Correctly if Creating New Process in Tablet View
#4272 Menu Items Alignment and Display Icons Correctly if Creating New Process in Tablet View
2023-09-06 15:42:58 +00:00
Nino
104179a2e6 Created Shared Split Screen Component 2023-09-06 15:27:42 +02:00
Nino
4e2be8e397 Shell Top Bar and Shell Process Bar improved class naming for e2e page objects 2023-09-05 12:15:45 +02:00
Nino Righi
732b5a7fb1 Merged PR 1623: #4278 Fix Customer Order Removed Double Search Request and keep queryParams i...
#4278 Fix Customer Order Removed Double Search Request and keep queryParams in sync with filter settings
2023-09-04 16:29:45 +00:00
Nino Righi
0441401d9f Merged PR 1622: #4205 Article Search Details Search for Row Correctly and Split Links if ther...
#4205 Article Search Details Search for Row Correctly and Split Links if there is more than 1
2023-09-04 14:47:06 +00:00
Lorenz Hilpert
564afb7e32 Merged PR 1621: #4272 Menü zeigt Bestellungen, Kundenkarte und Details an
#4272 Menü zeigt Bestellungen, Kundenkarte und Details an
2023-09-04 13:17:47 +00:00
Nino Righi
5167ba21a6 Merged PR 1620: #4262 Fix HSC Selection Of Branch Dropdown Does Not Clear Main Searchbox Anymore
#4262 Fix HSC Selection Of Branch Dropdown Does Not Clear Main Searchbox Anymore
2023-09-01 14:44:40 +00:00
Lorenz Hilpert
b2319e8ea6 Split Screen Demo 2023-09-01 11:51:14 +02:00
Lorenz Hilpert
f8a2166967 #3968-Preisgebunden-Fix 2023-09-01 10:29:29 +02:00
Lorenz Hilpert
6a70d149db Merge branch 'feature/3968-Artikeldetails-Mehrwertsteuer-2' into develop 2023-08-31 14:31:50 +02:00
Lorenz Hilpert
306f5ed7f9 Merge devlop 2023-08-31 14:29:42 +02:00
Lorenz Hilpert
6a5d478e62 #4268 #4264 Warenkorb OLA 2023-08-30 17:51:01 +02:00
Lorenz Hilpert
b440ddbe82 Merge branch 'hotfix/4270-4269-Archiv-Artikel'
(cherry picked from commit f4df6e8799)
2023-08-30 14:38:54 +02:00
Lorenz Hilpert
6b8051f9df Merge tag '4270-4269-Archiv-Artikel' into develop
Merge Hotfix 4270-4269-Archiv-Artikel
2023-08-30 10:43:47 +02:00
Nino Righi
a8535d5f3e Merged PR 1618: #4191 Removed First Item Activation on Autocomplete if only 1 Item is selectable
#4191 Removed First Item Activation on Autocomplete if only 1 Item is selectable
2023-08-28 15:06:45 +00:00
Nino
878bf44d0b #3968 Article Search Details display vat and if priceMaintained true 2023-08-28 16:51:52 +02:00
Lorenz Hilpert
d6e0d92132 (cherry picked from commit d09b5b1ce7) 2023-08-24 20:18:19 +02:00
Lorenz Hilpert
da6489eb7a Merge tag '4266-Archivartikel' into develop
Hotfix 4266 Archivartikel Preisauswahl
2023-08-24 20:06:36 +02:00
Lorenz Hilpert
cc03ef4f9c #4264 Fix Ola Refresh Calls 2023-08-24 12:58:53 +02:00
Lorenz Hilpert
b4dbd8889d Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-08-24 12:12:50 +02:00
Lorenz Hilpert
483faad86a #4264 - Bestellen-Button ausgegraut 2023-08-24 11:57:47 +02:00
Michael Auer
0dbc745ed0 Merge tag '2.3' into develop
# Conflicts:
#	apps/isa-app/src/app/shell/shell.component.html
2023-08-24 11:56:11 +02:00
Lorenz Hilpert
5c6f416391 #4263 Versand - Fehler vor Kundensuche 2023-08-23 14:56:57 +02:00
Lorenz Hilpert
d97b6afac8 #4205 Reihensuche 2023-08-23 14:31:55 +02:00
Lorenz Hilpert
771816f3af #4185 OLA Warenkorb - 500 Fix 2023-08-22 13:47:22 +02:00
Lorenz Hilpert
0626538aea #4261 Fehler bei Artikel aus Liste in Warenkorb - Weiter Button War Nicht Aktiv 2023-08-21 15:33:35 +02:00
Lorenz Hilpert
a1ad4e4a05 #4261 Fehler bei Artikel aus Liste in Warenkorb 2023-08-21 15:12:22 +02:00
Lorenz Hilpert
6df48eb555 #4255 Neue Filteroption - Erscheinungsdatum 2023-08-21 14:18:40 +02:00
Lorenz Hilpert
27ab4526e2 Logs entfernt und kleinere Änderungen rückgängig gemacht 2023-08-18 12:48:09 +02:00
Lorenz Hilpert
9a24b34fbc #4255 Verbesserung des Datumsinputs 2023-08-18 12:45:27 +02:00
Lorenz Hilpert
d01e01534b #4185 Bugfix - Bestellabschluss 2023-08-17 17:01:33 +02:00
Lorenz Hilpert
5bca1f2a81 Bugfix - zu viele aurufe bei ola 2023-08-16 15:26:08 +02:00
Lorenz Hilpert
807b300885 #4185 OLA im Warenkorb 2023-08-16 14:54:14 +02:00
Lorenz Hilpert
b16ffa4352 Merge branch 'develop' into release/3.0 2023-08-11 15:34:45 +02:00
Lorenz Hilpert
da79d04ef4 Bugfix Erscheinungsdatum 2023-08-11 15:34:09 +02:00
Lorenz Hilpert
cf619df576 Merge branch 'release/3.0' into develop 2023-08-11 10:29:47 +02:00
Lorenz Hilpert
8054c96315 #3376 Erscheinungstermin Filter Option Mit Input Box 2023-08-11 10:28:14 +02:00
Nino Righi
2363f424f5 Merged PR 1617: #3360 Show Branch Tooltip
#3360 Show Branch Tooltip
2023-08-11 08:11:16 +00:00
Lorenz Hilpert
6ab1ea2e70 #4254 Bestellungen ohne Konto werden nicht als Kunde erkannt 2023-08-10 14:03:18 +02:00
Lorenz Hilpert
c9ce7d6762 #4253 Kundensuche - Typo 2023-08-09 17:53:58 +02:00
Lorenz Hilpert
6ee1b0a7f8 #4250 Vorgänge zählen nicht hoch 2023-08-09 16:50:54 +02:00
Lorenz Hilpert
d881920312 Merge branch 'develop' into release/3.0 2023-08-07 07:07:36 +02:00
Lorenz Hilpert
516465db37 #4246 UI Searchbox Hint Erneut anzeigen
(cherry picked from commit 9671683a93)
2023-08-06 05:11:40 +02:00
Lorenz Hilpert
08e95cec55 #4245 Wannernummer-Prüfung - Leerzeichen entfernen
(cherry picked from commit 15c50779b4)
2023-08-06 05:10:46 +02:00
Lorenz Hilpert
1d865c47d7 #4236 Kulturpass - Artikel ohne Preisbindung erhalten günstigeren Preis 2023-08-03 13:57:09 +02:00
Nino
7afd476ac7 Workaround Outlet Navigation 2023-08-02 18:01:58 +02:00
Lorenz Hilpert
37b1e42c64 Angular update 16 - cleanup - customer 2023-08-02 12:14:47 +02:00
Lorenz Hilpert
2bddc3c621 Angular update 16 2023-08-01 18:18:02 +02:00
Nino Righi
6b0beba1d9 Merged PR 1616: #3378 SSC Sync PDP and Search Result List
#3378 SSC Sync PDP and Search Result List
2023-08-01 16:16:57 +00:00
Lorenz Hilpert
33904e9d26 Update Angular Packages 2023-08-01 16:18:04 +02:00
Lorenz Hilpert
8aafee672e #4244 Kundenkarten-Ansicht wirf Fehler 2023-08-01 15:21:12 +02:00
Lorenz Hilpert
9d886cd33f Merge branch 'develop' into release/3.0 2023-07-31 18:31:30 +02:00
Nino Righi
95d1ea3530 Merged PR 1615: #4235 Fix Scroll Position Customer Orders
#4235 Fix Scroll Position Customer Orders
2023-07-31 14:19:53 +00:00
Lorenz Hilpert
d3014e7e9a #4243 kein Kundenkarten-Checkbox fuer HSC 2023-07-31 15:09:59 +02:00
Lorenz Hilpert
da143c3412 #4241 Seite Bestellungen von Kundendetails wird nach einige Sekunden zu Kunden Trefferliste navigiert 2023-07-31 14:36:51 +02:00
Nino Righi
b10a7a923e Merged PR 1613: #4240 Bestellbestätigung Fix Leere Kachel
#4240 Bestellbestätigung Fix Leere Kachel
2023-07-31 11:45:23 +00:00
Nino Righi
08601203df Merged PR 1614: #4238 Removed QueryChangeDebounce
#4238 Removed QueryChangeDebounce
2023-07-31 11:44:54 +00:00
Lorenz Hilpert
526ba9f2a0 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-07-28 18:06:45 +02:00
Lorenz Hilpert
f1fc1d17a5 Message bei leerer suche 2023-07-28 18:06:15 +02:00
Nino Righi
6e07c86eed Merged PR 1612: #4228 Gruppierung Bestellbestätigung Abholung und Rücklage
#4228 Gruppierung Bestellbestätigung Abholung und Rücklage
2023-07-28 16:03:14 +00:00
Lorenz Hilpert
14199391e0 #4239 Bereich Kundenkarte hat kein Schließ-Button 2023-07-28 17:33:07 +02:00
Nino
bb834f6274 #4224 Fix Kundenbestellungen Trefferliste Splitscreen Breite der Kachel bzgl der Kundennummer angepasst 2023-07-28 16:43:22 +02:00
Nino Righi
8688935f25 Merged PR 1611: #4233 Fix branch$ should always atleast return defaultBranch if available
#4233 Fix branch$ should always atleast return defaultBranch if available
2023-07-28 14:22:14 +00:00
Lorenz Hilpert
1b7d257e97 #4172 Console.log entfernt 2023-07-28 15:49:37 +02:00
Lorenz Hilpert
fff4b222cb #4172 Keine Suchergebnisse text bei der Ergebnisliste 2023-07-28 15:48:55 +02:00
Lorenz Hilpert
c63dee8509 Merge branch 'release/2.3' into develop 2023-07-28 14:51:41 +02:00
Nino Righi
607bc320fb Merged PR 1609: #3395 Bestellbestätigung Verlinkungen und Wording
#3395 Bestellbestätigung Verlinkungen und Wording
2023-07-28 12:26:49 +00:00
Nino Righi
72393ebca5 Merged PR 1610: #4224 Fix Customer Orders Result List Card Size
#4224 Fix Customer Orders Result List Card Size
2023-07-28 12:26:20 +00:00
Lorenz Hilpert
ecef17846b #4226 #4234 Bei Einstieg in Kundensuche wird suche mit Default Filter getriggert 2023-07-28 14:10:00 +02:00
Lorenz Hilpert
45265eedd4 #4230 Keine Kachel in Trefferliste wenn ein Bestellung ohne Konto-Datensatz angelegt wird 2023-07-28 13:34:32 +02:00
Nino Righi
04da34e677 Merged PR 1608: #4233 Fix Article Search Details Fetching Branch correctly
#4233 Fix Article Search Details Fetching Branch correctly
2023-07-27 16:29:43 +00:00
Lorenz Hilpert
1e504d9e0c Merge branch 'release/3.0' into develop 2023-07-27 17:51:51 +02:00
Lorenz Hilpert
75528d37d3 #4232 Preisanzeige bei Versanbestellung
(cherry picked from commit eddff0d93f)
2023-07-27 17:51:29 +02:00
Lorenz Hilpert
f4579ef8dc #4229 Styling und Filter Anpoassung für Kundenbereich 2023-07-27 14:01:06 +02:00
Lorenz Hilpert
fc5496fda6 #4229 Fix ScrollPosition 2023-07-27 13:32:27 +02:00
Lorenz Hilpert
5cf6f4da38 Merged PR 1607: #4148 Suche nach Versandbestellung mit Order Id
#4148 Suche nach Versandbestellung mit Order Id
2023-07-26 15:32:18 +00:00
Lorenz Hilpert
60fde8b103 #4194 Artikel Format Icon wird falsch angezeigt 2023-07-26 17:20:32 +02:00
Lorenz Hilpert
734fe33f40 #4226 Am Ende der Trefferliste fehlt den Link zum Kundendaten erfassen 2023-07-26 16:54:25 +02:00
Nino Righi
64da928c36 Merged PR 1606: #4172 Kundensuche "Keine Suchergebnisse"
#4172 Kundensuche "Keine Suchergebnisse"
2023-07-26 14:29:41 +00:00
Nino
dba0b1b3c7 Customer Orders Breadcrumb Fix, Styling Fix Result List, Adjusted Position of Address Info correctly 2023-07-26 15:53:01 +02:00
Nino Righi
073746a9bc Merged PR 1605: #4220 Responsive Design Customer Orders Search History
#4220 Responsive Design Customer Orders Search History
2023-07-26 11:58:00 +00:00
Lorenz Hilpert
45c14e3b79 Toaster ueber console erstellen und schließen 2023-07-25 16:49:22 +02:00
Nino Righi
7023fe747b Merged PR 1604: #4219 RD Customer Orders Result List Display OrderNumber at item and BuyerNum...
#4219 RD Customer Orders Result List Display OrderNumber at item and BuyerNumber at customer name
2023-07-25 12:58:24 +00:00
Lorenz Hilpert
141c7fe1d6 #4221 Scanner - Adapter sind nicht bereit
(cherry picked from commit 78e76818b5)
(cherry picked from commit 44b406fad4)
2023-07-25 14:57:40 +02:00
Lorenz Hilpert
78e76818b5 #4221 Scanner - Adapter sind nicht bereit 2023-07-25 14:52:18 +02:00
Lorenz Hilpert
f78a773fab Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-07-25 14:19:07 +02:00
Nino Righi
60d007d9eb Merged PR 1603: #3394 #3395 #4218 Responsive Design Checkout Summary
#3394 #3395 #4218 Responsive Design Checkout Summary
2023-07-25 12:18:35 +00:00
Lorenz Hilpert
1ec253333e Close Button - Text gege Icon getsuscht 2023-07-25 14:18:18 +02:00
Nino Righi
bd332b6bd9 Merged PR 1602: #4215 #4137 Alle Filter Entfernen in Kundensuche eingebaut, Alle Filter entfernen entfernt die Query nicht mehr
#4215 #4137 Alle Filter Entfernen in Kundensuche eingebaut, Alle Filter entfernen entfernt die Query nicht mehr
2023-07-24 16:20:20 +00:00
Lorenz Hilpert
bc9bdbebe3 #3860 Toaster - Platzierung 2023-07-24 18:18:49 +02:00
Lorenz Hilpert
0b471cc5bc Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-07-24 11:26:55 +02:00
Lorenz Hilpert
c2eed61b83 #4213 Trefferlsite leer - scroll index fix 2023-07-24 11:26:41 +02:00
Lorenz Hilpert
2d403b4c56 Merge branch 'release/3.0' into develop 2023-07-24 01:13:27 +02:00
Lorenz Hilpert
b3e4ca90ee Merge branch 'release/2.3' into develop 2023-07-24 01:12:38 +02:00
Nino Righi
d4a3a4bc06 Merged PR 1601: #4141 Disable Filter Anwenden CTA if no filter is selected or no query available
#4141 Disable Filter Anwenden CTA if no filter is selected or no query available
2023-07-21 13:59:01 +00:00
Lorenz Hilpert
b674b5faf6 #4216 Header - Schriftgröße über Header anpassen 2023-07-21 15:40:45 +02:00
Lorenz Hilpert
edb21308d4 #4194 Remission - Artikel Format Icon wird falsch angezeigt 2023-07-21 10:50:57 +02:00
Lorenz Hilpert
26ad0153d8 #4214 Trefferliste Kunden IPad 2023-07-21 10:26:42 +02:00
Nino Righi
e9b2acca5b Merged PR 1600: #4172 #4200 Artikelsuche und Kundenbestellungen Navigation Trefferliste und Anzeige Suchbox Hint
#4172 #4200 Artikelsuche und Kundenbestellungen Navigation Trefferliste und Anzeige Suchbox Hint
2023-07-21 08:15:57 +00:00
Nino Righi
4180ee61d6 Merged PR 1598: #3922 Kundenbestellungen Bugfixes, Filter angepasst, Breadcrumb bugfix
#3922 Kundenbestellungen Bugfixes, Filter angepasst, Breadcrumb bugfix
2023-07-21 07:40:03 +00:00
Lorenz Hilpert
a442a50708 Update Test 2023-07-20 15:59:52 +02:00
Lorenz Hilpert
59e650a1f1 #4201 Bearbeitung von Bestellung ohne Konto deaktiviert 2023-07-20 14:21:14 +02:00
Lorenz Hilpert
69b6470cda Revert "#4209 - FIX - KulturPass-Einlösecode lässt Abholfrist ändern"
This reverts commit 02d60e9bd5.
2023-07-20 13:57:31 +02:00
Lorenz Hilpert
08f00c6578 Update CheckForUpdate interval - 15 min 2023-07-20 11:49:44 +02:00
Lorenz Hilpert
51c4066222 (cherry picked from commit 6fb72e4b2f) 2023-07-20 11:46:13 +02:00
Lorenz Hilpert
c9fbbd78a8 #4213 FIX - Kundensuche Trefferliste verschwindet nach Tab wechseln 2023-07-20 10:07:22 +02:00
Nino Righi
ce5388be61 Merged PR 1599: #4206 Checkout Cart display notification channels if buyer or payer is available
#4206 Checkout Cart display notification channels if buyer or payer is available
2023-07-19 16:59:52 +00:00
Lorenz Hilpert
02d60e9bd5 #4209 - FIX - KulturPass-Einlösecode lässt Abholfrist ändern
(cherry picked from commit fce50daff6)
2023-07-19 18:42:27 +02:00
Lorenz Hilpert
35b7f5700f #4211 Kaufoptionen popup - Prüfung ob Artikel mit Kunden kombinierbar ist
(cherry picked from commit ddd5d50c5d)
2023-07-19 17:46:52 +02:00
Lorenz Hilpert
efec7ecb26 #4210 Änderungen werden nicht sofort angezeigt 2023-07-19 17:25:22 +02:00
Lorenz Hilpert
ee81f795fe Removed Deprecated unit tests 2023-07-19 15:14:54 +02:00
Lorenz Hilpert
ad557ff919 #4193 Bestellpostensuche Seite nicht erreichbar 2023-07-19 15:06:00 +02:00
Lorenz Hilpert
bf5fae08b2 #4203 Scrollposition auf Kundentrefferliste wird nicht gespeichert 2023-07-19 14:36:18 +02:00
Lorenz Hilpert
88321928bf #4201 Bestellung ohne Konto können Kundendaten nicht bearbeiten 2023-07-19 11:33:13 +02:00
Lorenz Hilpert
a7d50a9439 #4196 Rechnungs- und Lieferadresse ändern bei eine Bestellung für Versand führt zu Dashboard Seite 2023-07-18 16:35:27 +02:00
Lorenz Hilpert
4c6dcd15da #4198 In Kundenkarten Konto Formular der Text geht über den Rand hinaus 2023-07-18 16:27:42 +02:00
Lorenz Hilpert
84f9d14be0 #4199 Warnmeldung bei Geburtsdatumeingabe 2023-07-18 15:25:05 +02:00
Lorenz Hilpert
e2f173f250 #4201 Kunden Detail Seite des Onlinekontos - nicht bearbeitbar 2023-07-18 14:33:22 +02:00
Lorenz Hilpert
fdd9617604 #4202 Kundendetails Bearbeiten Seite von Business Konto 2023-07-18 14:25:49 +02:00
Lorenz Hilpert
bc3cedfe50 #4204 Ladekreis in Kundensuche Suchfeld verschwindet nicht 2023-07-18 14:09:04 +02:00
Lorenz Hilpert
78f9093931 Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-07-18 13:22:59 +02:00
Lorenz Hilpert
a889c768d1 #3761 Bestellposten Design 2023-07-18 13:22:22 +02:00
Nino Righi
e36319a73e Merged PR 1596: #4179 Fix Process Bar Scroll to Active Process
#4179 Fix Process Bar Scroll to Active Process
2023-07-18 11:14:59 +00:00
Nino Righi
199ae95bcd Merged PR 1597: #4186 Fix Price Update and Article Search Result List selected Select Bullet...
#4186 Fix Price Update and Article Search Result List selected Select Bullet handling improved
2023-07-18 08:22:05 +00:00
Lorenz Hilpert
30875f0491 #4195 Anzeige der Hauptseite der Kundensuche angepasst - IPad 2023-07-17 15:16:44 +02:00
Lorenz Hilpert
95d9d17aa7 Merge branch 'release/2.3' into develop 2023-07-17 01:31:46 +02:00
Nino Righi
4c641adeda Merged PR 1595: #4189 Dont Display Customer Name if Shipping Address is Available
#4189 Dont Display Customer Name if Shipping Address is Available
2023-07-14 15:17:51 +00:00
Lorenz Hilpert
4bd4158dab select inputs können gecleart werden 2023-07-14 17:14:44 +02:00
Nino
4965976f6c Merge branch 'develop' of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend into develop 2023-07-14 16:59:36 +02:00
Nino
b43f512887 Responsive Design Container Height, Splitscreen Tailwind changes to Page Catalog, Customer-Orders, Checkout - Small Styling bugfixes 2023-07-14 16:59:15 +02:00
Lorenz Hilpert
e6f2b46fce Navigation nach Kundenanlage 2023-07-14 16:30:18 +02:00
Lorenz Hilpert
01c84b361a Kundenbereich Div Size 2023-07-14 15:47:19 +02:00
Lorenz Hilpert
28ad07b372 Filter Searchbox - Tablet - Desktop 2023-07-14 14:42:39 +02:00
Lorenz Hilpert
6ade77d458 Tailwindcss anpassung splitscreen werte 2023-07-14 14:41:18 +02:00
Lorenz Hilpert
4187e13861 Merge branch 'release/2.3' into develop 2023-07-14 13:25:05 +02:00
Lorenz Hilpert
729451fa48 Kundennavigation angepasst 2023-07-14 12:19:03 +02:00
Lorenz Hilpert
d77fe8c540 Kundenbereich Nachname Vorname 2023-07-14 12:05:21 +02:00
Lorenz Hilpert
a257ddd8e0 Dev Scanner Entfernt 2023-07-14 11:14:19 +02:00
Lorenz Hilpert
90154bd497 desktop_ zu desktop-large_ geändert, searchprovider für kundensuche angepasst 2023-07-14 10:54:57 +02:00
Lorenz Hilpert
f96224569f Autocomplete Provider für Kundensuche 2023-07-14 03:51:31 +02:00
Lorenz Hilpert
1c695104f9 click event auf Weiter zum Warenkorb 2023-07-14 03:40:47 +02:00
Lorenz Hilpert
ab9a35dd89 Merge branch 'feature/rd-customer' into develop 2023-07-14 03:27:46 +02:00
Lorenz Hilpert
6daa96119d Filter Buttons und Navigation 2023-07-14 03:27:17 +02:00
Lorenz Hilpert
128a280dee Constants and Icon Update 2023-07-14 03:03:45 +02:00
Lorenz Hilpert
475c885344 Kundenlabels und Icons 2023-07-14 01:00:00 +02:00
Lorenz Hilpert
ee62649bf6 Positonierung Button in Details ansicht und Suche Optimiert 2023-07-14 00:29:32 +02:00
Lorenz Hilpert
109999d66f Performance und caching in Kundensuche angepasst 2023-07-13 23:32:50 +02:00
Lorenz Hilpert
9ec34b07c4 Ladeanimation beim laden der Bestellungen 2023-07-13 22:59:29 +02:00
Lorenz Hilpert
2fd2d701dd Merge branch 'feature/rd-customer' into develop 2023-07-13 19:09:53 +02:00
Lorenz Hilpert
5574252b5b Merge branch 'develop' into release/3.0 2023-07-13 19:09:05 +02:00
Lorenz Hilpert
5e79d4dc52 Merge branch 'release/3.0' into develop 2023-07-13 19:08:47 +02:00
Nino Righi
bb91782079 Merged PR 1594: #4176 Fix Order Deadline inside Purchasing Options
#4176 Fix Order Deadline inside Purchasing Options
2023-07-13 17:07:20 +00:00
Nino Righi
2bbcb15740 Merged PR 1593: #4189 Warenkorb Anzeige Änderungen
#4189 Warenkorb Anzeige Änderungen
2023-07-13 17:06:59 +00:00
Lorenz Hilpert
216d302a86 Zuweisung Kunden zum Warenkorb 2023-07-13 19:06:28 +02:00
Nino Righi
e18b9a4200 Merged PR 1592: #3730 Article Search Results Order By Adjustments
#3730 Article Search Results Order By Adjustments
2023-07-13 15:23:42 +00:00
Nino Righi
310395d166 Merged PR 1591: #4184 Fix Article Search Results Remember Scroll Position Correctly
#4184 Fix Article Search Results Remember Scroll Position Correctly
2023-07-13 15:23:24 +00:00
Nino Righi
651f44914f Merged PR 1590: #4187 RD Cart Delivery Address and Wording Change
#4187 RD Cart Delivery Address and Wording Change
2023-07-13 14:55:41 +00:00
Lorenz Hilpert
4a97800a05 Update Navigation p4m 2023-07-13 13:47:11 +02:00
Lorenz Hilpert
f2e124903c Merge branch 'release/2.3' into develop 2023-07-13 12:08:38 +02:00
Nino Righi
cb7334d63b Merged PR 1588: #4140 Fix Article Search Results Set Default Max Buffer Size for Scrollcontainer
#4140 Fix Article Search Results Set Default Max Buffer Size for Scrollcontainer
2023-07-13 08:03:59 +00:00
Lorenz Hilpert
f98aac5231 Navigations Kundenbereich RD 2023-07-12 15:05:42 +02:00
Lorenz Hilpert
9c4e94ce8d Kundenkarte Customer RD 2023-07-11 21:13:51 +02:00
Lorenz Hilpert
65a19feffc Merge branch 'develop' into feature/rd-customer 2023-07-11 19:32:21 +02:00
Nino Righi
62a1be7abe Merged PR 1587: #4177 RD Purchasing Order Modal Fix Guest Customer without Account cannot ord...
#4177 RD Purchasing Order Modal Fix Guest Customer without Account cannot order via delivery option
2023-07-11 16:54:22 +00:00
Nino Righi
ad4481cfc7 Merged PR 1586: #4183 RD Cart Fix display of data from previous order
#4183 RD Cart Fix display of data from previous order
2023-07-11 16:53:53 +00:00
Nino Righi
e4c20b953d Merged PR 1585: #4169 #4170 #4140 #4182 Artikelsuche - Routing Navigation and Scrolling Bugfixes
#4169 #4170 #4140 #4182 Artikelsuche - Routing Navigation and Scrolling Bugfixes
2023-07-11 16:52:11 +00:00
Lorenz Hilpert
e8044fae1b Kundenbestellungen Seite 2023-07-11 18:50:26 +02:00
Nino Righi
c4818319aa Merged PR 1580: #4174 Fix Goods Out and Customer Orders Caching and display items based on pr...
#4174 Fix Goods Out and Customer Orders Caching and display items based on process correctly
2023-07-11 11:14:23 +00:00
Nino Righi
8cb25d6ca1 Merged PR 1581: #4176 Order Deadline Responsive Design
#4176 Order Deadline Responsive Design
2023-07-11 08:05:44 +00:00
Nino Righi
5a14e0afbd Merged PR 1582: #4178 Changed search history results from 5 to 7 and made container scrollable
#4178 Changed search history results from 5 to 7 and made container scrollable
2023-07-11 08:03:48 +00:00
Nino Righi
0804eeeccb Merged PR 1583: #4175 Warenkorb Notification und Navigation bugfix
#4175 Warenkorb Notification und Navigation bugfix
2023-07-11 08:03:12 +00:00
Lorenz Hilpert
f015169011 Paging Kundensuche 2023-07-10 13:33:43 +02:00
Lorenz Hilpert
201ea2ee9c ANlage und bearbeiten von Adressen 2023-07-10 11:42:28 +02:00
Nino Righi
961211e638 Merged PR 1579: #4171 RD Added Fallbacks to Navigation Services if all arguments are undefined
#4171 RD Added Fallbacks to Navigation Services if all arguments are undefined
2023-07-10 09:04:51 +00:00
Nino Righi
22a494e31e Merged PR 1578: #4162 RD Customer Orders Edit Styling Fixes
#4162 RD Customer Orders Edit Styling Fixes
2023-07-10 09:01:59 +00:00
Nino Righi
75e24771b3 Merged PR 1577: #4168 Fix PDP Recommendations Routing
#4168 Fix PDP Recommendations Routing
2023-07-07 14:07:39 +00:00
Lorenz Hilpert
97b30d5b14 Merge branch 'release/2.3' into develop 2023-07-06 17:14:00 +02:00
Lorenz Hilpert
ca5dbb9d6f Merge branch 'develop' into release/3.0 2023-07-06 16:58:04 +02:00
Nino Righi
e065c1a8da Merged PR 1576: #4095 #4159 Responsive Design PDP Styling fix and implemented Page Scrolling
#4095 #4159 Responsive Design PDP Styling fix and implemented Page Scrolling
2023-07-06 14:57:09 +00:00
Nino Righi
fc76f34d38 Merged PR 1575: #3399 #3398 #3397 Responsive Design Checkout Cart Review
#3399 #3398 #3397 Responsive Design Checkout Cart Review
2023-07-06 14:53:39 +00:00
Lorenz Hilpert
27e5afacde Merge branch 'develop' into release/3.0 2023-07-06 16:33:14 +02:00
Lorenz Hilpert
8a4fe7aedd Merge branch 'release/2.3' into develop 2023-07-06 16:32:12 +02:00
Lorenz Hilpert
ba01807add Merge branch 'develop' into release/3.0 2023-07-05 22:06:55 +02:00
Lorenz Hilpert
3b89777648 Merge branch 'release/2.3' into develop 2023-07-05 22:05:51 +02:00
Lorenz Hilpert
bb510788eb Merge branch 'develop' into release/3.0 2023-07-05 17:44:32 +02:00
Nino Righi
1b85c8ff50 Merged PR 1572: #4143 Fix Page Product Search, Page Customer Orders, combine Filter and Searc...
#4143 Fix Page Product Search, Page Customer Orders, combine Filter and Searchquery in Splitscreen #4155 Fix Autocomplete inside Customer Orders
2023-07-04 08:07:36 +00:00
Nino Righi
4d5e81a638 Merged PR 1571: #4142 Fix Open Filter after Clearing Query navigates to filter page properly...
#4142 Fix Open Filter after Clearing Query navigates to filter page properly and does not trigger a search. Searchbox stays clear
2023-07-03 09:01:25 +00:00
Nino Righi
7676ae8143 Merged PR 1573: #4158 RD Customer Orders Details Select Bullet Fixed, Styling Adjusted
#4158 RD Customer Orders Details Select Bullet Fixed, Styling Adjusted
2023-07-03 08:52:58 +00:00
Nino Righi
9a17f95026 Merged PR 1570: #4135 #4144 Responsive Design Product Search Result List Select Bullet Logic...
#4135 #4144 Responsive Design Product Search Result List Select Bullet Logic updated
2023-06-28 16:10:01 +00:00
Nino Righi
e6b44d8365 Merged PR 1569: #4139 Fix RD Shared Searchbox Close Autocomplete if Search triggered
#4139 Fix RD Shared Searchbox Close Autocomplete if Search triggered
2023-06-28 16:07:49 +00:00
Nino Righi
874f8f4758 Merged PR 1568: #3996 Customer Order Details and History
#3996 Customer Order Details and History
2023-06-28 16:03:23 +00:00
Lorenz Hilpert
7b12857a35 Mark Result Item as active if customer is selected 2023-06-28 13:21:28 +02:00
Lorenz Hilpert
d6d919ed52 Kundensuche Caching 2023-06-27 17:13:50 +02:00
Lorenz Hilpert
600687f652 Version Set To Major 3 Minor 0 2023-06-27 11:01:12 +02:00
Lorenz Hilpert
ed144f0a15 Unit Test Fix 2023-06-26 13:30:18 +02:00
Lorenz Hilpert
c0c2cc86d3 Merge branch 'release/2.3' into develop 2023-06-26 13:17:52 +02:00
Nino Righi
4b2bfefc9b Merged PR 1567: #3993 #3994 #3995 #3996 Kundenbestellungen Splitscreen, erste Version
#3993 #3994 #3995 #3996 Kundenbestellungen Splitscreen, erste Version
2023-06-20 11:08:15 +00:00
Lorenz Hilpert
11e79c4830 Customer Edit Pages 2023-06-16 13:29:34 +02:00
Nino Righi
45989d7abd Merged PR 1565: #4077 Responsive Design Display Cart-Checkout Process Tab Correctly
#4077 Responsive Design Display Cart-Checkout Process Tab Correctly
2023-06-14 14:31:47 +00:00
Lorenz Hilpert
ae27da1127 Styling anpassung 2023-06-14 15:14:48 +02:00
Lorenz Hilpert
ca21931d93 Customer Create Forms 2023-06-14 15:04:15 +02:00
Lorenz Hilpert
5c9f4c5b21 Merged PR 1564: Customer RD 2023-06-13 11:45:47 +00:00
Lorenz Hilpert
c134f645ef Merge branch 'develop' into feature/rd-customer 2023-06-13 13:45:00 +02:00
Lorenz Hilpert
6f0933a350 Fix Unit Tests 2023-06-13 13:25:37 +02:00
Nino Righi
c9a90211ee Merged PR 1563: #4099 RD Fix Disable Chrome Autocomplete prompt
#4099 RD Fix Disable Chrome Autocomplete prompt
2023-06-13 08:06:15 +00:00
Nino Righi
95d96dd295 Merged PR 1562: #4097 Fix Goods In Out Details CTA layout
#4097 Fix Goods In Out Details CTA layout
2023-06-13 08:05:37 +00:00
Nino Righi
86bf079f6f Merged PR 1561: #4098 Fix RD Article Search Results closing all Processes dont navigate to old result breadcrumb anymore
#4098 Fix RD Article Search Results closing all Processes dont navigate to old result breadcrumb anymore
2023-06-13 08:05:18 +00:00
Lorenz Hilpert
c202490555 Kundentyp-Auswahl 2023-06-12 17:04:19 +02:00
Lorenz Hilpert
da0100dd35 Icon lib moved to shared 2023-06-12 16:12:28 +02:00
Lorenz Hilpert
b634247463 Merge branch 'develop' into feature/rd-customer 2023-06-12 10:48:56 +02:00
Lorenz Hilpert
84df6493f6 Side View 2023-06-12 10:46:37 +02:00
Nino Righi
d3858c731c Merged PR 1559: #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:19 +00:00
Nino Righi
f247ac641c Merged PR 1560: #4082 Sidenav Arrow Navigation Fix
#4082 Sidenav Arrow Navigation Fix
2023-06-09 12:45:45 +00:00
Nino Righi
be1a9e8f7e Merged PR 1556: #4067 RD Artikelsuche Ergebnisliste Performance und Scrollposition Update
#4067 RD Artikelsuche Ergebnisliste Performance und Scrollposition Update
2023-06-09 09:11:10 +00:00
Nino Righi
d86f595b1f Merged PR 1555: #4074 Implemented Changes from ISA-Integration to ISA-Test
#4074 Implemented Changes from ISA-Integration to ISA-Test
2023-06-07 13:30:14 +00:00
Nino Righi
74bf2133c6 Merged PR 1554: #4078 Fix Searchbox Clear
#4078 Fix Searchbox Clear
2023-06-06 16:07:58 +00:00
Nino Righi
e4570946c4 Merged PR 1551: #4088 Responsive Design Fixed Width of Filter Overlays
#4088 Responsive Design Fixed Width of Filter Overlays
2023-06-06 15:33:02 +00:00
Andreas Schickinger
a8213d79fd Merged PR 1552: #4087 Warenausgabe/Abholfach - Label Breite angepasst
#4087 Warenausgabe/Abholfach - Label Breite angepasst

Related work items: #4087
2023-06-06 15:23:46 +00:00
Nino Righi
13ec323ac4 Merged PR 1550: #4083 Develop Goods In Out Order Edit Bestellkanal orderSource from Order not...
#4083 Develop Goods In Out Order Edit Bestellkanal orderSource from Order not from first item
2023-06-06 14:58:02 +00:00
Andreas Schickinger
c544cebba9 Merged PR 1549: #4082 Navi Dropdown Pfeil
#4082 Navi Dropdown Pfeil

Related work items: #4082
2023-06-06 14:52:54 +00:00
Andreas Schickinger
74dffe8af2 Merged PR 1547: #4081 Vorgangsleiste scrollen
#4081 Vorgangsleiste scrollen

Related work items: #4081
2023-06-06 14:46:57 +00:00
Nino Righi
9d3bb9dcf3 Merged PR 1546: #4080 Responsive Design Article Search Filter Navigation
#4080 Responsive Design Article Search Filter Navigation
2023-06-06 09:39:53 +00:00
Nino Righi
05e58aa060 Merged PR 1545: #4076 RD Navigation Wording Change based on Email Johanna
#4076 RD Navigation Wording Change based on Email Johanna
2023-06-05 15:01:32 +00:00
Andreas Schickinger
f74d14d573 Merged PR 1542: #4075 TK zum Kalender Button Breite angepasst
#4075 TK zum Kalender Button Breite angepasst

Related work items: #4075
2023-06-05 14:25:29 +00:00
Andreas Schickinger
741e651a20 Merged PR 1543: #4079 Kaufoptionen Popup Text überlappt
#4079 Kaufoptionen Popup Text überlappt

Related work items: #4079
2023-06-05 14:24:49 +00:00
Andreas Schickinger
4e1bd89378 Merged PR 1541: #4073 Fix PP Filter wird zurückgesetzt, wenn nicht vollständig geladen
#4073 Fix PP Filter wird zurückgesetzt, wenn nicht vollständig geladen

Related work items: #4073
2023-06-02 14:35:06 +00:00
Andreas Schickinger
503f44891f Merged PR 1538: #4050 Fix Kaufoptionen Popup - Weiterleiten zur Kundensuche
#4050 Weiterleiten zur Kundensuche fix

Related work items: #4050
2023-06-02 11:24:02 +00:00
Andreas Schickinger
5bf326f680 Merged PR 1535: #4068 Fix Develop Warenkorb Rücklage Menge ändern
Related work items: #4068
2023-06-01 15:42:32 +00:00
Lorenz Hilpert
e7793b15e3 Bugfix Shell und UiSvgIcon 2023-05-31 16:36:18 +02:00
Lorenz Hilpert
d2e16ca256 Update Navigation behaviour for Filial-Navigation 2023-05-31 15:58:19 +02:00
Nino Righi
31164befc9 Merged PR 1534: #4066 Responsive Design Article Search Filter Scroll Arrow Clickable and adju...
#4066 Responsive Design Article Search Filter Scroll Arrow Clickable and adjusted Styling
2023-05-31 13:35:34 +00:00
Nino Righi
8f4dfa0674 Merged PR 1533: #4065 Responsive Design Result List Correctly Render Items
#4065 Responsive Design Result List Correctly Render Items
2023-05-31 13:35:23 +00:00
Nino Righi
eb7a01907a Merged PR 1532: #4064 Responsive Design Article Result List new Grid Layout
#4064 Responsive Design Article Result List new Grid Layout
2023-05-31 13:32:48 +00:00
Nino Righi
fb1fd1ec7c Merged PR 1531: #4063 Fix Splitscreen Correctly Remove Details Breadcrumb inside Search Resul...
#4063 Fix Splitscreen Correctly Remove Details Breadcrumb inside Search Results Component
2023-05-31 13:29:27 +00:00
Nino Righi
7528c7df63 Merged PR 1530: #4062 Responsive Design Artikelsuche Filter Closing and Routing updated
#4062 Responsive Design Artikelsuche Filter Closing and Routing updated
2023-05-31 13:29:11 +00:00
Lorenz Hilpert
e6ca19ab91 Update Customer Header and Navigation 2023-05-31 13:44:59 +02:00
Lorenz Hilpert
dc3e097dfd Unit Test Anpassungen 2023-05-30 11:17:29 +02:00
Lorenz Hilpert
a5e8c06dda Update Funktionalität alle Processe Schließen 2023-05-30 11:06:30 +02:00
Lorenz Hilpert
bf7fd13ef2 Unit Test Fix 2023-05-26 18:06:35 +02:00
Lorenz Hilpert
a424e015b4 Prozess Tab font Anpassung 2023-05-26 17:17:32 +02:00
Lorenz Hilpert
c67fef64fe Styling anpassung prozess item 2023-05-26 17:15:26 +02:00
Lorenz Hilpert
12055de1fc Added Dashboard Icon 2023-05-26 16:11:54 +02:00
Lorenz Hilpert
a2ad2f8c0b Shell Prozess Tab 2023-05-26 16:01:42 +02:00
Lorenz Hilpert
af7cebda66 Unit Test Fix 2023-05-26 11:23:50 +02:00
Lorenz Hilpert
2230cf2e7b Header Anpassungen 2023-05-26 11:15:59 +02:00
Lorenz Hilpert
aa048e8d22 Added missing Icons 2023-05-25 16:36:45 +02:00
Lorenz Hilpert
4961fb9756 Fix Unit Sests ShellSideMenuComponent 2023-05-25 16:12:08 +02:00
Lorenz Hilpert
6801e3858a #3007 Side Navigation 2023-05-25 16:02:05 +02:00
Nino Righi
266358f0cc Merged PR 1528: Responsive Design Article Search
Responsive Design Article Search
2023-05-24 16:33:56 +00:00
Lorenz Hilpert
6717f0ee3d #3984 - Filtereinstellungen wenn Artikel für Dig-Versand in Warenkorb sind falsch 2023-05-24 18:21:30 +02:00
Michael Auer
8880ed0df6 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
2023-05-24 16:12:28 +00:00
Lorenz Hilpert
395fd544e5 #4048 Bestellkanal - Umstellung auf orderSource 2023-05-22 15:44:06 +02:00
Lorenz Hilpert
2c10d6bf10 Kundenbestellung navigation Fix 2023-05-22 14:07:45 +02:00
Lorenz Hilpert
d2c307b08a Updated Breadcrumb for Kundensuche 2023-05-12 13:10:00 +02:00
Lorenz Hilpert
4dc98f7980 Shell Styling 2023-05-11 16:42:37 +02:00
Lorenz Hilpert
c89ee18db3 Update env service added matcher for screen sizes 2023-05-11 16:10:05 +02:00
Lorenz Hilpert
c4aa7999a6 Shell auf max breite 1440px und zentriert 2023-05-11 15:41:09 +02:00
Lorenz Hilpert
a8bfedcd5d Added Create Customer Components 2023-05-08 15:38:31 +02:00
Lorenz Hilpert
628dbd5227 Merge branch 'develop' into feature/rd-customer 2023-04-27 18:09:40 +02:00
Lorenz Hilpert
c05b290e49 Searchbox 2023-04-27 18:09:12 +02:00
Lorenz Hilpert
696015b6a4 Styling for Searchbox 2023-04-27 18:08:18 +02:00
Lorenz Hilpert
f2f70e1d83 Searchbox Update 2023-04-27 17:14:49 +02:00
Lorenz Hilpert
b4d967f721 Merge branch 'develop' into feature/rd-customer 2023-04-27 16:10:40 +02:00
Lorenz Hilpert
bf760677ef RD fur customer bereich 2023-04-27 16:06:59 +02:00
Lorenz Hilpert
4d1dbaa2f3 Moved searchbox and filter to shared 2023-04-27 14:26:50 +02:00
Lorenz Hilpert
595bb27d99 Shell Max Content Width 2023-04-26 10:42:15 +02:00
Lorenz Hilpert
7b72532c9e Added Config - Missing Icons 2023-04-24 16:31:25 +02:00
Lorenz Hilpert
6b756fe893 Merge branch 'release/2.3' into develop 2023-04-24 15:35:34 +02:00
Lorenz Hilpert
54c7f51766 #3008 - Fix Process Tab Close 2023-04-24 15:34:29 +02:00
Lorenz Hilpert
94b787655e #3008 Navigation durch Bereich wechseln CTA 2023-04-24 15:29:58 +02:00
Lorenz Hilpert
cf1c4d37b9 Update Package Lock 2023-04-24 14:45:53 +02:00
Lorenz Hilpert
ada16bac6c Merge branch 'develop' into feature/rd-navigation-shell 2023-04-24 14:35:31 +02:00
Lorenz Hilpert
eefb6062c7 removed fdescribed 2023-04-21 18:49:57 +02:00
Lorenz Hilpert
470a451168 Unit Tests for ShellSideMenuComponent 2023-04-21 18:49:37 +02:00
Lorenz Hilpert
e3b018c5f7 remove fdescribe 2023-04-21 17:45:12 +02:00
Lorenz Hilpert
bd695e21d4 RD Navigation Unit Tests - ProcessBar 2023-04-21 17:44:49 +02:00
Lorenz Hilpert
aaf156cee3 Merge branch 'develop' into feature/rd-navigation-shell 2023-04-18 14:11:34 +02:00
Lorenz Hilpert
e8020ffde6 RD Shell - Navigation 2023-04-18 14:09:36 +02:00
5644 changed files with 101442 additions and 87864 deletions

1
.husky/pre-commit Normal file
View File

@@ -0,0 +1 @@
npm run pretty-quick

View File

@@ -3,6 +3,5 @@
"johnpapa.angular2",
"esbenp.prettier-vscode",
"angular.ng-template",
"eg2.vscode-npm-script"
]
}

View File

@@ -1,4 +0,0 @@
- 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

@@ -1,25 +0,0 @@
# 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

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

View File

@@ -1,11 +0,0 @@
{
"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

@@ -1,20 +0,0 @@
: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

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

View File

@@ -1,11 +0,0 @@
/*
* 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

@@ -1,19 +0,0 @@
/* 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

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

View File

@@ -1,14 +0,0 @@
/* 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

@@ -1,25 +0,0 @@
# 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

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

View File

@@ -1,11 +0,0 @@
{
"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

@@ -1,8 +0,0 @@
/*
* 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

@@ -1,24 +0,0 @@
/* 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

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

View File

@@ -1,14 +0,0 @@
/* 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

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

View File

@@ -1,25 +0,0 @@
# 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

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

View File

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

View File

@@ -1,35 +0,0 @@
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

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

View File

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

View File

@@ -1,125 +0,0 @@
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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,80 +0,0 @@
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);
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
// start:ng42.barrel
export * from './config-module-options';
export * from './config.module';
export * from './config';
export * from './tokens';
export * from './config-loaders';
export * from './utils';
// end:ng42.barrel

View File

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

View File

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

View File

@@ -1,26 +0,0 @@
import { Injectable } from '@angular/core';
import { Platform } from '@angular/cdk/platform';
import { NativeContainerService } from 'native-container';
@Injectable({
providedIn: 'root',
})
export class EnvironmentService {
constructor(private _platform: Platform, private _nativeContainer: NativeContainerService) {}
isDesktop(): boolean {
return !this.isTablet();
}
isTablet(): boolean {
return this.isNative() || this.isSafari();
}
isNative(): boolean {
return this._nativeContainer.isNative;
}
isSafari(): boolean {
return (this._platform.ANDROID || this._platform.IOS) && this._platform.SAFARI;
}
}

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
// start:ng42.barrel
export * from './console-log.provider';
export * from './log-level';
export * from './log.provider';
export * from './logger.module';
export * from './logger.service';
export * from './tokens';
// end:ng42.barrel

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +0,0 @@
/*
* Public API Surface of signalr
*/
export * from './lib/signalr-hub-options';
export * from './lib/signalr.hub';

View File

@@ -1,22 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CoreComponent } from './core.component';
describe('CoreComponent', () => {
let component: CoreComponent;
let fixture: ComponentFixture<CoreComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [CoreComponent],
}).compileComponents();
fixture = TestBed.createComponent(CoreComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,12 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'lib-core',
template: `
<p>
core works!
</p>
`,
styles: [],
})
export class CoreComponent {}

View File

@@ -1,9 +0,0 @@
import { NgModule } from '@angular/core';
import { CoreComponent } from './core.component';
@NgModule({
declarations: [CoreComponent],
imports: [],
exports: [CoreComponent],
})
export class CoreModule {}

View File

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

View File

@@ -1,8 +0,0 @@
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class CoreService {
constructor() {}
}

View File

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

View File

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

View File

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

View File

@@ -1,14 +0,0 @@
import { AnimationTriggerMetadata, trigger, state, transition, style, animate } from '@angular/animations';
export const slideAnimationTime = 150;
export const toastAnimations: {
readonly slideToast: AnimationTriggerMetadata;
} = {
slideToast: trigger('slideAnimation', [
state('default', style({ transform: 'translateY(0%)' })),
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(`${slideAnimationTime}ms ease-in`)]),
transition('default => closing', animate(`${slideAnimationTime}ms ease-in`, style({ transform: 'translateY(-100%)' }))),
]),
};
export type ToastAnimationState = 'default' | 'closing';

View File

@@ -1,4 +0,0 @@
// start:ng42.barrel
export * from './toast';
export * from './toast-ref';
// end:ng42.barrel

View File

@@ -1,17 +0,0 @@
import { OverlayRef } from '@angular/cdk/overlay';
export class ToastRef {
constructor(private readonly _overlay: OverlayRef) {}
close() {
this._overlay.dispose();
}
isVisible() {
return this._overlay && this._overlay.overlayElement;
}
getPosition() {
return this._overlay.overlayElement.getBoundingClientRect();
}
}

View File

@@ -1,11 +0,0 @@
import { TemplateRef } from '@angular/core';
export interface Toast {
title?: string;
text?: string;
timer?: number;
position?: 'top-left' | 'top' | 'top-right' | 'bottom-right' | 'bottom' | 'bottom-left';
size?: 'width-full' | 'content';
template?: TemplateRef<any>; // For rendering dynamic content
templateContext?: {}; // For rendering dynamic content
}

View File

@@ -1,8 +0,0 @@
// start:ng42.barrel
export * from './toast.component';
export * from './toast.module';
export * from './toast.service';
export * from './defs';
export * from './animation';
export * from './tokens';
// end:ng42.barrel

View File

@@ -1,15 +0,0 @@
<div class="toast-main" [style.width]="width" [@slideAnimation]="{ value: animationState }" (@slideAnimation.done)="onSlideFinished()">
<button class="absolute top-2 right-2 p-6 border-none bg-transparent" (click)="close()">
<ui-icon icon="close" size="20px"></ui-icon>
</button>
<div class="toast-content flex flex-col justify-center items-center">
<h1 class="text-card-sub font-bold text-center py-3 whitespace-pre-wrap">{{ data.title }}</h1>
<ng-container *ngIf="data.text; else templateRef">
<p class="block text-base overflow-y-hidden pb-3 text-center overflow-x-hidden">{{ data.text }}</p>
</ng-container>
</div>
</div>
<ng-template #templateRef>
<ng-container *ngTemplateOutlet="data.template; context: data.templateContext"> </ng-container>
</ng-template>

View File

@@ -1,12 +0,0 @@
.toast-main {
@apply block relative mx-auto box-border text-white p-4;
background-color: var(--toast-background);
min-width: 18.75rem;
max-width: calc(100vw - 2rem);
min-height: 5rem;
border-radius: 25px;
}
.toast-content {
min-height: 3rem;
}

View File

@@ -1,48 +0,0 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, OnInit } from '@angular/core';
import { toastAnimations, ToastAnimationState, slideAnimationTime } from './animation';
import { Toast, ToastRef } from './defs';
import { TOAST_CONFIG_TOKEN } from './tokens';
@Component({
selector: 'lib-toast',
templateUrl: 'toast.component.html',
styleUrls: ['toast.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [toastAnimations.slideToast],
})
export class ToastComponent implements OnInit, OnDestroy {
timeoutRef?: any;
animationState: ToastAnimationState = 'default';
width = '55.25rem';
constructor(
@Inject(TOAST_CONFIG_TOKEN) public readonly data: Toast,
private readonly _ref: ToastRef,
private readonly _cdr: ChangeDetectorRef
) {}
ngOnInit(): void {
if (this.data?.size) {
this.width = this.data?.size === 'width-full' ? '100vw' : '55.25rem';
}
this.timeoutRef = setTimeout(() => {
this.close();
this._cdr.markForCheck();
}, slideAnimationTime + (this.data.timer ?? 5000));
}
ngOnDestroy() {
clearTimeout(this.timeoutRef);
}
close() {
this.animationState = 'closing';
}
onSlideFinished() {
if (this.animationState === 'closing') {
this._ref.close();
}
}
}

View File

@@ -1,12 +0,0 @@
import { OverlayModule } from '@angular/cdk/overlay';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { UiIconModule } from '@ui/icon';
import { ToastComponent } from './toast.component';
@NgModule({
declarations: [ToastComponent],
imports: [CommonModule, OverlayModule, UiIconModule],
exports: [ToastComponent],
})
export class ToastModule {}

View File

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

View File

@@ -1,79 +0,0 @@
import { Overlay } from '@angular/cdk/overlay';
import { ComponentPortal } from '@angular/cdk/portal';
import { Injectable, Injector } from '@angular/core';
import { Toast, ToastRef } from './defs';
import { ToastComponent } from './toast.component';
import { TOAST_CONFIG_TOKEN } from './tokens';
@Injectable({
providedIn: 'root',
})
export class ToastService {
private _lastToastRef: ToastRef;
get lastToastRef() {
return this._lastToastRef;
}
set lastToastRef(toastRef: ToastRef) {
this._lastToastRef = toastRef;
}
constructor(private readonly _overlay: Overlay, private readonly _injector: Injector) {}
create(data: Toast) {
const positionStrategy = this.getPositionStrategy(data);
const overlayRef = this._overlay.create({ positionStrategy });
this.lastToastRef = new ToastRef(overlayRef);
const injector = this.getInjector(data, this.lastToastRef);
const toastPortal = new ComponentPortal(ToastComponent, null, injector);
overlayRef.attach(toastPortal);
return this.lastToastRef;
}
getInjector(data: Toast, ref: ToastRef) {
return Injector.create({
parent: this._injector,
providers: [
{ provide: TOAST_CONFIG_TOKEN, useValue: data },
{ provide: ToastRef, useValue: ref },
],
});
}
getPositionStrategy(data: Toast) {
switch (data?.position) {
case 'top':
return this._overlay.position().global().top(this.getNextPosition()).centerHorizontally();
case 'top-left':
return this._overlay.position().global().top(this.getNextPosition()).left('1rem');
case 'top-right':
return this._overlay.position().global().top(this.getNextPosition()).right('1rem');
case 'bottom':
return this._overlay.position().global().bottom(this.getNextPosition(true)).centerHorizontally();
case 'bottom-left':
return this._overlay.position().global().bottom(this.getNextPosition(true)).left('1rem');
case 'bottom-right':
return this._overlay.position().global().bottom(this.getNextPosition(true)).right('1rem');
default:
return this._overlay.position().global().top(this.getNextPosition()).centerHorizontally();
}
}
getNextPosition(fromBottom?: boolean) {
const lastToastIsVisible = this.lastToastRef && this.lastToastRef.isVisible();
let position = fromBottom ? 6 : 9;
if (lastToastIsVisible && fromBottom) {
position = (window.innerHeight - this.lastToastRef.getPosition().bottom + this.lastToastRef.getPosition().height + 16) / 16;
} else if (lastToastIsVisible) {
position = (this.lastToastRef.getPosition().bottom + 16) / 16;
}
return position + 'rem';
}
}

View File

@@ -1,4 +0,0 @@
import { InjectionToken } from '@angular/core';
import { Toast } from './defs';
export const TOAST_CONFIG_TOKEN = new InjectionToken<Toast>('TOAST_DATA');

View File

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

View File

@@ -1,14 +0,0 @@
/* 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": []
},
"exclude": [
"**/*.spec.ts"
]
}

View File

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

View File

@@ -1,14 +0,0 @@
/* 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

@@ -1,25 +0,0 @@
# Availability
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 availability` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project availability`.
> Note: Don't forget to add `--project availability` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build availability` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build availability`, go to the dist folder `cd dist/availability` and run `npm publish`.
## Running unit tests
Run `ng test availability` 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

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

View File

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

View File

@@ -1,630 +0,0 @@
import { Injectable } from '@angular/core';
import { ItemDTO } from '@swagger/cat';
import {
AvailabilityDTO,
BranchDTO,
OLAAvailabilityDTO,
StoreCheckoutBranchService,
StoreCheckoutSupplierService,
SupplierDTO,
} from '@swagger/checkout';
import { combineLatest, Observable, of } from 'rxjs';
import {
AvailabilityRequestDTO,
AvailabilityService,
AvailabilityDTO as SwaggerAvailabilityDTO,
AvailabilityType,
} from '@swagger/availability';
import { AvailabilityDTO as CatAvailabilityDTO } from '@swagger/cat';
import { map, shareReplay, switchMap, withLatestFrom, mergeMap, timeout, first } from 'rxjs/operators';
import { isArray, memorize } from '@utils/common';
import { LogisticianDTO, LogisticianService } from '@swagger/oms';
import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@swagger/remi';
import { PriceDTO } from '@swagger/availability';
import { AvailabilityByBranchDTO, ItemData } from './defs';
import { Availability } from './defs/availability';
import { isEmpty } from 'lodash';
@Injectable()
export class DomainAvailabilityService {
constructor(
private _availabilityService: AvailabilityService,
private _logisticanService: LogisticianService,
private _stockService: StockService,
private _supplierService: StoreCheckoutSupplierService,
private _branchService: StoreCheckoutBranchService
) {}
@memorize({ ttl: 10000 })
memorizedAvailabilityShippingAvailability(request: Array<AvailabilityRequestDTO>) {
return this._availabilityService.AvailabilityShippingAvailability(request).pipe(shareReplay(1));
}
@memorize()
getSuppliers(): Observable<SupplierDTO[]> {
return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
map((response) => response.result),
shareReplay(1)
);
}
@memorize()
getTakeAwaySupplier(): Observable<SupplierDTO> {
return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
map(({ result }) => result?.find((supplier) => supplier?.supplierNumber === 'F')),
shareReplay(1)
);
}
@memorize()
getBranches(): Observable<BranchDTO[]> {
return this._branchService.StoreCheckoutBranchGetBranches({}).pipe(
map((response) => response.result),
shareReplay(1)
);
}
@memorize()
getStockByBranch(branchId: number): Observable<StockDTO> {
return this._stockService.StockGetStocksByBranch({ branchId }).pipe(
map((response) => response.result),
map((result) => result?.find((_) => true)),
shareReplay(1)
);
}
@memorize()
getDefaultStock(): Observable<StockDTO> {
return this._stockService.StockCurrentStock().pipe(
map((response) => response.result),
shareReplay(1)
);
}
@memorize()
getDefaultBranch(): Observable<BranchDTO> {
return this._stockService.StockCurrentBranch().pipe(
map((response) => ({
id: response.result.id,
name: response.result.name,
address: response.result.address,
branchType: response.result.branchType,
branchNumber: response.result.branchNumber,
changed: response.result.changed,
created: response.result.created,
isDefault: response.result.isDefault,
isOnline: response.result.isOnline,
key: response.result.key,
label: response.result.label,
pId: response.result.pId,
shortName: response.result.shortName,
status: response.result.status,
version: response.result.version,
})),
shareReplay(1)
);
}
@memorize({})
getLogisticians(): Observable<LogisticianDTO> {
return this._logisticanService.LogisticianGetLogisticians({}).pipe(
map((response) => response.result?.find((l) => l.logisticianNumber === '2470')),
shareReplay(1)
);
}
getTakeAwayAvailabilityByBranches({
branchIds,
itemId,
price,
quantity,
}: {
branchIds: number[];
itemId: number;
price: PriceDTO;
quantity: number;
}): Observable<AvailabilityByBranchDTO[]> {
return this._stockService.StockStockRequest({ stockRequest: { branchIds, itemId } }).pipe(
map((response) => response.result),
withLatestFrom(this.getTakeAwaySupplier()),
map(([result, supplier]) => {
const availabilities: AvailabilityByBranchDTO[] = result.map((stockInfo) => {
return {
availableQuantity: stockInfo.availableQuantity,
availabilityType: quantity <= stockInfo.inStock ? 1024 : 1, // 1024 (=Available)
inStock: stockInfo.inStock,
supplierSSC: quantity <= stockInfo.inStock ? '999' : '',
supplierSSCText: quantity <= stockInfo.inStock ? 'Filialentnahme' : '',
price,
supplier: { id: supplier?.id },
branchId: stockInfo.branchId,
};
});
return availabilities;
}),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getTakeAwayAvailability({
item,
quantity,
branch,
}: {
item: ItemData;
quantity: number;
branch?: BranchDTO;
}): Observable<AvailabilityDTO> {
const request = !!branch ? this.getStockByBranch(branch.id) : this.getDefaultStock();
return request.pipe(
switchMap((s) =>
combineLatest([
this._stockService.StockInStock({ articleIds: [item.itemId], stockId: s.id }),
this.getTakeAwaySupplier(),
this.getDefaultBranch(),
])
),
map(([response, supplier, defaultBranch]) => {
const price = item?.price;
return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch?.id ?? defaultBranch?.id, quantity, price });
}),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getTakeAwayAvailabilityByBranch({
branch,
itemId,
price,
quantity,
}: {
branch: BranchDTO;
itemId: number;
price: PriceDTO;
quantity: number;
}): Observable<AvailabilityDTO> {
return combineLatest([
this._stockService.StockStockRequest({ stockRequest: { branchIds: [branch.id], itemId } }),
this.getTakeAwaySupplier(),
]).pipe(
map(([response, supplier]) => {
return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch.id, quantity, price });
}),
shareReplay(1)
);
}
getTakeAwayAvailabilityByEan({
eans,
price,
quantity,
branchId,
}: {
eans: string[];
price: PriceDTO;
quantity: number;
branchId?: number;
}): Observable<AvailabilityDTO> {
const request = !!branchId ? this.getStockByBranch(branchId) : this.getDefaultStock();
return request.pipe(
switchMap((s) => this._stockService.StockInStockByEAN({ eans, stockId: s.id })),
withLatestFrom(this.getTakeAwaySupplier(), this.getDefaultBranch()),
map(([response, supplier, defaultBranch]) => {
return this._mapToTakeAwayAvailability({ response, supplier, branchId: branchId ?? defaultBranch.id, quantity, price });
}),
shareReplay(1)
);
}
getTakeAwayAvailabilitiesByEans({ eans }: { eans: string[] }): Observable<StockInfoDTO[]> {
const eansFiltered = Array.from(new Set(eans));
return this.getDefaultStock().pipe(
switchMap((s) => this._stockService.StockInStockByEAN({ eans: eansFiltered, stockId: s.id })),
withLatestFrom(this.getTakeAwaySupplier(), this.getDefaultBranch()),
map((response) => response[0].result),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getPickUpAvailability({
item,
branch,
quantity,
}: {
item: ItemData;
quantity: number;
branch: BranchDTO;
}): Observable<Availability<AvailabilityDTO, SwaggerAvailabilityDTO>> {
return this._availabilityService
.AvailabilityStoreAvailability([
{
qty: quantity,
ean: item?.ean,
itemId: item?.itemId ? String(item?.itemId) : null,
shopId: branch?.id,
price: item?.price,
},
])
.pipe(
map((r) => this._mapToPickUpAvailability(r.result)?.find((_) => true)),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
return this.memorizedAvailabilityShippingAvailability([
{
ean: item?.ean,
itemId: item?.itemId ? String(item?.itemId) : null,
price: item?.price,
qty: quantity,
},
]).pipe(
timeout(5000),
map((r) => this._mapToShippingAvailability(r.result)?.find((_) => true)),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getDigDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
return this.memorizedAvailabilityShippingAvailability([
{
qty: quantity,
ean: item?.ean,
itemId: item?.itemId ? String(item?.itemId) : null,
price: item?.price,
},
]).pipe(
timeout(5000),
map((r) => {
const availabilities = r.result;
const preferred = availabilities?.find((f) => f.preferred === 1);
const availability: AvailabilityDTO = {
availabilityType: preferred?.status,
ssc: preferred?.ssc,
sscText: preferred?.sscText,
supplier: { id: preferred?.supplierId },
isPrebooked: preferred?.isPrebooked,
estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
estimatedDelivery: preferred?.estimatedDelivery,
price: preferred?.price,
logistician: { id: preferred?.logisticianId },
supplierProductNumber: preferred?.supplierProductNumber,
supplierInfo: preferred?.requestStatusCode,
lastRequest: preferred?.requested,
};
return availability;
}),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getB2bDeliveryAvailability({
item,
quantity,
branch,
}: {
item: ItemData;
quantity: number;
branch?: BranchDTO;
}): Observable<AvailabilityDTO> {
const logistician$ = this.getLogisticians();
const currentBranch$ = this.getDefaultBranch();
return currentBranch$.pipe(
timeout(5000),
mergeMap((defaultBranch) =>
this.getPickUpAvailability({ item, quantity, branch: branch ?? defaultBranch }).pipe(
mergeMap((availability) =>
logistician$.pipe(
map((logistician) => ({ ...(availability?.length > 0 ? availability[0] : []), logistician: { id: logistician.id } }))
)
),
shareReplay(1)
)
)
);
}
@memorize({ ttl: 10000 })
getDownloadAvailability({ item }: { item: ItemData }): Observable<AvailabilityDTO> {
return this.memorizedAvailabilityShippingAvailability([
{
ean: item?.ean,
itemId: item?.itemId ? String(item?.itemId) : null,
price: item?.price,
qty: 1,
},
]).pipe(
map((r) => {
const availabilities = r.result;
const preferred = availabilities?.find((f) => f.preferred === 1);
const availability: AvailabilityDTO = {
availabilityType: preferred?.status,
ssc: preferred?.ssc,
sscText: preferred?.sscText,
supplier: { id: preferred?.supplierId },
isPrebooked: preferred?.isPrebooked,
estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
price: preferred?.price,
supplierProductNumber: preferred?.supplierProductNumber,
logistician: { id: preferred?.logisticianId },
supplierInfo: preferred?.requestStatusCode,
lastRequest: preferred?.requested,
};
return availability;
}),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getTakeAwayAvailabilities(items: { id: number; price: PriceDTO }[], branchId: number) {
return this._stockService.StockGetStocksByBranch({ branchId }).pipe(
map((req) => req.result?.find((_) => true)?.id),
switchMap((stockId) =>
stockId
? this._stockService.StockInStock({ articleIds: items.map((i) => i.id), stockId })
: of({ result: [] } as ResponseArgsOfIEnumerableOfStockInfoDTO)
),
timeout(20000),
withLatestFrom(this.getTakeAwaySupplier()),
map(([response, supplier]) => {
return response.result?.map((stockInfo) =>
this._mapToTakeAwayAvailabilities({
stockInfo,
supplier,
quantity: 1,
price: items?.find((i) => i.id === stockInfo.itemId)?.price,
})
);
}),
shareReplay(1)
);
}
@memorize({ ttl: 10000 })
getPickUpAvailabilities(payload: AvailabilityRequestDTO[], preferred?: boolean) {
return this._availabilityService.AvailabilityStoreAvailability(payload).pipe(
timeout(20000),
map((response) => (preferred ? this._mapToPickUpAvailability(response.result) : response.result))
);
}
@memorize({ ttl: 10000 })
getDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
return this.memorizedAvailabilityShippingAvailability(payload).pipe(
timeout(20000),
map((response) => this._mapToShippingAvailability(response.result))
);
}
@memorize({ ttl: 10000 })
getDigDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
return this.memorizedAvailabilityShippingAvailability(payload).pipe(
timeout(20000),
map((response) => this._mapToShippingAvailability(response.result))
);
}
@memorize({ ttl: 10000 })
getB2bDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
const logistician$ = this.getLogisticians();
return this.getPickUpAvailabilities(payload, true).pipe(
timeout(20000),
switchMap((availability) =>
logistician$.pipe(map((logistician) => ({ availability: [...availability], logistician: { id: logistician.id } })))
),
shareReplay(1)
);
}
getPriceForAvailability(
purchasingOption: string,
catalogAvailability: CatAvailabilityDTO | AvailabilityDTO,
availability: AvailabilityDTO
): PriceDTO {
switch (purchasingOption) {
case 'take-away':
return availability?.price || catalogAvailability?.price;
case 'delivery':
case 'dig-delivery':
if (catalogAvailability?.price?.value?.value < availability?.price?.value?.value) {
return catalogAvailability?.price;
}
return availability?.price || catalogAvailability?.price;
}
return availability?.price;
}
isAvailable({ availability }: { availability: AvailabilityDTO }) {
if (availability?.supplier?.id === 16 && availability?.inStock == 0) {
return false;
}
return [2, 32, 256, 1024, 2048, 4096].some((code) => availability?.availabilityType === code);
}
mapToOlaAvailability({
availability,
item,
quantity,
}: {
availability: AvailabilityDTO;
item: ItemDTO;
quantity: number;
}): OLAAvailabilityDTO {
return {
status: availability?.availabilityType,
at: availability?.estimatedShippingDate,
ean: item?.product?.ean,
itemId: item?.id,
format: item?.product?.format,
isPrebooked: availability?.isPrebooked,
logisticianId: availability?.logistician?.id,
price: availability?.price,
qty: quantity,
ssc: availability?.ssc,
sscText: availability?.sscText,
supplierId: availability?.supplier?.id,
supplierProductNumber: availability?.supplierProductNumber,
};
}
private _priceIsEmpty(price: PriceDTO) {
return isEmpty(price?.value) || isEmpty(price?.vat);
}
private _mapToTakeAwayAvailability({
response,
supplier,
branchId,
quantity,
price,
}: {
response: ResponseArgsOfIEnumerableOfStockInfoDTO;
supplier: SupplierDTO;
branchId: number;
quantity: number;
price: PriceDTO;
}): AvailabilityDTO {
const stockInfo = response.result?.find((si) => si.branchId === branchId);
const inStock = stockInfo?.inStock ?? 0;
const availability: AvailabilityDTO = {
availabilityType: quantity <= inStock ? 1024 : 1, // 1024 (=Available)
inStock: inStock,
supplierSSC: quantity <= inStock ? '999' : '',
supplierSSCText: quantity <= inStock ? 'Filialentnahme' : '',
price: this._priceIsEmpty(price) ? stockInfo?.retailPrice : price,
supplier: { id: supplier?.id },
// TODO: Change after API Update
// LH: 2021-03-09 preis Property hat nun ein Fallback auf retailPrice
// retailPrice: (stockInfo as any)?.retailPrice,
};
return availability;
}
private _mapToTakeAwayAvailabilities({
stockInfo,
quantity,
price,
supplier,
}: {
stockInfo: StockInfoDTO;
quantity: number;
price: PriceDTO;
supplier: SupplierDTO;
}) {
const inStock = stockInfo?.inStock ?? 0;
const availability = {
itemId: stockInfo.itemId,
availabilityType: quantity <= inStock ? (1024 as AvailabilityType) : (1 as AvailabilityType), // 1024 (=Available)
inStock: inStock,
supplierSSC: quantity <= inStock ? '999' : '',
supplierSSCText: quantity <= inStock ? 'Filialentnahme' : '',
price,
supplier: { id: supplier?.id },
};
return availability;
}
private _mapToPickUpAvailability(availabilities: SwaggerAvailabilityDTO[]): Availability<AvailabilityDTO, SwaggerAvailabilityDTO>[] {
if (isArray(availabilities)) {
const preferred = availabilities.filter((f) => f.preferred === 1);
const totalAvailable = availabilities.reduce((sum, av) => sum + (av?.qty || 0), 0);
return preferred.map((p) => {
return [
{
orderDeadline: p?.orderDeadline,
availabilityType: p?.status,
ssc: p?.ssc,
sscText: p?.sscText,
supplier: { id: p?.supplierId },
isPrebooked: p?.isPrebooked,
estimatedShippingDate: p?.requestStatusCode === '32' ? p?.altAt : p?.at,
price: p?.price,
inStock: totalAvailable,
supplierProductNumber: p?.supplierProductNumber,
supplierInfo: p?.requestStatusCode,
lastRequest: p?.requested,
itemId: p.itemId,
},
p,
];
});
}
}
private _mapToShippingAvailability(availabilities: SwaggerAvailabilityDTO[]) {
const preferred = availabilities.filter((f) => f.preferred === 1);
return preferred.map((p) => {
return {
availabilityType: p?.status,
ssc: p?.ssc,
sscText: p?.sscText,
isPrebooked: p?.isPrebooked,
estimatedShippingDate: p?.requestStatusCode === '32' ? p?.altAt : p?.at,
estimatedDelivery: p?.estimatedDelivery,
price: p?.price,
supplierProductNumber: p?.supplierProductNumber,
supplierInfo: p?.requestStatusCode,
lastRequest: p?.requested,
itemId: p.itemId,
priceMaintained: p.priceMaintained,
};
});
}
getInStockByEan(params: { eans: string[]; branchId?: number }): Observable<Record<string, StockInfoDTO>> {
let branchId$ = of(params.branchId);
if (!params.branchId) {
branchId$ = this.getDefaultBranch().pipe(
first(),
map((b) => b.id)
);
}
const stock$ = branchId$.pipe(
mergeMap((branchId) => this._stockService.StockGetStocksByBranch({ branchId }).pipe(map((response) => response.result?.[0])))
);
return stock$.pipe(
mergeMap((stock) =>
this._stockService.StockInStockByEAN({ eans: params.eans, stockId: stock.id }).pipe(
map((response) => {
const result = response.result ?? [];
for (const stockInfo of result) {
stockInfo.ean = stockInfo.ean;
}
return result.reduce<Record<string, StockInfoDTO>>((acc, stockInfo) => {
acc[stockInfo.ean] = stockInfo;
return acc;
}, {});
})
)
)
);
}
getInStock({ itemIds, branchId }: { itemIds: number[]; branchId: number }): Observable<StockInfoDTO[]> {
return this.getStockByBranch(branchId).pipe(
mergeMap((stock) =>
this._stockService.StockInStock({ articleIds: itemIds, stockId: stock.id }).pipe(map((response) => response.result))
)
);
}
}

View File

@@ -1,3 +0,0 @@
export * from './availability-by-branch-dto';
export * from './availability';
export * from './item-data';

View File

@@ -1,8 +0,0 @@
/*
* Public API Surface of availability
*/
export * from './lib/availability.service';
export * from './lib/in-stock.service';
export * from './lib/availability.module';
export * from './lib/defs';

View File

@@ -1,24 +0,0 @@
/* 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

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

View File

@@ -1,14 +0,0 @@
/* 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

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

View File

@@ -1,25 +0,0 @@
# Cart
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 cart` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project cart`.
> Note: Don't forget to add `--project cart` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build cart` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build cart`, go to the dist folder `cd dist/cart` and run `npm publish`.
## Running unit tests
Run `ng test cart` 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

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

View File

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

View File

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

View File

@@ -1,24 +0,0 @@
/* 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

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

View File

@@ -1,14 +0,0 @@
/* 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

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

View File

@@ -1,25 +0,0 @@
# Catalog
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 catalog` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project catalog`.
> Note: Don't forget to add `--project catalog` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build catalog` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build catalog`, go to the dist folder `cd dist/catalog` and run `npm publish`.
## Running unit tests
Run `ng test catalog` 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

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

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
/*
* Public API Surface of catalog
*/
export * from './lib/catalog.service';
export * from './lib/thumbnail.service';
export * from './lib/thumbnail-url.pipe';
export * from './lib/catalog.module';

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