Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid a299297f73 feat: WarehouseArticle now supports showId get parameter for filtering
feat: tt-position-manager now emits displayValue if emitDisplayValue is true
feat: tt-position-manager now has slot form-actions-append
feat: WarehouseOrderController now support text-articles
feat: WarehouseOrder now showing "Zum Artikel" button if article is selected
2025-04-08 21:40:11 +02:00
Luca Haid 4c19245842 Merge branch 'WarehouseShippingNote/fix' into 'master'
fix: creating shipping notes

See merge request fronk/thetool!1185
2025-04-08 13:57:15 +00:00
Luca Haid 526260a324 fix: creating shipping notes 2025-04-08 15:57:01 +02:00
Luca Haid b99c8bc55a feat: added email and phone number to Preorderlogistics export 2025-04-08 13:17:45 +00:00
Luca Haid e7f165d821 fix: WarehouseShippingNote availableType Matcher 2025-04-08 13:02:15 +00:00
Luca Haid dcb5656aba Update Print.template.php 2025-04-08 11:09:14 +00:00
Luca Haid cef1197585 Update Print.template.php 2025-04-08 11:02:28 +00:00
Luca Haid 9ad0e96a4b Merge branch 'ADBRimoFcp/add-fcp-map' into 'master'
fix: fixed map crop

See merge request fronk/thetool!1181
2025-04-08 09:49:06 +00:00
Luca Haid 2a66e6b9c9 fix: fixed map crop 2025-04-08 11:48:55 +02:00
Luca Haid 3832dd0509 Merge branch 'ADBRimoFcp/add-fcp-map' into 'master'
feat: add fcp map

See merge request fronk/thetool!1180
2025-04-08 09:46:38 +00:00
Luca Haid 26b92c411c feat: add fcp map
fix: fixed lazy fcp search
fix: try to fix preorder filter
2025-04-08 11:46:10 +02:00
Luca Haid 3d3e082fb5 Fixed Permission Issues in ConstructionConsentController.php 2025-04-08 08:18:27 +00:00
Luca Haid 9ad2ff5aa0 Merge branch 'WarehouseOrderRequest/add-multiple-order-create' into 'master'
feat: combine multiple orderrequests into one order

See merge request fronk/thetool!1179
2025-04-08 08:07:12 +00:00
Luca Haid 7f33125389 feat: combine multiple orderrequests into one order 2025-04-08 10:06:52 +02:00
Luca Haid a78b509659 Update WarehouseShippingNoteController.php 2025-04-08 07:36:52 +00:00
Luca Haid 4e8996af3c Merge branch 'WarehouseShippingNote/improve' into 'master'
fixed

See merge request fronk/thetool!1177
2025-04-07 14:55:08 +00:00
Luca Haid 62a7ce8f09 fixed 2025-04-07 16:54:56 +02:00
Luca Haid ec707be5d9 Merge branch 'WarehouseShippingNote/improve' into 'master'
fixed

See merge request fronk/thetool!1176
2025-04-07 14:54:30 +00:00
Luca Haid 74e3dd873b fixed 2025-04-07 16:54:21 +02:00
Luca Haid 385f1de2ee Merge branch 'WarehouseShippingNote/improve' into 'master'
fix: Reset save button after error handling

See merge request fronk/thetool!1175
2025-04-07 14:21:42 +00:00
Luca Haid 037f1600f1 fix: Reset save button after error handling
feat: Clear review mode and revert to edit mode when navigating to next item
feat: Implement close button functionality
fix: Handle edge case with zero delivery notes
feat: Add new type field with free text option
fix: Enable cancellation reversal in WarehouseAdmin
improve: Enhance article search autocomplete functionality
2025-04-07 16:21:27 +02:00
Luca Haid fb0d7b7f1c Merge branch 'WarehouseOrderRequest/fix-cancel-bug' into 'master'
fixed cancelling order and minified component

See merge request fronk/thetool!1174
2025-04-07 13:42:41 +00:00
Luca Haid 1ac70d907d fixed cancelling order and minified component 2025-04-07 15:42:27 +02:00
Luca Haid 3e462a6632 Merge branch 'Preorder/add-statusflag-history-to-export' into 'master'
added history timestamps to export

See merge request fronk/thetool!1173
2025-04-07 11:01:29 +00:00
Luca Haid ada64d6de3 added history timestamps to export 2025-04-07 13:01:17 +02:00
Luca Haid 759798fdb7 Merge branch 'Preorder/map-show-fcp-popup' into 'master'
added fcp popup to preorder

See merge request fronk/thetool!1172
2025-04-07 07:43:00 +00:00
Luca Haid 7c5dfb5fe6 added fcp popup to preorder 2025-04-07 09:42:48 +02:00
Luca Haid eb611a4f29 Merge branch 'Preorderlogistics/add-multiple-option' into 'master'
added concurrency to preorderlogistics

