Skip to content

Commit

Permalink
V1.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin committed Dec 22, 2020
1 parent 8b14fe4 commit 414db44
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 26 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## 1.3.2 - 2020-09-10
### Fixed
- Migration error [#15](https://github.com/dutchheight/craft-cookie-boss/issues/15)
- Migration error [#15](https://github.com/dutchheight/craft-cookie-boss/issues/15)

## 1.3.3 - 2020-12-22
### Fixed
- Vue version [#18](https://github.com/dutchheight/craft-cookie-boss/issues/18)
- Invalid after days bug [#16](https://github.com/dutchheight/craft-cookie-boss/issues/16)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dutchheight/craft-cookie-boss",
"description": "Allow your visitors to set their cookie preference.",
"type": "craft-plugin",
"version": "1.3.2.2",
"version": "1.3.3",
"keywords": [
"craft",
"cms",
Expand Down
44 changes: 22 additions & 22 deletions src/assetbundles/cookieboss/dist/img/CookieBoss-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/controllers/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,16 @@ private function _saveSettings($forceReconsent = false)
return null;
}



$settings['enabled'] = (Craft::$app->getRequest()->getRequiredBodyParam('enabled') == '1');
$settings['presentGroups'] = (Craft::$app->getRequest()->getRequiredBodyParam('presentGroups') == '1');
$settings['forceAccept'] = (Craft::$app->getRequest()->getRequiredBodyParam('forceAccept') == '1');

$settings['cookieTime'] = (Craft::$app->getRequest()->getRequiredBodyParam('cookieTime') || 1) * 86400;
$cookieTime = (Craft::$app->getRequest()->getRequiredBodyParam('cookieTime') != null) ?
Craft::$app->getRequest()->getRequiredBodyParam('cookieTime') : 1;
$settings['cookieTime'] = $cookieTime * 86400;

$settings['title'] = Craft::$app->getRequest()->getRequiredBodyParam('title');
$settings['message'] = Craft::$app->getRequest()->getRequiredBodyParam('message');
$settings['messageSettings'] = Craft::$app->getRequest()->getRequiredBodyParam('messageSettings');
Expand Down
2 changes: 1 addition & 1 deletion src/templates/askConsent/_index.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if settings.enabled %}
<script src="https://cdn.jsdelivr.net/npm/vue"></script>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>

{% do view.registerAssetBundle("dutchheight\\cookieboss\\assetbundles\\cookieboss\\CookieBossAsset") %}
Expand Down

0 comments on commit 414db44

Please sign in to comment.