Commit Graph

1343 Commits

Author SHA1 Message Date
Frank Schubert
74c2e23e43 Merge branch 'fronkdev' into 'master'
tweaked filters in send-maintenance-notifications.php

See merge request fronk/thetool!746
2024-11-14 20:22:25 +00:00
Frank Schubert
bbde6d3bd1 tweaked filters in send-maintenance-notifications.php 2024-11-14 21:21:48 +01:00
Frank Schubert
840eb9a34d Merge branch 'fronkdev' into 'master'
Added Cron script for MaintenanceNotification emails

See merge request fronk/thetool!744
2024-11-14 20:08:53 +00:00
Frank Schubert
10d1d8b6a8 Added Cron script for MaintenanceNotification emails 2024-11-14 21:07:56 +01:00
Frank Schubert
544d679f3f Merge branch 'fronkdev' into 'master'
Added Maintenanceinfo Api Controller

See merge request fronk/thetool!743
2024-11-14 18:57:52 +00:00
Frank Schubert
3f4b8b80c3 Added Maintenanceinfo Api Controller 2024-11-14 19:57:33 +01:00
Frank Schubert
6d0eda27dc Merge branch 'fronkdev' into 'master'
Added Maintenanceinfo Api Controller

See merge request fronk/thetool!742
2024-11-14 18:56:40 +00:00
Frank Schubert
86aefc975d Added Maintenanceinfo Api Controller 2024-11-14 19:55:56 +01:00
Frank Schubert
d182390aa4 Merge branch 'fronkdev' into 'master'
Added Button to create RimoWorkorder for legacytransfer Preorders

See merge request fronk/thetool!740
2024-11-14 16:36:52 +00:00
Frank Schubert
667027c0f1 Added Button to create RimoWorkorder for legacytransfer Preorders 2024-11-14 17:35:53 +01:00
Frank Schubert
ab56089468 Merge branch 'fronkdev' into 'master'
Fixed creating Workorders

See merge request fronk/thetool!738
2024-11-14 15:25:01 +00:00
Frank Schubert
3cb310face Fixed creating Workorders 2024-11-14 16:24:28 +01:00
Frank Schubert
676eff4814 Merge branch 'fronkdev' into 'master'
Added Preordertype legacytransfer + moved createWorkorder to Rimoapi

See merge request fronk/thetool!737
2024-11-14 15:08:21 +00:00
Frank Schubert
1fbccb62c5 Added Preordertype legacytransfer + moved createWorkorder to Rimoapi 2024-11-14 16:07:20 +01:00
Frank Schubert
0c74af0e9d Reformatted PreorderController.php 2024-11-14 14:34:28 +01:00
Frank Schubert
cf3fdb963a Merge branch 'fronkdev' into 'master'
MaintenanceNotification::getRecipients() can output a list of customers

See merge request fronk/thetool!736
2024-11-14 10:51:38 +00:00
Frank Schubert
d0aa315dca MaintenanceNotification::getRecipients() can output a list of customers 2024-11-14 11:51:00 +01:00
Luca Haid
5b19d136f1 Merge branch 'feature/improve-warehouse-shipping-note' into 'master'
Added some permissions for warehouse

See merge request fronk/thetool!734
2024-11-14 10:09:08 +00:00
Luca Haid
5914ac6320 Added some permissions for warehouse 2024-11-14 11:08:01 +01:00
Frank Schubert
a6c296a7e2 Merge branch 'fronkdev' into 'master'
fixed body

See merge request fronk/thetool!733
2024-11-13 17:29:45 +00:00
Frank Schubert
d63bda226d fixed body 2024-11-13 18:29:24 +01:00
Frank Schubert
7c106fab7f Merge branch 'fronkdev' into 'master'
added testmode for MaintenanceNotification

See merge request fronk/thetool!732
2024-11-13 17:25:51 +00:00
Frank Schubert
8f033e159c added testmode for MaintenanceNotification 2024-11-13 18:25:12 +01:00
Luca Haid
5153fc65a7 Merge branch 'feature/improve-warehouse-shipping-note' into 'master'
- Disabled default Car being ID:2

