Commit Graph

339 Commits

Author SHA1 Message Date
3479e5ed8a Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into front-styles 2026-04-17 08:04:24 +02:00
52d58d05eb fix: add product page 2026-04-17 08:04:21 +02:00
931840c243 Merge pull request 'expand orders' (#75) from expand_orders into main
Reviewed-on: #75
2026-04-16 14:25:59 +00:00
Daniel Goc
d73dad8975 merge and small bugfix 2026-04-16 15:02:38 +02:00
Daniel Goc
7995177fe1 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into expand_orders 2026-04-16 15:01:45 +02:00
70e0e23ace Merge pull request 'feat: implement logger' (#74) from logger into main
Reviewed-on: #74
Reviewed-by: goc_daniel <goc_daniel@ma-al.com>
2026-04-16 13:00:47 +00:00
9961d90fa7 feat: implement logger 2026-04-16 14:46:09 +02:00
Daniel Goc
f435a8839b expand orders 2026-04-16 11:47:55 +02:00
2d9e45b81c Merge remote-tracking branch 'origin/translate' into front-styles 2026-04-16 09:42:10 +02:00
9b525f06cd fix: cart 2026-04-16 09:40:04 +02:00
cf48624d7f Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-16 08:34:33 +02:00
d115fec237 Merge remote-tracking branch 'origin/main' into front-styles 2026-04-15 16:01:01 +02:00
62aafdc11a fix: addresses 2026-04-15 16:00:42 +02:00
5b6ee6d57a Merge remote-tracking branch 'origin/translate' into front-styles 2026-04-15 13:54:24 +02:00
5a0765426a fix: cart 2026-04-15 13:53:05 +02:00
632e3afae3 Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-15 13:47:29 +02:00
574e241c8a fix: migrations 2026-04-15 13:42:36 +02:00
b13293572c fix: cart 2026-04-15 13:37:46 +02:00
7bce04e05a Merge pull request 'is_oem' (#72) from is_oem into main
Reviewed-on: #72
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-04-15 11:32:43 +00:00
9a90de3f11 Merge pull request 'no-vat-customers' (#71) from no-vat-customers into main
Reviewed-on: #71
2026-04-15 11:32:13 +00:00
Daniel Goc
754bf2fe01 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into is_oem 2026-04-15 13:20:26 +02:00
Daniel Goc
2ca07f03ce expanded by is_oem 2026-04-15 13:19:28 +02:00
6efb39edf7 Merge branch 'no-vat-customers' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers 2026-04-15 12:58:37 +02:00
e9af4bf311 feat: add no vat customers logic 2026-04-15 12:58:23 +02:00
cc570cc6a8 Merge branch 'main' into no-vat-customers 2026-04-15 10:57:16 +00:00
1bf706dcd0 feat: add no vat customers logic 2026-04-15 12:55:14 +02:00
be0687f4a9 Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-15 12:53:00 +02:00
bfcfbb36c8 Merge remote-tracking branch 'origin/translate' into front-styles 2026-04-15 12:50:11 +02:00
19e3f6f0ed Merge remote-tracking branch 'origin/translate' into front-styles 2026-04-15 12:48:21 +02:00
46f4618301 fix: migrations 2026-04-15 12:47:10 +02:00
e335c3aa6f fix: cart 2026-04-15 12:42:20 +02:00
5ebf21c559 Merge remote-tracking branch 'origin/main' into front-styles 2026-04-15 12:08:59 +02:00
84b4c70ffb Merge pull request 'bugfix' (#70) from countries_bugfix into main
Reviewed-on: #70
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-04-15 10:00:41 +00:00
Daniel Goc
2fd9472db1 bugfix 2026-04-15 11:48:29 +02:00
66df535317 Merge pull request 'expand_carts' (#69) from expand_carts into main
Reviewed-on: #69
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-04-15 09:19:16 +00:00
e31ecda582 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers 2026-04-15 11:14:40 +02:00
c97251c15b Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-15 08:18:08 +02:00
5663c4e126 fix: addresses 2026-04-14 15:57:45 +02:00
fa85c34794 fix: cart 2026-04-14 15:56:48 +02:00
Daniel Goc
e0a86febc4 add missing permission 2026-04-14 15:52:45 +02:00
1d257d82d3 Merge remote-tracking branch 'origin/main' into front-styles 2026-04-14 15:45:36 +02:00
Daniel Goc
40154ec861 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into expand_carts 2026-04-14 15:43:44 +02:00
Daniel Goc
bb507036db change add-product endpoint + remove-product 2026-04-14 15:42:30 +02:00
80a1314dc0 Merge pull request 'some small fixes' (#68) from small_fixes into main
Reviewed-on: #68
2026-04-14 13:16:17 +00:00
Daniel Goc
100a9f57d4 some small fixes 2026-04-14 14:08:57 +02:00
773e7d3c20 Merge pull request 'feat: lookup by id in customer search' (#61) from cust-search into main
Reviewed-on: #61
2026-04-14 11:42:56 +00:00
8e063978a8 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers 2026-04-14 13:40:37 +02:00
03a0e5ea64 Merge branch 'main' into cust-search 2026-04-14 11:39:18 +00:00
ce8c19f715 Merge pull request 'feat: make routing per role, add unlogged role' (#67) from routing-per-role into main
Reviewed-on: #67
Reviewed-by: goc_daniel <goc_daniel@ma-al.com>
2026-04-14 11:39:13 +00:00
31a2744131 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers 2026-04-14 13:36:11 +02:00