Commit Graph

2623 Commits

Author SHA1 Message Date
Frank Schubert
e2fb373b4c Merge branch 'fronkdev' into 'master'
Added Preorderselfservice API

See merge request fronk/thetool!806
2024-12-11 14:48:17 +00:00
Frank Schubert
2c4a84b95d Added Preorderselfservice API 2024-12-11 15:45:46 +01:00
Frank Schubert
a20d7b9d34 Merge branch 'fronkdev' into 'master'
Showing unit OAID & preorder count in Preorder/Form

See merge request fronk/thetool!805
2024-12-11 12:05:55 +00:00
Frank Schubert
2154b326c2 Showing unit OAID & preorder count in Preorder/Form 2024-12-11 13:04:26 +01:00
Luca Haid
bc97bcb9a9 Update WarehouseShippingNoteController.php 2024-12-11 10:02:55 +00:00
Luca Haid
f541dcdb55 Merge branch 'feature/tt-button-fix' into 'master'
Fixed Error when no additional class was set

See merge request fronk/thetool!804
2024-12-11 08:53:37 +00:00
Luca Haid
444b740b31 Merge branch 'feature/warehouse-improve-2' into 'master'
Feature/warehouse improve 2

See merge request fronk/thetool!803
2024-12-10 14:41:21 +00:00
Luca Haid
9fb8758ac4 Feature/warehouse improve 2 2024-12-10 14:41:20 +00:00
Luca Haid
8bd8ed8619 Merge branch 'feature/warehouse-improve-2' into 'master'
Feature/warehouse improve 2

See merge request fronk/thetool!802
2024-12-10 13:55:53 +00:00
Luca Haid
2b14953318 Feature/warehouse improve 2 2024-12-10 13:55:53 +00:00
Luca Haid
7c0491cdff Merge branch 'eshop-only-admin-price' into 'master'
fixed error if no articlenumber is found

See merge request fronk/thetool!801
2024-12-10 13:06:42 +00:00
Luca Haid
efdf432511 fixed error if no articlenumber is found 2024-12-10 14:05:42 +01:00
Luca Haid
ec23d40caf Merge branch 'eshop-only-admin-price' into 'master'
dont show price for non admins

See merge request fronk/thetool!800
2024-12-10 12:57:01 +00:00
Luca Haid
c73bc38084 dont show price for non admins 2024-12-10 13:56:06 +01:00
Luca Haid
d275d6823d Merge branch 'fix-eshop-shipping-note' into 'master'
added articlenumber for article and shipping note

See merge request fronk/thetool!799
2024-12-10 12:51:24 +00:00
Luca Haid
77fd40dd9d added articlenumber for article and shipping note 2024-12-10 13:49:24 +01:00
Daniel Spitzer
36fbf7a087 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!798
2024-12-10 11:48:47 +00:00
Daniel Spitzer
8ad4d465ef Kalender
Update:
* CSS Updates
* State-Save Fixes
2024-12-10 12:46:44 +01:00
Luca Haid
39548df762 Merge branch 'fix-eshop-shipping-note' into 'master'
Fixed Bug when creating warehouse e shop shipping note

See merge request fronk/thetool!797
2024-12-10 11:14:20 +00:00
Daniel Spitzer
ff5b148494 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!796
2024-12-10 11:11:44 +00:00
Luca Haid
02a1106f5b Fixed Bug when creating warehouse e shop shipping note 2024-12-10 12:11:38 +01:00
Daniel Spitzer
b479f33bfe Kalender
Update:
* Kalender Rechte sync Script Implementation
2024-12-10 12:09:30 +01:00
Luca Haid
2a5ebe4386 Merge branch 'fix-tt-autocomplete' into 'master'
Fixed Bug when typing that the first character is dismissed when clearing the input field

See merge request fronk/thetool!795
2024-12-10 10:52:31 +00:00
Luca Haid
18de84fcae Fixed Bug when typing that the first character is dismissed when clearing the input field 2024-12-10 11:52:10 +01:00
Luca Haid
71630e1ee4 Merge branch 'feature/hide-warehouse-price' into 'master'
allow changing status

See merge request fronk/thetool!794
2024-12-10 08:31:01 +00:00
Luca Haid
fe77295648 allow changing status 2024-12-10 09:23:42 +01:00
Luca Haid
7309fdb840 Merge branch 'feature/hide-warehouse-price' into 'master'
hiding prices on shipping note for now on

See merge request fronk/thetool!793
2024-12-10 07:07:10 +00:00
Luca Haid
4130e33153 hiding prices on shipping note for now on 2024-12-10 08:06:30 +01:00
Frank Schubert
6c99ac34df Merge branch 'fronkdev' into 'master'
Preorder Status Trigger Email done

See merge request fronk/thetool!792
2024-12-09 15:49:04 +00:00
Frank Schubert
72367e2a63 Preorder Status Trigger Email done 2024-12-09 16:47:11 +01:00
Frank Schubert
25d4e8271f WIP Preordercampaign Status Mailtemplate 2024-12-09 13:20:12 +01:00
Luca Haid
a2b8a7b282 Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note

See merge request fronk/thetool!791
2024-12-09 12:19:53 +00:00
Luca Haid
9c8c57561a changed shipping note 2024-12-09 13:18:52 +01:00
Luca Haid
c0e9bd7b4b Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note

See merge request fronk/thetool!790
2024-12-09 12:16:48 +00:00
Luca Haid
d39ea5fa4c changed shipping note 2024-12-09 13:16:34 +01:00
Luca Haid
e87af8efd4 Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note

See merge request fronk/thetool!789
2024-12-09 12:15:07 +00:00
Luca Haid
5e5feb3ce6 changed shipping note 2024-12-09 13:14:44 +01:00
Daniel Spitzer
0434c5942b Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!788
2024-12-09 10:05:42 +00:00
Daniel Spitzer
535ff886c6 Kalender
Update:
* Bugfix Accept Title reset
2024-12-09 10:47:42 +01:00
Daniel Spitzer
23e640473a Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!787
2024-12-09 09:24:59 +00:00
Daniel Spitzer
0ea1949c5c Kalender
Update:
* Bugfix Kunden-Info
2024-12-09 10:24:00 +01:00
Daniel Spitzer
5ae7b1a4af Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!786
2024-12-08 19:15:29 +00:00
Daniel Spitzer
b8e8729eff Kalender
Update:
* Änderungen bei Serienterminen wurden derweilen deaktiviert
2024-12-08 20:14:40 +01:00
Daniel Spitzer
f2db64e8ef Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!785
2024-12-08 19:01:11 +00:00
Daniel Spitzer
08a6cd924e Kalender
Update:
* Änderungen bei Serienterminen wurden derweilen deaktiviert
2024-12-08 19:53:24 +01:00
Daniel Spitzer
aaccf6e29b Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!784
2024-12-08 18:02:00 +00:00
Daniel Spitzer
08f7a15bf1 Kalender
Update:
* Suche wurde angepasst
2024-12-08 19:00:06 +01:00
Daniel Spitzer
b6a6fbf2b4 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!783
2024-12-08 11:43:58 +00:00
Daniel Spitzer
a6e087f8f1 Kalender
Update:
* Anpassungen Kalender Höhe Wochenansicht bei vielen Tagesterminen
* Css Bugfixes
2024-12-08 12:41:04 +01:00
Frank Schubert
08cbd1c6cd Merge branch 'fronkdev' into 'master'
Fixed Status type

See merge request fronk/thetool!782
2024-12-06 17:36:02 +00:00