Commit Graph

106 Commits

Author SHA1 Message Date
Andreas Palm
17d2a3d2da Merge branch 'master' into cleanup 2024-11-05 23:05:13 +01:00
Andreas Palm
1985a69cfa Tracking Status from Sendcloud fixes 2024-11-05 14:33:57 +01:00
Andreas Palm
6b5527ee79 Merge branch 'matrixproducts' into cleanup
# Conflicts:
#	www/dist/.vite/manifest.json
#	www/dist/modules/MatrixProduct-PtaGHDSi.js
2024-10-30 09:20:32 +01:00
Andreas Palm
4ac3f507db Bugfix MatrixProdukte 2024-10-29 21:03:24 +01:00
Andreas Palm
44b8dc0fe0 Remove Google Cloud Print 2024-10-28 10:46:22 +01:00
Andreas Palm
57e79d442c Remove Ioncube and License stuff 2024-10-28 10:14:32 +01:00
Andreas Palm
aad77a350d Small fixes and selectable separator when creating variants 2024-10-25 12:23:19 +02:00
Andreas Palm
b59bd65635 Update primevue to v4 2024-10-04 22:49:08 +02:00
Andreas Palm
e3488040ec Tracking Status from Sendcloud 2024-09-28 23:16:51 +02:00
Andreas Palm
84c34fa151 Merge branch 'refs/heads/master' into cleanup 2024-09-28 23:15:07 +02:00
OpenXE
24f6623016 bugfix OrderStatusUpdateRequest shipments default value empty array 2024-09-15 16:32:38 +02:00
Andreas Palm
0d375668f8 Update packages, improve vite integration 2024-09-11 23:10:39 +02:00
OpenXE
6afedcd423 Merge onlineshops development into onlineshops 2024-08-31 13:17:22 +02:00
Andreas Palm
7675f93034 FIX Shopimport: Update shop orders without shipments 2024-08-25 21:50:50 +02:00
OpenXE
4351fd7b9d Merge branch 'master' into mirakl 2024-08-25 20:16:38 +02:00
OpenXE
5ad57e2fc8 bugfix TOTP, additional database entries needed: login_password_check_otp (hook), TOTPCheckLogin (hook_register) 2024-08-11 12:52:06 +02:00
OpenXE
22620698a1 Merge branch 'master' into mirakl 2024-07-23 11:27:45 +02:00
OpenXE
612483b5e7 Merge branch 'exciler_pr' 2024-07-14 09:56:20 +02:00
OpenXE
448d49ad6d Logger added log levels public 2024-06-28 15:48:39 +02:00
OpenXE
52b64ef8bc Reimplemented ticket autoresponder blacklist 2024-06-02 19:34:27 +02:00
OpenXE
63aaaf96ee Prioritize ghostscript over fpdi for merging of PDFs 2024-05-16 12:55:31 +02:00
Andreas Palm
05906533dd Filter supported subscription cycle types to prevent errors 2024-04-25 19:47:32 +02:00
Andreas Palm
386d1b0f29 Merge branch 'refs/heads/exciler_pr' into matrixartikel 2024-04-24 15:44:25 +02:00
Andreas Palm
db1ab2baf0 MatrixProduct: Add function to create missing Variants, some bugfixes 2024-04-24 15:44:08 +02:00
Andreas Palm
c834816e19 Improve Scheduler task with try-catch-finally. Jobs should be deleted from db on error to prevent looping. Also errors should be logged 2024-04-23 22:18:11 +02:00
Andreas Palm
ba18467d33 MatrixProduct remove left over debug output 2024-04-15 22:13:58 +02:00
OpenXE
ba17741470 ticket improved attachment handling when no content-disposition is giving 2024-04-11 16:12:47 +02:00
OpenXE-ERP
d18c17c797
Merge pull request #128 from exciler/matrixartikel
Matrixartikel RC1
2024-04-07 14:39:19 +02:00
OpenXE-ERP
6fb17e9945
Merge pull request #133 from exciler/tracking_versandpakete
Tracking versandpakete
2024-04-07 14:35:51 +02:00
Andreas Palm
fecf7f5923 Followup versandpakete: verkaufszahlen 2024-04-04 15:12:26 +02:00
Andreas Palm
1ab2bea2f1 Fix broken ShopUpdates after move to "versandpakete" 2024-04-03 22:02:13 +02:00
OpenXE
aa8cab4440 Bugfix Importvorlage copy 2024-04-01 10:46:31 +00:00
Andreas Palm
59c567aa00 Improve Sendcloud error handling, prevent multiple form submission 2024-03-27 00:17:00 +01:00
OpenXE-ERP
37ed5ba246
Merge pull request #130 from exciler/shopware6_improvements
Shopware6 improvements
2024-03-26 10:34:20 +01:00
Andreas Palm
10c077006d Shopware6: fix extended Prices 2024-03-25 21:25:36 +01:00
OpenXE
5a2d144ad7 Sendcloud ParcelCreation added additional rule for DPD order_number 2024-03-25 14:25:16 +00:00
OpenXE
8c1f434833 Sendcloud ParcelCreation added additional rules for DPD 2024-03-20 10:06:09 +00:00
OpenXE
632f1c1a09 Sendcloud bugfix text field lengths 2024-03-19 17:13:30 +00:00
Andreas Palm
f442555156 Small bugfix regarding groupEdits 2024-03-15 22:22:27 +01:00
Andreas Palm
a0cf65fc45 MatrixProdukt: Translations 2023-12-11 22:13:37 +01:00
Andreas Palm
0583406650 Cleanup / Copyright 2023-12-11 11:21:39 +01:00
Andreas Palm
a0d4cd1ff3 Matrixproducts first beta 2023-12-11 11:13:30 +01:00
OpenXE-ERP
33aa53b7c5
Merge pull request #103 from exciler/subscriptioncycle-zahlzyklus
Enable "Zahlzyklus" in "Abolauf"
2023-12-10 10:22:24 +01:00
OpenXE-ERP
aabdc74af6
Merge pull request #104 from exciler/shopware-multiVersion
Make Shopware-Lib compatible with 6.x
2023-12-10 10:21:55 +01:00
OpenXE
088ad4555c ticketregeln added adresse 2023-11-25 11:24:23 +01:00
Andreas Palm
4dd8b01ea9 Shopware6: remove "v2" part from URL in Client-lib as well, set pseudolager default to 0 instead of empty string 2023-09-19 14:26:40 +02:00
Andreas Palm
150381a20f Enable "Zahlzyklus" in "Abolauf" 2023-09-19 14:02:01 +02:00
OpenXE
5408f197fd improved date format conversion with exception on ticket import with wrongly specified date 2023-08-07 14:57:45 +02:00
OpenXE
6242024451 Bugfix ticket system filter for spam 2023-08-03 12:01:23 +02:00
Roland Rusch
ca5e5c52a1 #1 OpenXE does not run on Windows 2023-07-14 08:53:01 +02:00