|
|
42618fef79
|
Merge remote-tracking branch 'remotes/origin/rel_2.x'
# Conflicts:
# Modules/Core/ViewConfig.php
|
2023-09-13 16:18:43 +02:00 |
|
|
|
f02c40cfb7
|
Merge remote-tracking branch 'remotes/origin/rel_1.x'
# Conflicts:
# Application/views/admin/de/module_options.php
# Application/views/ga4/view_item_list.tpl
# CHANGELOG.md
# Docs/README.md
# IntelliSenseHelper.php
# Modules/Core/ViewConfig.php
# metadata.php
|
2023-09-13 16:13:03 +02:00 |
|
|
|
da2966626e
|
cleaning; adjust not set param handling
|
2023-09-13 15:15:49 +02:00 |
|
|
|
6fcee0671f
|
adjust set-param check
|
2023-09-13 15:15:22 +02:00 |
|
|
|
bb513e6ded
|
adjust set-param check
|
2023-09-13 15:13:35 +02:00 |
|
|
|
f64eb35763
|
switch control-param name
|
2023-09-13 15:09:27 +02:00 |
|
|
|
36b3aa9ef2
|
switch param-name
|
2023-09-13 15:08:58 +02:00 |
|
|
|
b2d8d597fd
|
switch name of control-parameter; switch consentmanager-script-adjustments
# Conflicts:
# Modules/Core/ViewConfig.php
|
2023-09-13 15:02:50 +02:00 |
|
|
|
ef4e4625cd
|
switch name of control-parameter; switch consentmanager-script-adjustments
|
2023-09-13 14:56:05 +02:00 |
|
|
|
154147b8d8
|
Merge remote-tracking branch 'remotes/origin/rel_2.x'
|
2023-09-07 15:22:13 +02:00 |
|
|
|
eb2c7f73b9
|
add cookiebot essentials
|
2023-09-07 15:15:05 +02:00 |
|
|
|
565f47b1ff
|
add cookiebot essentials
|
2023-09-07 15:08:06 +02:00 |
|
|
|
84e3895db8
|
extend Manufacturer
|
2023-08-23 17:12:18 +02:00 |
|
|
|
1e479503a7
|
[changed] 'an article has been removed from basket'-check
|
2023-08-23 17:09:49 +02:00 |
|
|
|
575e35ffbc
|
[changed] 'an article has been removed from basket'-check
|
2023-08-18 14:07:53 +02:00 |
|
|
|
17840d33b1
|
Merge remote-tracking branch 'remotes/origin/dev_1.x_manufacturer' into dev_1.x
# Conflicts:
# metadata.php
|
2023-08-17 10:27:21 +02:00 |
|
|
|
a49c29d7aa
|
add CountryObjectGetter to ThankYouController
|
2023-08-17 09:20:58 +02:00 |
|
|
|
6b18c50b42
|
add 'remove_from_cart' event
|
2023-08-17 08:53:00 +02:00 |
|
|
|
443b456a0d
|
add new method for debug-check
|
2023-08-17 08:53:00 +02:00 |
|
|
|
9e7b4653ea
|
add deug_mode switch
|
2023-08-16 10:44:50 +02:00 |
|
|
|
5355b0a7ad
|
extend Manufacturer
|
2023-08-15 11:59:27 +02:00 |
|
|
|
22bec30621
|
add remove_from_cart
|
2023-08-03 14:57:26 +02:00 |
|
|
|
4f8fa7cdc9
|
Merge remote-tracking branch 'remotes/origin/rel_2.x'
# Conflicts:
# CHANGELOG.md
|
2023-06-27 09:59:00 +02:00 |
|
|
|
8b344ffb85
|
add cookiefirst
|
2023-06-27 09:39:43 +02:00 |
|
|
|
b0a1c20419
|
add missing cmp-entry in cmp-list
|
2023-06-27 08:58:05 +02:00 |
|
|
|
54fcbf88c9
|
add cookiefirst necessary script-attributes
|
2023-06-27 08:46:51 +02:00 |
|
|
|
a93b1cf582
|
[working state] add rel_2.x adjustments
|
2023-06-26 17:41:00 +02:00 |
|
|
|
d2ef663dd3
|
add paymentType to puchase-event
extend Basket-Model to add method to get payment-desc
|
2023-06-22 10:37:40 +02:00 |
|
|
|
5dd7b51fb5
|
adjust view_cart; extend Model\Category
add categories to ecommerce-DataLayer; add method to immediately get the requested Category-Steps
|
2023-06-21 15:23:50 +02:00 |
|
|
|
41d6e94fa7
|
Merge remote-tracking branch 'remotes/origin/rel_2.x'
|
2023-05-31 14:55:26 +02:00 |
|
|
|
b8e2aeaa58
|
Merge remote-tracking branch 'remotes/origin/rel_1.x'
# Conflicts:
# Application/views/admin/de/module_options.php
# Application/views/ga4/view_item_list.tpl
# CHANGELOG.md
# Modules/Core/ViewConfig.php
# metadata.php
|
2023-05-31 14:51:07 +02:00 |
|
|
|
c17ae1cef5
|
fix explicit manager bug
bug would adjust the script even if the check for an own cookieManager is not set
|
2023-05-31 14:11:50 +02:00 |
|
|
|
95e0cab68c
|
rework 'Manager Type Handling'; add ManagerHandler + ManagerTypes
|
2023-05-31 12:17:00 +02:00 |
|
|
|
6217524828
|
adjusted usercentrics script
|
2023-05-31 10:34:24 +02:00 |
|
|
|
a40d922f42
|
[working-state] restructuring usercentricts & consentmanager decision
consentmanager decision is working so far; next step is implementing usercentricts
|
2023-05-31 10:33:59 +02:00 |
|
|
|
dae5f66f81
|
add usercentrics chosable settings-value; add additional methods; add new multilang-idents
|
2023-05-31 10:33:43 +02:00 |
|
|
|
e2cdda530b
|
adjusted usercentrics script
|
2023-05-26 13:49:50 +02:00 |
|
|
|
561a2101f1
|
[working-state] restructuring usercentricts & consentmanager decision
consentmanager decision is working so far; next step is implementing usercentricts
|
2023-05-23 14:52:07 +02:00 |
|
|
|
6fca52cc06
|
add usercentrics chosable settings-value; add additional methods; add new multilang-idents
|
2023-05-23 14:33:35 +02:00 |
|
|
|
ae6f9bfaa9
|
switch php-file-header hint
|
2023-05-23 10:49:59 +02:00 |
|
|
|
f9a0834d26
|
add settings-entry; add consentmanager-option
|
2023-05-16 14:42:12 +02:00 |
|
|
|
af78809ae5
|
add settings-entry; add consentmanager-option
|
2023-05-15 15:06:25 +02:00 |
|
|
|
af341a984b
|
Merge branch 'rel_1.x'
# Conflicts:
# CHANGELOG.md
# metadata.php
|
2023-05-11 15:26:31 +02:00 |
|
Christoph Staeblein
|
6e62f39b71
|
OXID UserCentrics support, general overhaul for cookie managers
taken from pull-request; thank you C. Stäblein
|
2023-04-04 10:15:15 +02:00 |
|
|
|
d4df87bfff
|
Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x
|
2023-03-17 15:30:03 +01:00 |
|
Christoph Staeblein
|
0e55c3e38f
|
add: Aggrosoft-Cookie-Consent compatibility
|
2023-03-17 10:59:50 +01:00 |
|
Christoph Staeblein
|
13df965a03
|
bug-fix: wrong function for pageview on thankyou page
|
2023-03-17 08:58:15 +01:00 |
|
|
|
1589f202a9
|
add own cookie-check method; rm unnecessary help-text
|
2023-02-21 12:09:04 +01:00 |
|
|
|
5e358fc684
|
add own cookie-check method; rm unnecessary help-text
|
2023-02-01 15:32:28 +01:00 |
|
|
|
9ac78a0d43
|
OST:#573111 fix bug - missing use
|
2023-01-27 13:43:29 +01:00 |
|
