TheCoreDev/taome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On rajoute les derniers modules et on modifie les CSS

Browse Source
This commit is contained in:
TheCoreDev
2020-10-20 16:45:41 +02:00
parent 25cb197711
commit bd1927da6f
334 changed files with 39634 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/colissimo/controllers/admin/AdminColissimoAffranchissementController.php
View File

@@ -1215,6 +1215,17 @@ class AdminColissimoAffranchissementController extends ModuleAdminController
$insurance = 0;
}
}
$isoOutreMerFtd = ColissimoTools::$isoOutreMer;
if (($key = array_search('YT', $isoOutreMerFtd)) !== false) {
unset($isoOutreMerFtd[$key]);
}
if (($key = array_search('PM', $isoOutreMerFtd)) !== false) {
unset($isoOutreMerFtd[$key]);
}
$productCode = $colissimoService->product_code;
$isoCustomerAddr = Country::getIsoById((int) $deliveryAddr->id_country);
$ftd = in_array($isoCustomerAddr, $isoOutreMerFtd) && $productCode == 'CDS' ? 1 : 0;
$data = array(
'id_order' => $idOrder,
'address_valid' => ColissimoTools::validateDeliveryAddress($deliveryAddr),
@@ -1223,18 +1234,21 @@ class AdminColissimoAffranchissementController extends ModuleAdminController
'relais' => $colissimoService->type === ColissimoService::TYPE_RELAIS,
'service' => $colissimoService->commercial_name,
'insurance' => $insurance,
'ftd' => $ftd,
);
$this->context->smarty->assign(array('order' => $data, 'key' => $idColissimoOrder));
$htmlAddress = $this->createTemplate('_partials/td-affranchissement-delivery-address.tpl')->fetch();
$htmlService = $this->createTemplate('_partials/td-affranchissement-service.tpl')->fetch();
$htmlInsurance = $this->createTemplate('_partials/td-affranchissement-insurance.tpl')->fetch();
$htmlFtd = $this->createTemplate('_partials/td-affranchissement-ftd.tpl')->fetch();
$return = array(
'error' => false,
'html_address' => $htmlAddress,
'html_service' => $htmlService,
'html_insurance' => $htmlInsurance,
'html_ftd' => $htmlFtd,
'order' => $data,
);
$this->ajaxDie(json_encode($return));