Hi
I'm currently installing into a new zc_v1.5.4 in preparation for upgrading a v1.5.1 site.
I'm using Beyond Compare on a Mac to do file by file companions and edits
So far I've installed, in order:
mod_list.zip
backup_zc_v1.zip
Image_Handler4_v4_3_2.zip
admin_new_customer_3.zip
edit_orders-414.zip
admin_new_orders_1.zip
supertracker_1.1.zip
zen_TyPackageTracker-3.1.4a.zip
zen_COWOA-2.6.zip
No obvious problems, with limited testing. Now I'm installing Super Orders 4_0_9.
In that package I'm guessing I should be skipping "2a_Modified_Core_Files" and instead installing "2b_Modified_Core_Files-COWOA"
As I wade through the edits in /super_orders_4-0-9/2b_Modified_Core_Files-COWOA/includes/classes/order.php I'm encountering interference that I don't know how to resolve. Specifically whether COWOA_2.6 code should take precedence over Super_Orders code or vice versa.
Here's an example of the current state of this file after the install of COWOA 2.6 but before Super Orders:
Code:
// Add extra heading stuff via observer class
$this->extra_header_text = '';
$this->notify('NOTIFY_ORDER_INVOICE_CONTENT_FOR_ADDITIONAL_EMAILS', array('zf_insert_id' => $zf_insert_id, 'text_email' => $email_order, 'html_email' => $html_msg));
$email_order = $this->extra_header_text . $email_order;
$html_msg['EMAIL_TEXT_HEADER'] = nl2br($this->extra_header_text) . $html_msg['EMAIL_TEXT_HEADER'];
Super Orders wants me to replace it with this;
Code:
$this->notify('NOTIFY_ORDER_INVOICE_CONTENT_FOR_ADDITIONAL_EMAILS', array('zf_insert_id' => $zf_insert_id, 'text_email' => $email_order, 'html_email' => $html_msg));
zen_mail('', SEND_EXTRA_ORDER_EMAILS_TO, SEND_EXTRA_NEW_ORDERS_EMAILS_TO_SUBJECT . ' ' . EMAIL_TEXT_SUBJECT . EMAIL_ORDER_NUMBER_SUBJECT . $zf_insert_id,
$email_order . $extra_info['TEXT'], STORE_NAME, EMAIL_FROM, $html_msg, 'checkout_extra', $this->attachArray);
There are other examples in this file and in orders.php too. Eg
Code:
and pad.products_attributes_filename = '" . $db->prepare_input($chk_products_download->fields['orders_products_filename']) . "'
Code:
and pad.products_attributes_filename = '" . $chk_products_download->fields['orders_products_filename'] . "'
I'm not a coder per se although as a long time user of zen cart I've sort of become a reasonable tester/debugger. What I'm concerned here is that apparent changes in coding conventions (between v1.5.1 and 1.5.4) are just enough to confuse me at a time when the instructions in the readme flies for SO, EO, TY and the Add Customers/Orders plugins all say to let SO overwrite the order.php files.
I feel my options are either to just follow the instructions and blindly copy over, or ignore the instructions and let COWOA 2.6 dominate, or hardest of all, try to be intelligent about it and second guess the meaning of the differences.
Is there any general advice to be found here?
Bookmarks