Commit Graph

2278 Commits

Author SHA1 Message Date
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
8165f03a74 Merge branch 'fronkdev' into 'master'
added importing service active state (preorder 500) in rimo import

See merge request fronk/thetool!645
2024-09-26 19:33:33 +00:00
Frank Schubert
a193958c33 added importing service active state (preorder 500) in rimo import 2024-09-26 21:32:38 +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
383543721b Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-09-26 17:31:36 +02: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
f27ce3bb75 Fixed statusflags only set on Adddresses with Preorder 2024-09-26 17:30:00 +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
Luca Haid
4ce85bcad8 Merge branch 'warehouse-add-email-parsing' into 'master'
fixed table definition

See merge request fronk/thetool!638
2024-09-20 09:23:35 +00:00
bbc34bcfc0 fixed table definition 2024-09-20 11:23:05 +02:00
Luca Haid
9d27acd82d Merge branch 'warehouse-add-email-parsing' into 'master'
added new tracking support

See merge request fronk/thetool!637
2024-09-20 09:17:07 +00:00
5b2a8e1001 added new tracking support 2024-09-20 11:16:41 +02:00
Luca Haid
d4cd3128d6 Merge branch 'warehouse-add-email-parsing' into 'master'
added new tracking support

See merge request fronk/thetool!636
2024-09-20 09:14:04 +00: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
aae4443f01 Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!635
2024-09-18 08:18:10 +00:00
Daniel Spitzer
07b3edbf3d Externe Referenz Fix 2024-09-18 10:15:07 +02:00
Daniel Spitzer
299473aee0 Merge branch 'spidev' into 'master'
Externe Referenz Fix Revert

See merge request fronk/thetool!634
2024-09-18 07:46:44 +00:00
Daniel Spitzer
82fba3eb5b Externe Referenz Fix 2024-09-18 09:45:22 +02:00
Daniel Spitzer
059dff3cf7 Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!633
2024-09-18 07:35:02 +00:00
Daniel Spitzer
24e00899cb Externe Referenz Fix 2024-09-18 09:34:28 +02:00
Daniel Spitzer
fb9dad9b0e Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!632
2024-09-18 07:25:30 +00: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
Luca Haid
ace714413b Merge branch 'feature/warehouse-improvement' into 'master'
added new et ref field for eshop

See merge request fronk/thetool!630
2024-09-12 06:45:23 +00: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
39c1604db4 added confirmation email for eshop 2024-09-10 12:47:03 +02:00
Luca Haid
432828dd27 Merge branch 'feature/warehouse-improvement' into 'master'
fixed typo

See merge request fronk/thetool!629
2024-09-10 09:57:47 +00:00
Luca Haid
a47bd176eb Merge branch 'feature/warehouse-improvement' into 'master'
Feature/warehouse improvement

See merge request fronk/thetool!628
2024-09-10 09:56:44 +00:00
Luca Haid
0d65e2c1bd Merge branch 'feature/warehouse-improvement' into 'master'
fixed email not sending

See merge request fronk/thetool!627
2024-09-10 09:46:30 +00:00
Luca Haid
ca525d998b Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!626
2024-09-10 09:44:06 +00:00
Luca Haid
e6d5f7ce4c Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!625
2024-09-10 08:47:31 +00:00