Commit Graph

1237 Commits

Author SHA1 Message Date
Luca Haid
4876fc3fd0 Merge branch 'bugfix/e-shop' into 'master'
added shipping notes for warehouse e shop

See merge request fronk/thetool!659
2024-10-10 09:20:37 +00:00
6b2e0eb14e added shipping notes for warehouse e shop 2024-10-10 11:19:35 +02:00
Luca Haid
7d4d8d9b58 Merge branch 'bugfix/create-locations-action' into 'master'
fixed createLocations Action not working

See merge request fronk/thetool!656
2024-10-10 07:34:43 +00:00
8fdab0a1bf fixed createLocations Action not working 2024-10-10 09:34:24 +02:00
Luca Haid
5814988016 Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!655
2024-10-10 06:54:14 +00:00
ea5a25ea03 update for warehouse 2024-10-10 08:53:49 +02:00
Luca Haid
6eda9de0dd Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!654
2024-10-10 06:52:01 +00:00
c57eef6e8d update for warehouse 2024-10-10 08:49:50 +02:00
Frank Schubert
b5f06932a2 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!653
2024-10-09 15:46:27 +00:00
Frank Schubert
cb71af915f same for thetool OAIDs 2024-10-09 17:46:04 +02:00
Frank Schubert
50bfe05443 Preorder save() now handles OAID of changeing Wohneinheit 2024-10-09 17:20:08 +02:00
Frank Schubert
8ae8c4e3ac Merge branch 'fronkdev' into 'master'
Added script to delete OAIDs incl. all linked data from Preorders

See merge request fronk/thetool!652
2024-10-09 14:55:00 +00:00
Frank Schubert
a64dc497e0 Added script to delete OAIDs incl. all linked data from Preorders 2024-10-09 16:54:11 +02:00
Frank Schubert
3c528ff657 Merge branch 'fronkdev' into 'master'
Added Sprachtarif to Contractqueue

See merge request fronk/thetool!649
2024-10-03 16:21:25 +00:00
Frank Schubert
6b7bf26df3 Added Sprachtarif to Contractqueue 2024-10-03 18:20:46 +02:00
Frank Schubert
5b4f84d128 Merge branch 'fronkdev' into 'master'
Contract: Fixed finish- and cancel date by handling

See merge request fronk/thetool!648
2024-10-03 15:16:29 +00:00
Frank Schubert
280e3e06de Contract: Fixed finish- and cancel date by handling 2024-10-03 17:15:35 +02:00
Frank Schubert
e50aa2c509 Merge branch 'fronkdev' into 'master'
snopp opsdata api connected/active status for estmk networks

See merge request fronk/thetool!647
2024-09-30 14:03:00 +00:00
Frank Schubert
fa404eec3c snopp can also update active state for estmk networks now 2024-09-30 16:01:23 +02:00
Frank Schubert
f52aa5825c added estmk networks for conneced state update in opsdata api 2024-09-30 15:43:18 +02:00
Luca Haid
050f820525 Merge branch 'feature/update-warehouse' into 'master'
fixed creating csv

See merge request fronk/thetool!646
2024-09-27 10:29:02 +00:00
8a2b8c0b20 fixed creating csv 2024-09-27 12:27:54 +02:00
Frank Schubert
87dde4a132 Merge branch 'fronkdev' into 'master'
only importing active campaigns in Opsdata Api

See merge request fronk/thetool!644
2024-09-26 16:18:41 +00:00
Frank Schubert
084cdb13f1 only importing active campaigns in Opsdata Api 2024-09-26 18:18:11 +02:00
Frank Schubert
8f96676d76 Merge branch 'fronkdev' into 'master'
Fixed statusflags only set on Adddresses with Preorder and added snopp

See merge request fronk/thetool!643
2024-09-26 15:32:11 +00:00
Frank Schubert
e325e19b05 Fixed statusflags only set on Adddresses with Preorder and added snopp
connected api
2024-09-26 17:31:07 +02:00
Frank Schubert
646c932592 Merge branch 'fronkdev' into 'master'
fixed wrong comment

See merge request fronk/thetool!642
2024-09-25 12:46:53 +00:00
Frank Schubert
145e07b688 fixed wrong comment 2024-09-25 14:46:29 +02:00
Frank Schubert
b9a31dfeac Merge branch 'fronkdev' into 'master'
removed status update in AddressDB/Index

See merge request fronk/thetool!641
2024-09-25 12:45:38 +00:00
Frank Schubert
d4eca0fa36 removed status update in AddressDB/Index 2024-09-25 14:44:57 +02:00
Frank Schubert
939873de80 Merge branch 'fronkdev' into 'master'
Added status id and flag filter to AddressDB/Index

See merge request fronk/thetool!640
2024-09-25 12:41:03 +00:00
Frank Schubert
0ab70aaff3 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-09-25 14:40:09 +02:00
Frank Schubert
dbc0336d52 Added status id and flag filter to AddressDB/Index 2024-09-25 14:39:38 +02:00
Frank Schubert
1aa7adecf6 Merge branch 'fronkdev' into 'master'
Fixed price with comma in PreorderApi submitPreorder()

See merge request fronk/thetool!639
2024-09-20 11:09:43 +00:00
Frank Schubert
e550004368 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-09-20 13:09:15 +02:00
Frank Schubert
0cdc1cbd12 Fixed price with comma in PreorderApi submitPreorder() 2024-09-20 13:06:59 +02:00
bbc34bcfc0 fixed table definition 2024-09-20 11:23:05 +02:00
3eeb0d3697 added new tracking support 2024-09-20 11:13:08 +02:00
Frank Schubert
04ff6cf758 Fixed email header bug which would become a major issue with PHP8 2024-09-18 16:23:24 +02:00
Daniel Spitzer
82fba3eb5b Externe Referenz Fix 2024-09-18 09:45:22 +02:00
Daniel Spitzer
24e00899cb Externe Referenz Fix 2024-09-18 09:34:28 +02:00
Daniel Spitzer
e8dcd81f40 Externe Referenz Fix 2024-09-18 09:24:06 +02:00
Frank Schubert
65e212615b Merge branch 'fronkdev' into 'master'
Added Mailtemplate::renderBody() function

See merge request fronk/thetool!631
2024-09-17 16:19:37 +00:00
Frank Schubert
ade1e0897f Added Mailtemplate::renderBody() function 2024-09-17 18:18:38 +02:00
f5dde09ea5 added new et ref field for eshop 2024-09-12 08:36:14 +02:00
19e786abd0 fixed typo 2024-09-10 13:57:29 +02:00
d97cd56f01 fixed utf8 encoding in email 2024-09-10 13:56:27 +02:00
4305c9f473 fixed utf8 encoding in email 2024-09-10 13:55:07 +02:00
335a3be876 fixed email not sending 2024-09-10 13:45:46 +02:00
11e2b6f2e2 added confirmation email for eshop 2024-09-10 13:43:32 +02:00