BugWater, it's not (as you discovered) an easy merge! I've attached a zip-file that merges the changes into /YOUR_ADMIN/orders.php and also adds an admin-level observer so that the TyPT code can (a) insert the tracking code into the database when the orders-status history update occurs and (b) includes its text into the generated email.
Bookmarks