See merge request fronk/thetool!1171
2025-04-07 07:36:06 +00:00
Luca Haid 939a28b107 added concurrency to preorderlogistics 2025-04-07 09:35:56 +02:00
Luca Haid 192244bff9 Merge branch 'ConstructionConsent/add-electric-approval-filter' into 'master'
added filter electric_approval to ConstructionConsent

See merge request fronk/thetool!1170
2025-04-07 07:16:33 +00:00
Luca Haid f190043674 added filter electric_approval to ConstructionConsent 2025-04-07 09:15:43 +02:00
Luca Haid 117da0dec3 Merge branch 'ConstructionConsent/add-electric-approval-filter' into 'master'
added filter electric_approval to ConstructionConsent

See merge request fronk/thetool!1169
2025-04-07 06:57:42 +00:00
Luca Haid 2fcecb6df1 added filter electric_approval to ConstructionConsent 2025-04-07 08:57:13 +02:00
Luca Haid 5825383aaf Updated Menu Mobile_hide 2025-04-03 09:56:41 +00:00
Luca Haid c9d9d64c41 Merge branch 'RimoFCP/integrate' into 'master'
added fcps to preorder map

See merge request fronk/thetool!1161
2025-04-02 07:38:03 +00:00
Luca Haid 53b5f7289e added fcps to preorder map 2025-04-02 09:37:24 +02:00
Luca Haid 21fe2565a1 Merge branch 'RimoFCP/integrate' into 'master'
fixed using correct credentials

See merge request fronk/thetool!1158
2025-04-01 13:26:38 +00:00
Luca Haid 68f6666ca6 fixed using correct credentials 2025-04-01 15:26:18 +02:00
Luca Haid 29c31f18f4 Merge branch 'RimoFCP/integrate' into 'master'
Added FCPs to TheTool

See merge request fronk/thetool!1157
2025-04-01 13:19:59 +00:00
Luca Haid 97529ba95f Added FCPs to TheToolAdded WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-04-01 15:19:18 +02:00
Luca Haid 5e01b64c25 Update Index.php 2025-04-01 09:54:48 +00:00
Luca Haid a802ff8e05 Merge branch 'Warehouse/fix-and-improve' into 'master'
Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point

See merge request fronk/thetool!1156
2025-03-31 13:14:15 +00:00
Luca Haid e842d37f98 Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-03-31 15:13:34 +02:00
Luca Haid 757db66025 Merge branch 'Warehouse/fix-and-improve' into 'master'
Fixed Article Packets and Shipping Note Text Entry

See merge request fronk/thetool!1155
2025-03-31 12:23:09 +00:00
Luca Haid d33d93867f Fixed Article Packets and Shipping Note Text Entry 2025-03-31 14:22:44 +02:00
Luca Haid 02ce43279f Merge branch 'Preorderlogistics/only-show-status-140' into 'master'
only show status 140

See merge request fronk/thetool!1147
2025-03-26 11:04:39 +00:00
Luca Haid af1c716998 only show status 140 2025-03-26 12:03:47 +01:00
Luca Haid 21f3677429 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1146
2025-03-25 16:15:21 +00:00
Luca Haid 39c54a86f9 made preorderlogistics working again 2025-03-25 17:14:49 +01:00
Luca Haid 2c59a5c6c4 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1145
2025-03-25 16:13:27 +00:00
Luca Haid 33b36c6296 made preorderlogistics working again 2025-03-25 17:13:08 +01:00
Luca Haid 7b7bf8028d Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1144
2025-03-25 14:25:34 +00:00
Luca Haid 83c5b11987 added new features 2025-03-25 15:25:07 +01:00
Luca Haid e9a61eac78 Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1143
2025-03-25 12:49:50 +00:00
Luca Haid af6a4e02f5 added new features 2025-03-25 13:49:16 +01:00
Luca Haid 0448daaf59 Merge branch 'ConstructionConsent/add-permission' into 'master'
fixed menu

See merge request fronk/thetool!1141
2025-03-25 09:44:18 +00:00
Luca Haid c94d7de181 fixed menu 2025-03-25 10:43:59 +01:00
Luca Haid 2dfa4e34b2 Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1140
2025-03-25 09:41:34 +00:00
Luca Haid b429862948 added contact edit button 2025-03-25 10:41:19 +01:00
Luca Haid 120d3cab4a Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1139
2025-03-25 09:38:52 +00:00
Luca Haid 321726718f added contact edit button 2025-03-25 10:38:20 +01:00
Luca Haid aa7f0c9108 Merge branch 'ConstructionConsent/add-edit-button' into 'master'
added contact edit button

