antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small commit from prod

Browse Source
This commit is contained in:
Srv Bebeboutik 2016-06-03 11:18:35 +02:00
parent f8aaf85d62
commit b1a0a1b29e
2 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
classes/Image.php
View File

@ -226,27 +226,55 @@ class ImageCore extends ObjectModel
$imageOld = new Image($row['id_image']); $imageOld = new Image($row['id_image']);
$imageNew = clone $imageOld; $imageNew = clone $imageOld;
$imageNew->id_product = (int)($id_product_new); $imageNew->id_product = (int)($id_product_new);
// A new id is generated for the cloned image when calling add()
if ($imageNew->add())
{
$new_path = $imageNew->getPathForCreation();
foreach ($imagesTypes AS $imageType)
{
if (file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg'))
{
if (!Configuration::get('PS_LEGACY_IMAGES'))
$imageNew->createImgFolder();
copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg',
$new_path.'-'.$imageType['name'].'.jpg');
}
}
if (file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg'))
copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg', $new_path.'.jpg');
self::replaceAttributeImageAssociationId($combinationImages, (int)($imageOld->id), (int)($imageNew->id)); if($imageNew->add()) {
$new_path = $imageNew->getPathForCreation();
if(file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg')) {
copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg', $new_path.'.jpg');
}
foreach($imagesTypes AS $imageType) {
if(file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg')) {
if(!Configuration::get('PS_LEGACY_IMAGES')) {
$imageNew->createImgFolder();
}
copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg', $new_path.'-'.$imageType['name'].'.jpg');
} else {
if(!Configuration::get('PS_LEGACY_IMAGES')) {
$imageNew->createImgFolder();
}
imageResize($new_path.'.jpg', _PS_PROD_IMG_DIR_.$imageNew->getExistingImgPath().'-'.$imageType['name'].'.jpg', (int) $imageType['width'], (int) $imageType['height']);
}
}
self::replaceAttributeImageAssociationId($combinationImages, (int)($imageOld->id), (int)($imageNew->id));
} else {
return FALSE;
} }
else
return false; // // A new id is generated for the cloned image when calling add()
// if ($imageNew->add())
// {
// $new_path = $imageNew->getPathForCreation();
// foreach ($imagesTypes AS $imageType)
// {
// if (file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg'))
// {
// if (!Configuration::get('PS_LEGACY_IMAGES'))
// $imageNew->createImgFolder();
// copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'-'.$imageType['name'].'.jpg',
// $new_path.'-'.$imageType['name'].'.jpg');
// }
// }
// if (file_exists(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg'))
// copy(_PS_PROD_IMG_DIR_.$imageOld->getExistingImgPath().'.jpg', $new_path.'.jpg');
// self::replaceAttributeImageAssociationId($combinationImages, (int)($imageOld->id), (int)($imageNew->id));
// }
// else
// return false;
} }
return self::duplicateAttributeImageAssociations($combinationImages); return self::duplicateAttributeImageAssociations($combinationImages);
} }

19
modules/soflexibilite/soflexibilite.php
View File

