Merge branch 'develop' into gli-758

This commit is contained in:
Shreesh Arora
2022-11-09 16:21:10 +05:30
2745 changed files with 201353 additions and 10234 deletions

View File

@@ -598,13 +598,14 @@ class AdminCustomersControllerCore extends AdminController
);
$birthday = explode('-', $this->getFieldValue($obj, 'birthday'));
$this->fields_value = array(
'years' => $this->getFieldValue($obj, 'birthday') ? $birthday[0] : 0,
'months' => $this->getFieldValue($obj, 'birthday') ? $birthday[1] : 0,
'days' => $this->getFieldValue($obj, 'birthday') ? $birthday[2] : 0,
'years' => Tools::getValue('years', $this->getFieldValue($obj, 'birthday') ? $birthday[0] : 0),
'months' => Tools::getValue('months', $this->getFieldValue($obj, 'birthday') ? $birthday[1] : 0),
'days' => Tools::getValue('days', $this->getFieldValue($obj, 'birthday') ? $birthday[2] : 0),
);
// Added values of object Group
if (!Validate::isUnsignedId($obj->id)) {
$customer_groups = array();
@@ -860,7 +861,6 @@ class AdminCustomersControllerCore extends AdminController
'referrers' => $referrers,
'show_toolbar' => true
);
return parent::renderView();
}
@@ -944,10 +944,25 @@ class AdminCustomersControllerCore extends AdminController
$this->errors[] = Tools::displayError('A default customer group must be selected in group box.');
}
// Check the requires fields which are settings in the BO
$days = Tools::getValue('days');
$months = Tools::getValue('months');
$years = Tools::getValue('years');
if ($days || $months || $years) {
if (!$days) {
$this->errors[] = Tools::displayError("Please select a valid date of birthday");
}
if (!$months) {
$this->errors[] = Tools::displayError("Please select a valid year of birthday");
}
if (!$years) {
$this->errors[] = Tools::displayError("Please select a valid month of birthday");
}
}
$customer = new Customer();
$this->errors = array_merge($this->errors, $customer->validateFieldsRequiredDatabase());
return parent::processSave();
}