Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove option "always" and set default to 1 hour #3634

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"required": false,
"label": "Config.globalUserDataHashMaxAgeLabel",
"options": {
"defaultValue": 24,
"defaultValue": 1,
"selectBoxValues": [
{
"value": 1,
Expand All @@ -163,10 +163,6 @@
{
"value": 168,
"caption": "Config.globalMaxAge1Week"
},
{
"value": -1,
"caption": "Config.globalMaxAgeInfinite"
}
]
}
Expand Down
6 changes: 6 additions & 0 deletions meta/documents/changelog_de.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes für plentyShop LTS

## v5.0.72 (2025-XX-XX) <a href="https://github.com/plentymarkets/plugin-ceres/compare/5.0.71...5.0.72" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>

### Geändert

- Für die Einstellung **Gültigkeit der URLs zum Ändern von Passwort bzw. E-Mail-Adresse** wurde der Wert "Immer" entfernt. Falls diese bisher genutzt wurde, greift eine maximale Gültigkeit von einer 1 Woche.

## v5.0.71 (2024-12-12) <a href="https://github.com/plentymarkets/plugin-ceres/compare/5.0.70...5.0.71" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>

### TODO
Expand Down
6 changes: 6 additions & 0 deletions meta/documents/changelog_en.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes for plentyShop LTS

## v5.0.72 (2025-XX-XX) <a href="https://github.com/plentymarkets/plugin-ceres/compare/5.0.71...5.0.72" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>

### Geändert

- We removed the Option "always" for the setting **Validity of URLs to change password and email address** in the plugin settings. The setting is now always set to 1 week.
-
## v5.0.71 (2024-12-12) <a href="https://github.com/plentymarkets/plugin-ceres/compare/5.0.70...5.0.71" target="_blank" rel="noopener"><b>Overview of all changes</b></a>

### TODO
Expand Down
1 change: 0 additions & 1 deletion resources/lang/de/Config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ globalMaxAge6Hours = 6 Stunden
globalMaxAge12Hours = 12 Stunden
globalMaxAge24Hours = 24 Stunden
globalMaxAge1Week = 1 Woche
globalMaxAgeInfinite = Immer
globalRegistrationRequirePrivacyPolicyConfirmation = Zustimmung zur Datenschutzerklärung bei der Kundenregistrierung voraussetzen
globalBlockCookies = Nicht akzeptierte Cookies blockieren (empfohlen)

Expand Down
1 change: 0 additions & 1 deletion resources/lang/de/Wizard.properties
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ globalMaxAge6Hours = 6 Stunden
globalMaxAge12Hours = 12 Stunden
globalMaxAge24Hours = 24 Stunden
globalMaxAge1Week = 1 Woche
globalMaxAgeInfinite = Immer
ordersSettings = Aufträge und Retouren
ordersSettingsDescription = In diesem Schritt nimmst du Einstellungen zu Artikelpaketen und Retouren vor.
itemBundles = Wie möchtest du Artikelpakete im Bestellvorgang anzeigen?
Expand Down
1 change: 0 additions & 1 deletion resources/lang/en/Config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ globalMaxAge6Hours = 6 hours
globalMaxAge12Hours = 12 hours
globalMaxAge24Hours = 24 hours
globalMaxAge1Week = 1 week
globalMaxAgeInfinite = Always
globalRegistrationRequirePrivacyPolicyConfirmation = Require acceptance of privacy policy for customer registration
globalBlockCookies = Block unaccepted cookies (recommended)

Expand Down
1 change: 0 additions & 1 deletion resources/lang/en/Wizard.properties
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ globalMaxAge6Hours = 6 hours
globalMaxAge12Hours = 12 hours
globalMaxAge24Hours = 24 hours
globalMaxAge1Week = 1 week
globalMaxAgeInfinite = Always
ordersSettings = Order and returns
ordersSettingsDescription = In this step, you carry out settings pertaining to your customers' orders and returns.
itemBundles = How do you want to display item bundles in the checkout?
Expand Down
3 changes: 2 additions & 1 deletion src/Config/CeresGlobalConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ protected function load()
$this->googleRecaptchaConsentGroup = $this->getTextValue('global.google_recaptcha_consentGroup', 'media');
$this->registrationRequirePrivacyPolicyConfirmation = $this->getBooleanValue( 'global.registration_require_privacy_policy_confirmation', true );
$this->blockCookies = $this->getBooleanValue( 'global.block_cookies', true );
$this->userDataHashMaxAge = $this->getIntegerValue('global.user_data_hash_max_age', 24);
$ttl = $this->getIntegerValue('global.user_data_hash_max_age', 1);
$this->userDataHashMaxAge = $ttl == -1 ? 168 : $ttl;
}
}
1 change: 0 additions & 1 deletion src/Wizard/ShopWizard/Config/OnlineStoreConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class OnlineStoreConfig
'globalMaxAge12Hours' => 12,
'globalMaxAge24Hours' => 24,
'globalMaxAge1Week' => 168,
'globalMaxAgeInfinite' => -1
];

private static $itemBundles = [
Expand Down