See merge request fronk/thetool!731
2024-11-13 17:17:05 +00:00
Luca Haid
c393d8e6a1 - Disabled default Car being ID:2
- Showing Message if User has no default car
2024-11-13 18:16:11 +01:00
Frank Schubert
4df4a7fbfc Merge branch 'fronkdev' into 'master'
Finished MaintenanceNotification

See merge request fronk/thetool!730
2024-11-13 17:16:08 +00:00
Frank Schubert
47f71f2310 Finished MaintenanceNotification 2024-11-13 18:15:24 +01:00
Luca Haid
5690f08892 Reworked Contract View to Vue.js 2024-11-13 13:51:49 +00:00
Luca Haid
c3bf25f668 Feature/shipping note refinements 2024-11-13 12:28:45 +00:00
Frank Schubert
54b6d18fe7 Merge branch 'fronkdev' into 'master'
Removed debugging

See merge request fronk/thetool!725
2024-11-13 12:09:40 +00:00
Frank Schubert
97dc4446dc Removed debugging 2024-11-13 13:09:12 +01:00
Frank Schubert
5ef2737612 Merge branch 'fronkdev' into 'master'
Fixed subject in MaintenanceNotification Index

See merge request fronk/thetool!723
2024-11-12 17:42:26 +00:00
Frank Schubert
b80b480fba Fixed subject in MaintenanceNotification Index 2024-11-12 18:41:52 +01:00
Frank Schubert
a13dcdecf5 Merge branch 'fronkdev' into 'master'
Added MaintenanceNotification

See merge request fronk/thetool!722
2024-11-12 17:31:53 +00:00
Frank Schubert
667a985293 Added MaintenanceNotification 2024-11-12 18:31:21 +01:00
Luca Haid
76b58543ee Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote

See merge request fronk/thetool!719
2024-11-12 17:25:30 +00:00
Luca Haid
e42a13041b Updated WarehouseShippingNote 2024-11-12 18:24:25 +01:00
Luca Haid
d8ea1bb7f5 Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8

See merge request fronk/thetool!718
2024-11-12 13:14:35 +00:00
Luca Haid
50228c36e4 fixed email fetching utf8 2024-11-12 14:14:15 +01:00
Luca Haid
85f8bfb57a Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8

See merge request fronk/thetool!717
2024-11-12 13:09:47 +00:00
Luca Haid
24676a67a0 fixed email fetching utf8 2024-11-12 14:09:02 +01:00
Luca Haid
b3bfc3edfc Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed for loop

See merge request fronk/thetool!715
2024-11-12 12:36:23 +00:00
Luca Haid
acf7dc151e fixed for loop 2024-11-12 13:34:31 +01:00
Daniel Spitzer
5095329963 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!713
2024-11-12 10:19:24 +00:00
Daniel Spitzer
413b730397 Kalender
Update:
* resource wurde bei Teilnehmern entfernt
* wenn es keinen Status für die Terminteilnahme gibt wird der busy Status hergenommen ohne Rahmeninformationen
2024-11-12 11:12:07 +01:00
Frank Schubert
dc80de5184 Merge branch 'fronkdev2' into 'master'
Added buildingType in ADB hausnummer and rimo import

See merge request fronk/thetool!711
2024-11-11 17:37:29 +00:00
Frank Schubert
632160dce9 Added buildingType in ADB hausnummer and rimo import 2024-11-11 18:36:45 +01:00
Daniel Spitzer
56b35eb665 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!707
2024-11-11 06:34:58 +00:00
Daniel Spitzer
8ab5f87109 Kalender
* Update Suche (Suche wird nun auf aktive Kalender eingeschränkt)
2024-11-11 07:33:23 +01:00
Daniel Spitzer
986168e1d3 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!706
2024-11-10 20:49:29 +00:00