@@ -11,6 +11,7 @@

 $GLOBALS['TL_DCA']['tl_iso_product_collection']['config']['onload_callback'][] = array('tl_iso_product_collection_eSM_isotope_shipmenttracking','registerSubPalettes');

 $GLOBALS['TL_DCA']['tl_iso_product_collection']['palettes']['default'] = str_replace(array('{status_legend}','{status_legend:hide}'),array('{status_legend},shipping_tracking','{status_legend:hide},shipping_tracking'),$GLOBALS['TL_DCA']['tl_iso_product_collection']['palettes']['default']);

+$GLOBALS['TL_DCA']['tl_iso_product_collection']['palettes']['default'] = str_replace('date_paid','shipping_annotation,date_paid',$GLOBALS['TL_DCA']['tl_iso_product_collection']['palettes']['default']);

 $GLOBALS['TL_DCA']['tl_iso_product_collection']['palettes']['__selector__'][] = 'shipping_tracking';

 $GLOBALS['TL_DCA']['tl_iso_product_collection']['subpalettes']['shipping_tracking'] = 'tracking_number';

@@ -39,6 +40,14 @@ $GLOBALS['TL_DCA']['tl_iso_product_collection']['fields']['tracking_number'] = a

   'eval'                      => array('mandatory'=>true, 'maxlength'=>255, 'tl_class'=>'w50', 'decodeEntities'=>true),

   'sql'                       => "varchar(255) NOT NULL default ''",

 );

+$GLOBALS['TL_DCA']['tl_iso_product_collection']['fields']['shipping_annotation'] = array

+(

+  'label'                     => &$GLOBALS['TL_LANG']['tl_iso_product_collection']['shipping_annotation'],

+  'exclude'                   => true,

+  'inputType'                 => 'textarea',

+  'eval'                      => array('style'=>'height:80px;', 'tl_class'=>'clr'),

+  'sql'                       => "mediumtext NULL",

+);

 $GLOBALS['TL_DCA']['tl_iso_product_collection']['fields']['order_status']['eval']['tl_class'] = 'clr';

@@ -16,6 +16,8 @@ class IsotopeHooks extends \Controller

 {

   public function getOrderNotificationTokens($Order, $arrTokens)

   {

+    $arrTokens['shipmenttracking_shipping_annotation'] = $Order->shipping_annotation;

+

     if (!$Order->shipping_tracking)

     {

       return $arrTokens;