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

9
modules/colissimo/classes/ColissimoLabelGenerator.php
View File

@@ -296,6 +296,7 @@ class ColissimoLabelGenerator
);
$this->request->setSenderAddress($senderAddr);
/** @var Address $customerAddrDb */
$customerDeliveryAddr = $this->data['customer_addr'];
if ($colissimoService->type == ColissimoService::TYPE_RELAIS) {
$customerAddrDb = $this->data['customer_addr_inv'];
} else {
@@ -306,8 +307,8 @@ class ColissimoLabelGenerator
'codeBarForReference' => true,
'address' => array(
'companyName' => $customerAddrDb->company,
'lastName' => $customerAddrDb->lastname,
'firstName' => $customerAddrDb->firstname,
'lastName' => $customerDeliveryAddr->lastname,
'firstName' => $customerDeliveryAddr->firstname,
'line2' => $customerAddrDb->address1,
'line3' => $customerAddrDb->address2,
'countryCode' => Country::getIsoById($customerAddrDb->id_country),
@@ -504,6 +505,10 @@ class ColissimoLabelGenerator
$this->request->buildRequest();
$client = new ColissimoClient();
$client->setRequest($this->request);
$this->logger->info(
sprintf('Order #%d (%s) - Request', $this->data['order']->id, $this->data['order']->reference),
array('request' => json_decode($this->request->getRequest(true), true))
);
/** @var ColissimoGenerateLabelResponse $response */
$response = $client->request();
$this->logger->info(