See merge request fronk/thetool!1138
2025-03-25 07:33:01 +00:00
Luca Haid 7be3446383 added contact edit button 2025-03-25 08:32:25 +01:00
Luca Haid 2d5c4e8690 Update WarehouseShippingNoteController.php 2025-03-24 13:53:06 +00:00
Luca Haid cccdede1de Merge branch 'WarehouseShippingNote/improve' into 'master'
Fixed Issue with PDF and Typing

See merge request fronk/thetool!1136
2025-03-24 12:11:08 +00:00
Luca Haid 6c946cd137 Fixed Issue with PDF and Typing 2025-03-24 13:10:42 +01:00
Luca Haid 5e2824b50c Update WarehouseShippingNote.js 2025-03-24 08:53:26 +00:00
Luca Haid 390165bc5e Update WarehouseShippingNote.js 2025-03-24 08:51:10 +00:00
Luca Haid a56e212085 Update WarehouseShippingNote.js 2025-03-24 08:48:24 +00:00
Luca Haid aebb463b74 Merge branch 'WarehouseShippingNote/add-viewer-mode' into 'master'
Added viewer mode

See merge request fronk/thetool!1131
2025-03-21 11:12:31 +00:00
Luca Haid 5b8441dde1 Added viewer mode 2025-03-21 12:08:03 +01:00
Luca Haid b8649a77e2 Fixed Ingena Permission 2025-03-21 10:14:11 +00:00
Luca Haid 2dc3509ff7 Fixed position-manager 2025-03-21 09:30:26 +00:00
Luca Haid ff01974efa Merge branch 'WarehouseShippingNote/remove-console-log' into 'master'
Removed Console Logs

See merge request fronk/thetool!1130
2025-03-21 08:11:44 +00:00
Luca Haid e319f2bf10 Removed Console Logs 2025-03-21 09:11:10 +01:00
Luca Haid 36a1519ff6 Merge branch 'WarehouseShippingNote/fix-hour-entry' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1129
2025-03-21 08:02:25 +00:00
Luca Haid 027338f93d Updated Shipping Note 2025-03-21 09:01:47 +01:00
Luca Haid 88ddd21098 Merge branch 'WarehouseShippingNote/add-customer-search' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1126
2025-03-20 13:49:14 +00:00
Luca Haid d9a2ba1ef4 Updated Shipping Note 2025-03-20 14:48:54 +01:00
Luca Haid 3f8be39626 Merge branch 'WarehouseShippingNote/add-loader' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1125
2025-03-20 13:18:57 +00:00
Luca Haid b293167527 Updated Shipping Note 2025-03-20 14:09:23 +01:00
Luca Haid 438cd85d5f Merge branch 'ShippingNote/rework' into 'master'
Shipping note/rework

See merge request fronk/thetool!1124
2025-03-20 12:14:35 +00:00
Luca Haid d6d84088fb Shipping note/rework 2025-03-20 12:14:34 +00:00
Luca Haid 96ed8caaeb Update PreorderModel.php 2025-03-20 08:41:29 +00:00
Luca Haid 5fb3a3d789 Update PreorderModel.php 2025-03-20 08:39:08 +00:00
Luca Haid 20e1740ad5 Update PreorderModel.php 2025-03-20 08:37:39 +00:00
Luca Haid e56750c534 Update ConstructionConsentOwnerController.php 2025-03-18 11:41:17 +00:00
Luca Haid b24647539a Update User.js 2025-03-17 09:17:44 +00:00
Luca Haid 3a549046f3 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1120
2025-03-17 08:58:57 +00:00
Luca Haid 945cb9cc06 User/rework 2025-03-17 08:58:56 +00:00
Luca Haid 14854260d0 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1118
2025-03-17 08:56:55 +00:00
Luca Haid e28dddc2e2 User/rework 2025-03-17 08:56:54 +00:00
Luca Haid 128cbfe770 Update Consentform.pdf.php 2025-03-13 11:42:29 +00:00
Luca Haid 2a5b0dc371 fixed issue with errors in production 2025-03-13 08:11:47 +00:00
Luca Haid c7185d986b Update ConstructionConsent.php 2025-03-12 14:24:04 +00:00
Luca Haid 70531717d6 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1109
2025-03-12 14:07:36 +00:00
Luca Haid e887dd9019 Construction consent/fix event 2025-03-12 14:07:36 +00:00
Luca Haid 212c16fc5b Reverted Changes 2025-03-12 14:03:15 +00:00
Luca Haid c84e327955 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1106
2025-03-12 14:01:56 +00:00
Luca Haid 6dc7fc58fc Construction consent/fix event 2025-03-12 14:01:55 +00:00