Various updates per meeting with Toms Moms

diff --git a/functions.php b/functions.php
index 7aa027e..c7bde4c 100755 (executable)
--- a/functions.php
+++ b/functions.php
@@ -196,13 +196,13 @@ function tm_added_checkout_fields_email( $keys ) {
 function add_custom_fields_to_order_printout( $fields, $order ) {
     $new_fields = array();
     if( get_post_meta( $order->id, 'Gift Message', true ) ) {
-        $new_fields['Gift Message'] = array( 
+        $new_fields['Gift Message'] = array(
             'label' => 'Gift Message',
             'value' => get_post_meta( $order->id, 'Gift Message', true )
         );
     }
     if( get_post_meta( $order->id, 'FedEx Shipping', true ) ) {
-        $new_fields['FedEx Shipping'] = array( 
+        $new_fields['FedEx Shipping'] = array(
             'label' => 'FedEx Shipping',
             'value' => get_post_meta( $order->id, 'FedEx Shipping', true )
         );
@@ -266,4 +266,21 @@ if ( ! current_user_can('manage_options') && ! current_user_can('edit_product')
     }
 }
 
+// Change "Processing" to "New Order"
+function glm_change_order_status_names( $order_statuses ) {
+
+    $new_order_statuses = array();
+
+    // add new order status after processing
+    foreach ( $order_statuses as $key => $status ) {
+        $new_order_statuses[ $key ] = $status;
+        if ( 'wc-on-hold' === $key ) {
+            $order_statuses[$key] = 'New Order';
+        }
+    }
+
+    return $order_statuses;
+}
+add_filter( 'wc_order_statuses', 'glm_change_order_status_names' );
+
 ?>

diff --git a/woocommerce/print-order/print-content.php b/woocommerce/print-order/print-content.php
new file mode 100644 (file)
index 0000000..a718b69
--- /dev/null
+++ b/woocommerce/print-order/print-content.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Print order content. Copy this file to your themes
+ * directory /woocommerce/print-order to customize it.
+ *
+ * @package WooCommerce Print Invoice & Delivery Note/Templates
+ */
+
+if ( !defined( 'ABSPATH' ) ) exit;
+?>
+
+                               <div class="order-branding">
+                                       <div class="company-logo">
+                                               <?php if( wcdn_get_company_logo_id() ) : ?><?php wcdn_company_logo(); ?><?php endif; ?>
+                                       </div>
+
+                                       <div class="company-info">
+                                               <?php if( !wcdn_get_company_logo_id() ) : ?><h1 class="company-name"><?php wcdn_company_name(); ?></h1><?php endif; ?>
+                                               <div class="company-address"><?php wcdn_company_info(); ?></div>
+                                       </div>
+
+                                       <?php do_action( 'wcdn_after_branding', $order ); ?>
+                               </div><!-- .order-branding -->
+
+
+                               <div class="order-addresses<?php if( !wcdn_has_shipping_address( $order ) ) : ?> no-shipping-address<?php endif; ?>">
+                                       <div class="billing-address">
+                                               <h3><?php _e( 'Billing Address', 'woocommerce-delivery-notes' ); ?></h3>
+                                               <address>
+
+                                                       <?php if( !$order->get_formatted_billing_address() ) _e( 'N/A', 'woocommerce-delivery-notes' ); else echo apply_filters( 'wcdn_address_billing', $order->get_formatted_billing_address(), $order ); ?>
+
+                                               </address>
+                                       </div>
+
+                                       <div class="shipping-address">
+                                               <h3><?php _e( 'Shipping Address', 'woocommerce-delivery-notes' ); ?></h3>
+                                               <address>
+
+                                                       <?php if( !$order->get_formatted_shipping_address() ) _e( 'N/A', 'woocommerce-delivery-notes' ); else echo apply_filters( 'wcdn_address_shipping', $order->get_formatted_shipping_address(), $order ); ?>
+
+                                               </address>
+                                       </div>
+
+                                       <?php do_action( 'wcdn_after_addresses', $order ); ?>
+                               </div><!-- .order-addresses -->
+
+
+                               <div class="order-info">
+                                       <h2><?php wcdn_document_title(); ?></h2>
+
+                                       <ul class="info-list">
+                                               <?php $fields = apply_filters( 'wcdn_order_info_fields', wcdn_get_order_info( $order ), $order ); ?>
+                                               <?php foreach( $fields as $field ) : ?>
+                                                       <li>
+                                                               <strong><?php echo apply_filters( 'wcdn_order_info_name', $field['label'], $field ); ?></strong>
+                                                               <span><?php echo apply_filters( 'wcdn_order_info_content', $field['value'], $field ); ?></span>
+                                                       </li>
+                                               <?php endforeach; ?>
+                                       </ul>
+
+                                       <?php do_action( 'wcdn_after_info', $order ); ?>
+                               </div><!-- .order-info -->
+
+
+                               <div class="order-items">
+                                       <table>
+                                               <thead>
+                                                       <tr>
+                                <th class="head-quantity"><span><?php _e('Quantity', 'woocommerce-delivery-notes'); ?></span></th>
+                                                               <th class="head-name"><span><?php _e('Product', 'woocommerce-delivery-notes'); ?></span></th>
+                                                               <th class="head-item-price"><span><?php _e('Price', 'woocommerce-delivery-notes'); ?></span></th>
+                                                               <th class="head-price"><span><?php _e('Total', 'woocommerce-delivery-notes'); ?></span></th>
+                                                       </tr>
+                                               </thead>
+
+                                               <tbody>
+                                                       <?php if( sizeof( $order->get_items() ) > 0 ) : ?>
+                                                               <?php foreach( $order->get_items() as $item ) : ?>
+
+                                                                       <?php
+                                                                               $product = apply_filters( 'wcdn_order_item_product', $order->get_product_from_item( $item ), $item );
+                                                                               $item_meta = new WC_Order_Item_Meta( $item['item_meta'], $product );
+                                                                       ?>
+
+                                                                       <tr>
+                                        <td class="product-quantity">
+                                            <span><?php echo apply_filters( 'wcdn_order_item_quantity', $item['qty'], $item ); ?></span>
+                                        </td>
+                                                                               <td class="product-name">
+                                                                                       <?php do_action( 'wcdn_order_item_before', $product, $order ); ?>
+
+                                                                                       <span class="name"><?php echo apply_filters( 'wcdn_order_item_name', $item['name'], $item ); ?></span>
+
+                                                                                       <?php $item_meta->display(); ?>
+
+                                                                                       <dl class="extras">
+                                                                                               <?php if( $product && $product->exists() && $product->is_downloadable() && $order->is_download_permitted() ) : ?>
+
+                                                                                                       <dt><?php _e( 'Download:', 'woocommerce-delivery-notes' ); ?></dt>
+                                                                                                       <dd><?php printf( __( '%s Files', 'woocommerce-delivery-notes' ), count( $order->get_item_downloads( $item ) ) ); ?></dd>
+
+                                                                                               <?php endif; ?>
+
+                                                                                               <?php
+                                                                                                       $fields = apply_filters( 'wcdn_order_item_fields', array(), $product, $order );
+                                                                                                       foreach ( $fields as $field ) :
+                                                                                               ?>
+
+                                                                                                       <dt><?php echo $field['label']; ?></dt>
+                                                                                                       <dd><?php echo $field['value']; ?></dd>
+
+                                                                                               <?php endforeach; ?>
+                                                                                       </dl>
+                                                                               </td>
+                                                                               <td class="product-item-price">
+                                                                                       <span><?php echo wcdn_get_formatted_item_price( $order, $item ); ?></span>
+                                                                               </td>
+                                                                               <td class="product-price">
+                                                                                       <span><?php echo $order->get_formatted_line_subtotal( $item ); ?></span>
+                                                                               </td>
+                                                                       </tr>
+                                                               <?php endforeach; ?>
+                                                       <?php endif; ?>
+                                               </tbody>
+
+                                               <tfoot>
+                                                       <?php if( $totals = $order->get_order_item_totals() ) : ?>
+                                                               <?php foreach( $totals as $total ) : ?>
+                                                                       <tr>
+                                                                               <td class="total-quantity"></td>
+                                        <td class="total-item-price"></td>
+                                        <td class="total-name"><span><?php echo $total['label']; ?></span></td>
+                                                                               <td class="total-price"><span><?php echo $total['value']; ?></span></td>
+                                                                       </tr>
+                                                               <?php endforeach; ?>
+                                                       <?php endif; ?>
+                                               </tfoot>
+                                       </table>
+
+                                       <?php do_action( 'wcdn_after_items', $order ); ?>
+                               </div><!-- .order-items -->
+
+
+                               <div class="order-notes">
+                                       <?php if( wcdn_has_customer_notes( $order ) ) : ?>
+                                               <h4><?php _e( 'Customer Note', 'woocommerce-delivery-notes' ); ?></h4>
+                                               <?php wcdn_customer_notes( $order ); ?>
+                                       <?php endif; ?>
+
+                                       <?php do_action( 'wcdn_after_notes', $order ); ?>
+                               </div><!-- .order-notes -->
+
+
+                               <div class="order-thanks">
+                                       <?php wcdn_personal_notes(); ?>
+
+                                       <?php do_action( 'wcdn_after_thanks', $order ); ?>
+                               </div><!-- .order-thanks -->
+
+
+                               <div class="order-colophon">
+                                       <div class="colophon-policies">
+                                               <?php wcdn_policies_conditions(); ?>
+                                       </div>
+
+                                       <div class="colophon-imprint">
+                                               <?php wcdn_imprint(); ?>
+                                       </div>
+
+                                       <?php do_action( 'wcdn_after_colophon', $order ); ?>
+                               </div><!-- .order-colophon -->