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.

Sign up for GitHub

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

Jump to bottom

Remove unneeded version check #229

Merged
merged 3 commits into from
Dec 30, 2023
Merged

Remove unneeded version check #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
485d478
Remove unneeded variable
Hlavtox Dec 30, 2023
664f479
Remove unneeded varialbe
Hlavtox Dec 30, 2023
c202521
Isset covers empty
Hlavtox Dec 30, 2023
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
1 change: 0 additions & 1 deletion controllers/front/gdpr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public function initContent()
'psgdpr_front_controller' => Context::getContext()->link->getModuleLink('psgdpr', 'gdpr', $params, true),
'psgdpr_csv_controller' => Context::getContext()->link->getModuleLink('psgdpr', 'ExportCustomerData', array_merge(['type' => 'csv'], $params), true),
'psgdpr_pdf_controller' => Context::getContext()->link->getModuleLink('psgdpr', 'ExportCustomerData', array_merge(['type' => 'pdf'], $params), true),
'psgdpr_ps_version' => (bool) version_compare(_PS_VERSION_, '1.7', '>='),
'psgdpr_id_customer' => Context::getContext()->customer->id,
]);

Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Admin/CustomerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function searchCustomers(Request $request): Response
$requestBodyContent = json_decode($request->getContent(), true);
$phrase = $requestBodyContent['phrase'];

if (!isset($phrase) && empty($phrase)) {
if (empty($phrase)) {
return $this->json(['message' => 'Property phrase is missing or empty.'], Response::HTTP_BAD_REQUEST);
}

Expand Down
1 change: 0 additions & 1 deletion views/templates/front/account_gdpr_page.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<script type="text/javascript">
var psgdpr_front_controller = "{/literal}{$psgdpr_front_controller|escape:'htmlall':'UTF-8'}{literal}";
var psgdpr_id_customer = "{/literal}{$psgdpr_front_controller|escape:'htmlall':'UTF-8'}{literal}";
var psgdpr_ps_version = "{/literal}{$psgdpr_ps_version|escape:'htmlall':'UTF-8'}{literal}";
</script>
{/literal}
{/block}
Loading