Merge pull request #28 from NicolasBarbey/main

show label creation date instead of order creation date in label list
thelia-modules · Feb 23, 2024 · 6020345 · 6020345
2 parents 7fc0b1f + b47f918
commit 6020345
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -13,7 +13,7 @@
  <language>en_US</language>
  <language>fr_FR</language>
  </languages>
- <version>2.0.5</version>
+ <version>2.0.6</version>
  <authors>
  <author>
  <name>Gilles Bourgeat</name>

diff --git a/Loop/ColissimoLabelInfo.php b/Loop/ColissimoLabelInfo.php
@@ -94,6 +94,7 @@ public function parseResults(LoopResult $loopResult): LoopResult
  ->set('CLEAR_LABEL_URL', URL::getInstance()->absoluteUrl('/admin/module/ColissimoLabel/label/delete/'.$result->getTrackingNumber().'?order='.$result->getOrderId()))
  ->set('CAN_BE_NOT_SIGNED', ColissimoLabel::canOrderBeNotSigned($result->getOrder()))
  ->set('ORDER_DATE', $result->getOrder()->getCreatedAt())
+ ->set('CREATED_AT', $result->getCreatedAt())
  ;
 
  $loopResult->addRow($loopResultRow);

diff --git a/templates/backOffice/default/colissimo-label/label-list.html b/templates/backOffice/default/colissimo-label/label-list.html
@@ -8,7 +8,7 @@
  {$WEIGHT} / Kg
  </td>
  <td>
- {format_date date=$ORDER_DATE}
+ {format_date date=$CREATED_AT}
  </td>
  <td>
  <a href="{intl l="https://www.laposte.fr/particulier/outils/suivre-vos-envois?code=%track" track={$TRACKING_NUMBER}}" target="_blank">{intl l="https://www.laposte.fr/particulier/outils/suivre-vos-envois?code=%track" track={$TRACKING_NUMBER}}</a>