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

Fix AddressController.php #34152

Closed
wants to merge 12 commits into from
Closed

Fix AddressController.php #34152

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9fd4adf
Fix AddressController.php
metacreo Oct 3, 2023
6e84db7
Small rework AddressController.php
metacreo Oct 5, 2023
78ab289
Update AddressController.php
metacreo Oct 5, 2023
7c2136a
Eliminate double call of fillWith
metacreo Oct 6, 2023
1bbb594
Update AddressController.php
metacreo Oct 8, 2023
eecd0c9
Update AddressController.php
metacreo Oct 8, 2023
a73eeec
Update AddressController.php
metacreo Oct 8, 2023
41849c5
Update controllers/front/AddressController.php
metacreo Oct 8, 2023
241f434
Update AddressController.php
metacreo Oct 8, 2023
a5e8553
Update AddressController.php
metacreo Jan 10, 2024
b2a3c4b
Fix AddressController.php
metacreo Jan 10, 2024
ee962a0
Merge branch 'PrestaShop:develop' into patch-1
metacreo Jan 11, 2024
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
14 changes: 11 additions & 3 deletions controllers/front/AddressController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,22 @@ public function init()
public function postProcess()
{
$this->context->smarty->assign('editing', false);
$id_address = (int) Tools::getValue('id_address');
// Initialize address if an id exists

$params = Tools::getAllValues();
$id_address = isset($params['id_address']) ? (int) $params['id_address'] : 0;
metacreo marked this conversation as resolved.
Show resolved Hide resolved

// Initialize address if an id exists and prevent fill form with default country second time.
if ($id_address) {
$this->address_form->loadAddressById($id_address);
// If this is only form request. Adding param id_country for CustomerAddressForm class.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a hack honestly, I'll have to look deeper since I'm not sure if we should have to do that there

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpodemski no... this param needs only for correct form fill.

if (!Tools::isSubmit('submitAddress')) {
$address = new Address($id_address, $this->context->language->id);
$params['id_country'] = $address->id_country;
}
}

// Fill the form with data
$this->address_form->fillWith(Tools::getAllValues());
$this->address_form->fillWith($params);

// Submit the address, don't care if it's an edit or add
if (Tools::isSubmit('submitAddress')) {
Expand Down