Upgrading 1.3.8a to 1.3.9a trying to merge admin/orders.php
I have FEC, 1.5.1, Stock by Attributes 4.9 merged onto my 1.3.8a file. The parts to merge onto 1.3.9a file seem straight forward (lol) to me, but this section leaves me will cold feet.
In 1.3.9a:
Code:
//send emails
$message =
EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n\n" .
EMAIL_TEXT_INVOICE_URL . ' ' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n\n" .
EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']) . "\n\n" .
strip_tags($notify_comments) .
vs my merged copy in 1.3.8a which is same as this block in FEC most recent update.
Code:
//send emails
$message = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" .
EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n\n";
if(!$check_status->fields['COWOA_order']) {
$message .= EMAIL_TEXT_INVOICE_URL . ' ' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n\n";
}
$message .= EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']) . "\n\n" .
strip_tags($notify_comments) .
Question 1: any suggestions how to merge these two blocks.
Question 2: I also have Super Orders - does it override orders.php making my first question moot?
My server will be moving to PHP 5.3 but hasn't yet.
Bookmarks