Merge branch 'webkul:develop' into gli-1435
This commit is contained in:
@@ -1300,7 +1300,8 @@ class CarrierCore extends ObjectModel
|
||||
}
|
||||
|
||||
$id_address = (int)((!is_null($id_address_delivery) && $id_address_delivery != 0) ? $id_address_delivery : $cart->id_address_delivery);
|
||||
if ($id_address) {
|
||||
$obj_address = new Address($id_address);
|
||||
if (Validate::isLoadedObject($obj_address)) {
|
||||
$id_zone = Address::getZoneById($id_address);
|
||||
|
||||
// Check the country of the address is activated
|
||||
|
||||
@@ -796,6 +796,7 @@ class CustomerCore extends ObjectModel
|
||||
$this->passwd = Tools::encrypt($password);
|
||||
$this->cleanGroups();
|
||||
$this->addGroups(array(Configuration::get('PS_CUSTOMER_GROUP'))); // add default customer group
|
||||
$this->id_default_group = (int) Configuration::get('PS_CUSTOMER_GROUP');
|
||||
if ($this->update()) {
|
||||
$vars = array(
|
||||
'{firstname}' => $this->firstname,
|
||||
|
||||
@@ -100,10 +100,10 @@ abstract class HTMLTemplateCore
|
||||
|
||||
$id_shop = (int)$this->shop->id;
|
||||
|
||||
if (Configuration::get('PS_LOGO_INVOICE', null, null, $id_shop) != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE', null, null, $id_shop))) {
|
||||
$logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE', null, null, $id_shop);
|
||||
} elseif (Configuration::get('PS_LOGO', null, null, $id_shop) != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO', null, null, $id_shop))) {
|
||||
$logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO', null, null, $id_shop);
|
||||
if (Configuration::get('PS_LOGO_INVOICE', null, null, $id_shop) != false) {
|
||||
$logo = Context::getContext()->link->getMediaLink(_PS_IMG_.Configuration::get('PS_LOGO_INVOICE', null, null, $id_shop));
|
||||
} elseif (Configuration::get('PS_LOGO', null, null, $id_shop) != false) {
|
||||
$logo = Context::getContext()->link->getMediaLink(_PS_IMG_.Configuration::get('PS_LOGO', null, null, $id_shop));
|
||||
}
|
||||
return $logo;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user