@ -1306,14 +1306,6 @@ class soflexibilite extends CarrierModule
$soDelivery->city = $address_invoice->city; $soDelivery->city = $address_invoice->city;
$soDelivery->country = Country::getIsoById((int)$address_invoice->id_country); $soDelivery->country = Country::getIsoById((int)$address_invoice->id_country);
}*/ }*/
$address_delivery = new Address((int)$params['cart']->id_address_delivery);
if (Validate::isLoadedObject($address_delivery)) {
$soDelivery->address1 = $address_delivery->address1;
$soDelivery->address2 = $address_delivery->address2;
$soDelivery->postcode = $address_delivery->postcode;
$soDelivery->city = $address_delivery->city;
$soDelivery->country = Country::getIsoById((int)$address_delivery->id_country);
}
// OCARAT modif update for customizations // OCARAT modif update for customizations
if ($this->ps15x) { if ($this->ps15x) {
@ -1430,13 +1422,15 @@ class soflexibilite extends CarrierModule
require_once dirname(__FILE__).'/classes/SoFlexibiliteWebService.php'; require_once dirname(__FILE__).'/classes/SoFlexibiliteWebService.php';
// Customer Name // Customer Name
$address = Db::getInstance()->ExecuteS('SELECT * FROM ps_socolissimo_delivery_info WHERE id_cart = '.pSQL((int)$order->id_cart)); /*$address = Db::getInstance()->ExecuteS('SELECT * FROM ps_socolissimo_delivery_info WHERE id_cart = '.pSQL((int)$order->id_cart));
if(count($address) > 0) { if(count($address) > 0) {
$address = $address[0]; $address = $address[0];
} }
if (!empty($address['prname']) && !empty($address['prname'])) { if (!empty($address['prname']) && !empty($address['prname'])) {
$fullname = sprintf('%s %s', $address['prfirstname'], $address['prname']); $fullname = sprintf('%s %s', $address['prfirstname'], $address['prname']);
} elseif (!empty($soDelivery->firstname) && !empty($soDelivery->lastname)) { } else*/
if (!empty($soDelivery->firstname) && !empty($soDelivery->lastname)) {
$fullname = sprintf('%s %s', $soDelivery->firstname, $soDelivery->lastname); $fullname = sprintf('%s %s', $soDelivery->firstname, $soDelivery->lastname);
} else { } else {
$fullname = sprintf('%s %s', $customer_address->firstname, $customer_address->lastname); $fullname = sprintf('%s %s', $customer_address->firstname, $customer_address->lastname);
@ -1482,7 +1476,8 @@ class soflexibilite extends CarrierModule
'name' => $fullname, 'name' => $fullname,
'libelle' => in_array($soDelivery->type, array('DOM', 'DOS', 'BOM', 'BOS')) ? '' : $soDelivery->libelle, 'libelle' => in_array($soDelivery->type, array('DOM', 'DOS', 'BOM', 'BOS')) ? '' : $soDelivery->libelle,
'prid' => $soDelivery->id_point ? sprintf('%06s', $soDelivery->id_point) : null, 'prid' => $soDelivery->id_point ? sprintf('%06s', $soDelivery->id_point) : null,
'company' => $soDelivery->company ? $soDelivery->company : $customer_address->company, /*'company' => $soDelivery->company ? $soDelivery->company : $customer_address->company,*/
'company' => $soDelivery->company,
'prname' => isset($relay_informations->nom) ? $relay_informations->nom : '', 'prname' => isset($relay_informations->nom) ? $relay_informations->nom : '',
'address1' => isset($relay_informations->adresse1) ? $relay_informations->adresse1 : ( 'address1' => isset($relay_informations->adresse1) ? $relay_informations->adresse1 : (
in_array($soDelivery->type, array('DOM', 'DOS', 'BOM', 'BOS')) ? in_array($soDelivery->type, array('DOM', 'DOS', 'BOM', 'BOS')) ?
@ -1498,7 +1493,7 @@ class soflexibilite extends CarrierModule
'city' => isset($relay_informations->localite) ? $relay_informations->localite : $soDelivery->city, 'city' => isset($relay_informations->localite) ? $relay_informations->localite : $soDelivery->city,
'country' => isset($relay_informations->libellePays) ? $relay_informations->libellePays : ( 'country' => isset($relay_informations->libellePays) ? $relay_informations->libellePays : (
Tools::strlen($soDelivery->country) == 2 ? Tools::strlen($soDelivery->country) == 2 ?
Country::getNameById($this->context->employee->id_lang, Country::getByIso($soDelivery->country)) : Country::getNameById($this->context->employee->id_lang, strtolower($soDelivery->country) == 'fr'? 8: Country::getByIso($soDelivery->country)) :
$soDelivery->country $soDelivery->country
), ),
'iso_country' => isset($relay_informations->codePays) ? $relay_informations->codePays : $soDelivery->country, 'iso_country' => isset($relay_informations->codePays) ? $relay_informations->codePays : $soDelivery->country,