Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
Fixed PS 9 install, update with current develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@denys202
denys202 committed Nov 29, 2024
1 parent 4ac1158 commit c82e594
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 89 deletions.
3 changes: 3 additions & 0 deletions composer.json
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"homepage": "https://www.axeptio.eu/",
"license": "OSL-3.0",
"config": {
"platform": {
"php": "5.6.0"
},
"preferred-install": "dist",
"classmap-authoritative": false,
"optimize-autoloader": false,
Expand Down
74 changes: 37 additions & 37 deletions controllers/admin/AdminAxeptiocookiesConfiguration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,62 +128,62 @@ protected function getJsVariables()
'subtitle' => $this->module->l('Manage the appearance and modules you want to offer
for user consent', $this->controller_name),
'tabs' => [
'general' => $this->l('General', $this->controller_name),
'modules' => $this->l('Modules', $this->controller_name),
'consentv2' => $this->l('Consent Mode V2', $this->controller_name),
'advanced' => $this->l('Advanced configuration', $this->controller_name),
'general' => $this->module->l('General', $this->controller_name),
'modules' => $this->module->l('Modules', $this->controller_name),
'consentv2' => $this->module->l('Consent Mode V2', $this->controller_name),
'advanced' => $this->module->l('Advanced configuration', $this->controller_name),
],
'illustration' => $this->l('Illustration', $this->controller_name),
'illustration_active' => $this->l('Activate illustration', $this->controller_name),
'illustration_perso' => $this->l('Personalized illustration', $this->controller_name),
'paint' => $this->l('Activate the paint task', $this->controller_name),
'project_title' => $this->l('Project ID', $this->controller_name),
'configuration_title' => $this->l('Configuration', $this->controller_name),
'shop_title' => $this->l('Shops', $this->controller_name),
'language_title' => $this->l('Languages', $this->controller_name),
'back' => $this->l('To the list', $this->controller_name),
'step_message' => $this->l('Message', $this->controller_name),
'step_title' => $this->l('Title', $this->controller_name),
'step_subtitle' => $this->l('Subtitle', $this->controller_name),
'illustration' => $this->module->l('Illustration', $this->controller_name),
'illustration_active' => $this->module->l('Activate illustration', $this->controller_name),
'illustration_perso' => $this->module->l('Personalized illustration', $this->controller_name),
'paint' => $this->module->l('Activate the paint task', $this->controller_name),
'project_title' => $this->module->l('Project ID', $this->controller_name),
'configuration_title' => $this->module->l('Configuration', $this->controller_name),
'shop_title' => $this->module->l('Shops', $this->controller_name),
'language_title' => $this->module->l('Languages', $this->controller_name),
'back' => $this->module->l('To the list', $this->controller_name),
'step_message' => $this->module->l('Message', $this->controller_name),
'step_title' => $this->module->l('Title', $this->controller_name),
'step_subtitle' => $this->module->l('Subtitle', $this->controller_name),
'recommended' => [
'description' => $this->module->l('Collection of personal data', $this->controller_name),
'reset' => $this->module->l('Check the modules for which consent is recommended
by Axeptio', $this->controller_name),
],
'consent' => [
'enable' => $this->l('Enable Google Consent Mode V2?', $this->controller_name),
'default' => $this->l('Default setting for Consent Mode', $this->controller_name),
'description' => $this->l('These consent signals will be sent on page load to indicate
'enable' => $this->module->l('Enable Google Consent Mode V2?', $this->controller_name),
'default' => $this->module->l('Default setting for Consent Mode', $this->controller_name),
'description' => $this->module->l('These consent signals will be sent on page load to indicate
to Google services how they should process the data before consent is given by the
user.', $this->controller_name),
'analytics_storage' => $this->l('Analytics storage', $this->controller_name),
'analytics_storage_desc' => $this->l('Allow Google Analytics to measure how visitors
'analytics_storage' => $this->module->l('Analytics storage', $this->controller_name),
'analytics_storage_desc' => $this->module->l('Allow Google Analytics to measure how visitors
use the site to improve functionality and service.', $this->controller_name),
'ad_storage' => $this->l('Ad Storage', $this->controller_name),
'ad_storage_desc' => $this->l('Allow Google to save advertising information on visitors
'ad_storage' => $this->module->l('Ad Storage', $this->controller_name),
'ad_storage_desc' => $this->module->l('Allow Google to save advertising information on visitors
devices for better ad relevance.', $this->controller_name),
'ad_user_data' => $this->l('Ad User Data', $this->controller_name),
'ad_user_data_desc' => $this->l('Share visitor activity data with Google for targeted
'ad_user_data' => $this->module->l('Ad User Data', $this->controller_name),
'ad_user_data_desc' => $this->module->l('Share visitor activity data with Google for targeted
advertising.', $this->controller_name),
'ad_personalization' => $this->l('Ad Personalization', $this->controller_name),
'ad_personalization_desc' => $this->l('Personalize the advertising experience by allowing
'ad_personalization' => $this->module->l('Ad Personalization', $this->controller_name),
'ad_personalization_desc' => $this->module->l('Personalize the advertising experience by allowing
Google to personalize the ads visitors see.', $this->controller_name),
'functionality_storage' => $this->l('Functionality storage', $this->controller_name),
'functionality_storage_desc' => $this->l('Enables storage that supports the functionality
'functionality_storage' => $this->module->l('Functionality storage', $this->controller_name),
'functionality_storage_desc' => $this->module->l('Enables storage that supports the functionality
of the website or app, for example, language settings', $this->controller_name),
'personalization_storage' => $this->l('Personalization storage', $this->controller_name),
'personalization_storage_desc' => $this->l('Enables storage related to personalization,
'personalization_storage' => $this->module->l('Personalization storage', $this->controller_name),
'personalization_storage_desc' => $this->module->l('Enables storage related to personalization,
for example, video recommendations', $this->controller_name),
'security_storage' => $this->l('Security storage', $this->controller_name),
'security_storage_desc' => $this->l('Enables storage related to security such as
'security_storage' => $this->module->l('Security storage', $this->controller_name),
'security_storage_desc' => $this->module->l('Enables storage related to security such as
authentication functionality, fraud prevention, and other
user protection', $this->controller_name),
],
'advanced' => [
'event_in_datalayer' => $this->l('Event in the datalayer', $this->controller_name),
'send_all_events' => $this->l('Send all events to the datalayer', $this->controller_name),
'no_send_events' => $this->l('Send no events to the datalayer', $this->controller_name),
'send_update_events' => $this->l('Send only axeptio_update to the
'event_in_datalayer' => $this->module->l('Event in the datalayer', $this->controller_name),
'send_all_events' => $this->module->l('Send all events to the datalayer', $this->controller_name),
'no_send_events' => $this->module->l('Send no events to the datalayer', $this->controller_name),
'send_update_events' => $this->module->l('Send only axeptio_update to the
datalayer', $this->controller_name),
],
],
Expand Down
Empty file modified override/classes/Hook.php
100644 → 100755
View file
Empty file.
32 changes: 15 additions & 17 deletions views/_dev/src/admin/js/src/components/Edit/Tabs/AdvancedTab.vue
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,25 @@ watch(triggerGtmEventType, (newValue: {name: string; value: number} | null | und
<div class="row" v-if="configurationStore.editConfiguration">
<div class="col-6">
<div class="form-group">
<div class="form-group">
<label class="form-control-label"
v-text="trans('edit.advanced.event_in_datalayer')"></label>
<VueMultiselect v-model="triggerGtmEventType"
tag-placeholder=""
placeholder=""
label="name"
track-by="value"
:searchable="false"
:select-label="''"
:selected-label="''"
:deselect-label="''"
:options="triggerGtmEventsTypes"
:multiple="false"
:allow-empty="false"></VueMultiselect>
</div>
<label class="form-control-label"
v-text="trans('edit.advanced.event_in_datalayer')"></label>
<VueMultiselect v-model="triggerGtmEventType"
tag-placeholder=""
placeholder=""
label="name"
track-by="value"
:searchable="false"
:select-label="''"
:selected-label="''"
:deselect-label="''"
:options="triggerGtmEventsTypes"
:multiple="false"
:allow-empty="false"></VueMultiselect>
</div>
</div>
</div>
</template>

<style scoped lang="scss">

</style>
</style>
70 changes: 36 additions & 34 deletions views/_dev/src/admin/js/src/components/Edit/Tabs/ModulesTab.vue
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const isResetBtnVisible = computed(() => {

return configurationStore.editConfiguration.modules.filter(module => {
return (!(module.recommended !== false && module.recommended.isRequired) && module.checked)
|| module.recommended !== false && module.recommended.isRequired && !module.checked;
|| module.recommended !== false && module.recommended.isRequired && !module.checked;
}).length > 0;
});

Expand Down Expand Up @@ -67,42 +67,44 @@ const handleModuleClick = (index: number) => {
</script>

<template>
<div class="d-inline-flex float-right mb-3 module-tab-actions">
<button class="btn btn-lg btn-outline-info"
v-if="isResetBtnVisible"
v-text="trans('edit.recommended.reset')"
type="button"
@click="handleResetToRecommendedModules">
</button>
</div>
<div class="form-group" v-if="configurationStore.editConfiguration">
<div class="modules-wrapper">
<div class="d-flex flex-wrap">
<div v-for="(module, index) of configurationStore.editConfiguration.modules"
:key="module.id_module"
@click="handleModuleClick(index)"
class="md-checkbox col-4 module-item">
<div class="d-flex" v-if="configurationStore.editConfiguration.modules">
<input type="checkbox" v-model="configurationStore.editConfiguration.modules[index].checked"/>
<i class="md-checkbox-control"></i>
<div class="d-flex ml-3">
<div class="img-wrapper img-fluid" v-if="module.image">
<img :src="module.image" :alt="module.name">
<div class="d-flex flex-column">
<div class="d-inline-flex justify-content-end mb-3 module-tab-actions" v-if="isResetBtnVisible">
<button class="btn btn-lg btn-outline-info"
v-if="isResetBtnVisible"
v-text="trans('edit.recommended.reset')"
type="button"
@click="handleResetToRecommendedModules">
</button>
</div>
<div class="form-group" v-if="configurationStore.editConfiguration">
<div class="modules-wrapper">
<div class="d-flex flex-wrap">
<div v-for="(module, index) of configurationStore.editConfiguration.modules"
:key="module.id_module"
@click="handleModuleClick(index)"
class="md-checkbox col-4 module-item">
<div class="d-flex" v-if="configurationStore.editConfiguration.modules">
<input type="checkbox" v-model="configurationStore.editConfiguration.modules[index].checked"/>
<i class="md-checkbox-control"></i>
<div class="d-flex ml-3">
<div class="img-wrapper img-fluid" v-if="module.image">
<img :src="module.image" :alt="module.name">
</div>
<div class="d-flex flex-column ml-2">
<div class="font-weight-bold"
v-text="module.displayName ? getPrettyModuleName(module.displayName) : module.name"></div>
<div class="small-text"
v-text="module.name"></div>
</div>
</div>
<div class="d-flex flex-column ml-2">
<div class="font-weight-bold"
v-text="module.displayName ? getPrettyModuleName(module.displayName) : module.name"></div>
<div class="small-text"
v-text="module.name"></div>
<div class="ml-2"
v-if="module.recommended !== false && module.recommended.isRequired">
<img :src="images.recommended"
class="img-fluid"
v-tooltip="trans('edit.recommended.description')"
:alt="trans('edit.recommended.description')">
</div>
</div>
<div class="ml-2"
v-if="module.recommended !== false && module.recommended.isRequired">
<img :src="images.recommended"
class="img-fluid"
v-tooltip="trans('edit.recommended.description')"
:alt="trans('edit.recommended.description')">
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/_dev/src/admin/js/src/views/EditProjectView.vue
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ configurationBus.on((event) => {
<ConsentTab/>
</div>
<div
class="tab-pane fade"
class="tab-pane"
:class="{'show active': selectedTab === TabItem.ADVANCED}"
>
<AdvancedTab/>
Expand Down
Empty file modified views/templates/admin/configuration/layout.tpl
100644 → 100755
View file
Empty file.

0 comments on commit c82e594

Please sign in to comment.