modules/openresort/openresort.ecommerce.patch

Index: cart/cart.module
===================================================================
--- cart/cart.module	(revision 2661)
+++ cart/cart.module	(working copy)
@@ -8,14 +8,15 @@
 /**
  * Declare a block or set of blocks
  */
-function cart_block($op = "list", $delta = 0, $edit = array()) {
+ //TODO convert shopping cart block to display bookings/itenary
+/*function cart_block($op = "list", $delta = 0, $edit = array()) {
   if ($op == 'list') {
     $blocks[0]['info'] = t('Shopping Cart');
     return $blocks;
   }
   /* We don't need to display this on the cart page. */
   //elseif ($_GET['q'] != "cart" && !strstr($_GET['q'], "cart/")) {
-  else if ($op == 'view') {
+  /*else if ($op == 'view') {
     switch($delta) {
       case 0:
         $item_count = count(cart_get_items());
@@ -35,14 +36,14 @@
   elseif ($op == 'save' && isset($edit['cart_empty_hide'])) {
     variable_set('cart_empty_hide', $edit['cart_empty_hide']);
   }
-}
+}*/
 
 /**
  * Perform periodic actions
  */
 function cart_cron() {
   // Remove items from the cart table that haven't been touched for more than a month.
-  db_query('DELETE FROM {ec_cart} WHERE changed < %d', strtotime('Last month'));
+      db_query('DELETE FROM {ec_cart} WHERE changed < %d', strtotime('-'.variable_get('accommodation_hold_cust_time',900).' seconds'));
   // Optimize table query removed - users can now install DB maintenance module
   // for this.
 }
@@ -292,14 +293,23 @@
   }
 
   // Build the cart form
+  $breadcrumbs[] = l(t('Home'), "");
+  drupal_set_breadcrumb($breadcrumbs);
   $items = cart_get_items();
   if ($items) {
     return drupal_get_form('cart_view_form', $items);
   }
   else {
-    return '<p>'. t('Your shopping cart is empty. You may continue shopping from our !product-page.', array('!product-page' => l(t('Product page'), 'product'))). '</p>';
+   drupal_set_title('itinerary');
+   if (module_exists('openresort')){
+   	return openresort_empty_cart();
+   }else{
+   	//single property only so we take the ecommerce enable business
+   	$result = db_result(db_query('SELECT nid FROM {business} WHERE ecommerce = 1'));
+   	return '<p>'. t('Your itinerary is empty. You may add to it by clicking !product-page.', array('!product-page' => l(t('here'), 'node/'.$result))). '</p>';
   }
 }
+}
 
 /**
  * This is a form to handle the cart view
@@ -308,36 +318,47 @@
   $form['items'] = array('#tree' => TRUE);
   foreach ($items as $i) {
     $node = node_load($i->nid);
-    $form['items'][$node->nid]['#node'] = $node;
-    $form['items'][$node->nid]['title'] = array(
+    $form['items'][$node->nid.'-'.$i->changed]['#node'] = $node;
+    $form['items'][$node->nid.'-'.$i->changed]['title'] = array(
       '#value' => l($node->title, "node/". ($node->pparent ? $node->pparent : $node->nid))
     );
-    $form['items'][$node->nid]['#total'] = product_has_quantity($node) ? $i->price * $i->qty : $i->price;
-    $form['items'][$node->nid]['#specials'] = product_get_specials($i, 'cart', TRUE);
+    $form['items'][$node->nid.'-'.$i->changed]['#total'] = $i->price;
+    $form['items'][$node->nid.'-'.$i->changed]['#specials'] = product_get_specials($i, 'cart', true);
     if ($node->is_recurring) {
-      $form['items'][$node->nid]['recurring'] = array(
+      $form['items'][$node->nid.'-'.$i->changed]['recurring'] = array(
         '#value' => theme('recurring_schedule', $node->schedule)
       );
     }
     if ($node->ptype == 'tangible' && $node->availability != NULL && $node->availability != 1) {
-      $form['items'][$node->nid]['availability'] = array(
+      $form['items'][$node->nid.'-'.$i->changed]['availability'] = array(
         '#value' => availability_get_message($node->availability)
       );
     }
+    //we need to add something in here to deal with nights stay
+      //and arrival date
+      $subitem = $i->subitem;
+      //unit type is also required
+      //change this so as we use the key - we also need to read from accom inventory
+      //and join on the node table
+      while($key = key($subitem)){
+       //foreach ($subitem as $s){
+      	$form['items'][$node->nid.'-'.$i->changed]['#arrive'] = $subitem[$key]->date;
+      	$form['items'][$node->nid.'-'.$i->changed]['#unitname'] = db_result(db_query("SELECT title FROM node n inner join accommodation_inventory i on n.nid = i.unit_id inner join accommodation_availability a on a.iid = i.iid where a.aid = " . $key ));
+      	break;
+       }
+      $form['items'][$node->nid.'-'.$i->changed]['#days'] = $i->days;
+      
     if (product_has_quantity($node)) {
-      $form['items'][$node->nid]['qty'] = array(
+		//commented out so as no quantity displayed for booking
+		//will need to readd and think of another solution once we
+		//have activities
+        /*$form['items'][$node->nid]['qty'] = array(
         '#type' => 'textfield',
         '#default_value' => $i->qty,
         '#size' => 2,
         '#maxlength' => 2
-      );
+        );*/
     }
-    else {
-      $form['items'][$node->nid]['qty'] = array(
-        '#type' => 'value',
-        '#value' => $i->qty,
-      );
-    }
 
     if ($extra = product_invoke_productapi($i, 'cart form')) {
       $form['items'][$node->nid]['extra'] = $extra;
@@ -345,8 +366,7 @@
     }
   }
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Update Cart'));
-  $form['checkout'] = array('#type' => 'submit', '#value' => t('Checkout'));
+    $form['checkout'] = array('#type' => 'submit', '#value' => t('book it'));
 
   return $form;
 }
@@ -361,7 +381,7 @@
       cart_update_item_object((object)$form_values);
       return 'cart/view';
 
-    case t('Checkout'):
+    case t('book it'):
       // force it not to validate so we see the update quantity page again.
       return 'cart/checkout';
   }
@@ -573,7 +593,7 @@
     drupal_goto('cart/checkout', 'op=next');
   }
 
-  drupal_set_title(t('Please review and submit your order'));
+  drupal_set_title(t('Please review and submit your itinerary'));
 
   foreach ($data->review_screens as $module) {
     $function = "{$module}_checkoutapi";
@@ -585,7 +605,7 @@
     }
   }
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Place your order'));
+  $form['submit'] = array('#type' => 'submit', '#value' => t('book it'));
 
   $form['txn'] = array(
     '#type' => 'value',
@@ -636,7 +656,7 @@
 
   // If the user is submitting the order then process it, other-wise just
   // save it.
-  if ($form_values['op'] == t('Place your order')) {
+  if ($form_values['op'] == t('book it')) {
 
     // Make sure we have a user id
     if (!$txn->uid) {
@@ -735,16 +755,24 @@
         $price = store_adjust_misc($txn, $product);
         $node = node_load($product->nid);
         $subtotal = product_has_quantity($node) ? ($price * $product->qty) : $price;
-
-        $form['items'][$product->nid] = array(
+		$subitem = $product->subitem;
+		 $txn->subtotal += $subtotal;
+       	foreach ($subitem as $s){
+      		$date = $s->date;
+      		break;
+       	}
+       	$itemdata = $product;
+        $form['items'][$product->nid.'-'.$product->changed] = array(
           'qty' => array('#value' => product_has_quantity($node) ? $product->qty : ''),
-          'item' => array('#type' => 'value', '#value' => $product), // allow more info to be displayed by the theme
+          'item' => array('#type' => 'value', '#value' => $itemdata), // allow more info to be displayed by the theme
           'price' => array('#value' => $price),
-          'subtotal' => array('#value' => $subtotal),
+          'subtotal' => array('#value' => $txn->subtotal),
+          'days' => array('#value' => $product->days),
+          'date' => array('#value' => $date),
+          'ptype' => array('#value' => $node->ptype),
           'options' => array('#value' => $txn->type == 'cart' ? l(t('Change'), 'cart/view') : '')
         );
 
-        $txn->subtotal += $subtotal;
       }
 
       $form['totals'] = array();
@@ -1042,7 +1070,22 @@
 function cart_remove_item($nid) {
 
   if (!$nid) return NULL;
-  db_query("DELETE FROM {ec_cart} WHERE cookie_id = '%s' AND nid = %d", cart_get_id(), $nid);
+  $splitkey = explode('-',$nid);
+  //need to update accommodation availability
+  //subitem in the data field will give aid - go through the key
+  if(module_exists('accommodation')){
+        $transaction = db_fetch_object(db_query("SELECT * FROM {ec_cart} WHERE cookie_id = '%s' AND nid = %d AND changed= %d", cart_get_id(), $splitkey[0],$splitkey[1]));
+    	 //need to work out how to upack the object
+	 	$transaction = unserialize($transaction->data);
+ 		$localsubitem = $transaction->subitem;
+	 	while($key = key($localsubitem)){
+	 	//use the aid to local up the iid
+		  	$row = db_fetch_object(db_query("SELECT iid,date from accommodation_availability where aid = ".$key));
+			db_query("UPDATE accommodation_availability SET reserved_date = '". date('Y-m-d H:i:s',time()) ."' WHERE aid = " . $key);
+			next($localsubitem);    	 
+		}
+  }
+   db_query("DELETE FROM {ec_cart} WHERE cookie_id = '%s' AND nid = %d AND changed= %d", cart_get_id(), $splitkey[0],$splitkey[1]);
   drupal_set_message(t('Your item has been removed.'));
   cache_clear_all();
 }
@@ -1085,11 +1128,12 @@
     while ($cart = db_fetch_object($result)) {
       $cart = drupal_unpack($cart, 'data');
       $p = product_load($cart);
-      foreach ($p as $key => $value) {
-        $cart->$key = $value;
+      //foreach ($p as $key => $value) {
+      //  $cart->$key = $value;
+      //}
+      //change so as based on the key for none quantity driven items
+      $items[$id][$cart->nid.$cart->changed] = $cart;
       }
-      $items[$id][$cart->nid] = $cart;
-    }
     if (!$items[$id]) {
       $items[$id] = array();
     }
Index: ec_anon/ec_anon.install
===================================================================
--- ec_anon/ec_anon.install	(revision 2484)
+++ ec_anon/ec_anon.install	(working copy)
@@ -3,7 +3,9 @@
  * @author Sammy Spets thanks to Synerger Pty Ltd
  */
 
+if(function_exists('drupal_get_path')){
 require_once (drupal_get_path('module', 'ec_anon') .'/ec_anon.module');
+}
 
 /**
  * Installs E-Commerce anonymous purchasing tables into the database
@@ -51,8 +53,13 @@
   }
   variable_set('ec_anon_policy', $newval);
 
+  if(function_exists('ec_anon_policy_list')){
   $plist = ec_anon_policy_list(false);
   drupal_set_message(t('Anonymous purchasing policy for the site has been set to <b>!policy</b>. You can change it on the <a href="@settingsurl">store settings page</a>.',
     array('!policy' => $plist[$newval], '@settingsurl' => url('admin/ecsettings'))));
+	}
 }
 
+
+
+
Index: ec_anon/ec_anon.module
===================================================================
--- ec_anon/ec_anon.module	(revision 2484)
+++ ec_anon/ec_anon.module	(working copy)
@@ -422,7 +422,8 @@
   $form['mail'] = array(
     '#type' => 'textfield',
     '#title' => t('Email'),
-    '#default_value' => $txn->mail
+    '#default_value' => $txn->mail,
+    '#required' => true,
   );
   $form[] = array('#type' => 'submit', '#value' => t('Continue'));
 
Index: ec_mail/ec_mail.install
===================================================================
--- ec_mail/ec_mail.install	(revision 2484)
+++ ec_mail/ec_mail.install	(working copy)
@@ -4,9 +4,10 @@
  * ec_mail.install
  * @author Sammy Spets thanks to Synerger Pty Ltd
  */
+if(function_exists('drupal_get_path')){
+	require_once(drupal_get_path('module', 'store') . '/store.deps.inc');
+}
 
-require_once(drupal_get_path('module', 'store') . '/store.deps.inc');
-
 /**
  * ec_mail_install()
  * 
@@ -44,6 +45,7 @@
   }
 }
 
+
 /**
  * Implementation of hook_uninstall().
  *
@@ -54,4 +56,4 @@
   if (db_table_exists('ec_mail')) {
     db_query('DROP TABLE {ec_mail}');
   }
-}
\ No newline at end of file
+}
Index: product/product.install
===================================================================
--- product/product.install	(revision 2484)
+++ product/product.install	(working copy)
@@ -1,8 +1,9 @@
 <?php
 // $Id: product.install,v 1.7.4.2.2.2 2007/07/27 04:53:22 gordon Exp $
+if(function_exists('drupal_get_path')){
+	require_once(drupal_get_path('module', 'store') . '/store.deps.inc');
+}
 
-require_once(drupal_get_path('module', 'store') . '/store.deps.inc');
-
 /**
  * E-Commerce product module schema
  */
Index: store/store.inc
===================================================================
--- store/store.inc	(revision 2484)
+++ store/store.inc	(working copy)
@@ -41,16 +41,16 @@
   if (db_result(db_query('SELECT COUNT(txnid) FROM {ec_transaction_address} WHERE txnid = %d AND type = \'%s\'', $address->txnid, $type))) {
     db_query('UPDATE {ec_transaction_address} ' .
       "SET firstname = '%s', lastname = '%s', street1 = '%s', street2 = '%s', " .
-      "zip = '%s', city = '%s', state = '%s', country = '%s' " .
+      "zip = '%s', city = '%s', state = '%s', country = '%s',phone = '%s' " .
       "WHERE txnid = %d AND type = '%s'",
       $address->firstname, $address->lastname, $address->street1, $address->street2,
-      $address->zip, $address->city, $address->state, $address->country, $address->txnid, $type);
+      $address->zip, $address->city, $address->state, $address->country,$address->phone, $address->txnid, $type);
   }
   else {
-    db_query('INSERT INTO {ec_transaction_address} (firstname, lastname, street1, street2, zip, city, state, country, txnid, type) VALUES' .
-      "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s')",
+    db_query('INSERT INTO {ec_transaction_address} (firstname, lastname, street1, street2, zip, city, state, country,phone, txnid, type) VALUES' .
+      "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s','%s', %d, '%s')",
       $address->firstname, $address->lastname, $address->street1, $address->street2,
-      $address->zip, $address->city, $address->state, $address->country, $address->txnid, $type);
+      $address->zip, $address->city, $address->state, $address->country,$address->phone, $address->txnid, $type);
   }
 }
 
@@ -380,6 +380,16 @@
     '#default_value' => ($address->country ? $address->country : variable_get('ec_country', '')),
     '#options' => store_build_countries(),
   );
+  $form['phone'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Phone Number'),
+    '#default_value' => $address->phone,
+    '#size' => 50,
+    '#maxlength' => 100,
+    '#description' => null,
+    '#attributes' => null,
+    '#required' => false,
+  );
   return $form;
 }
 
Index: store/store.install
===================================================================
--- store/store.install	(revision 2484)
+++ store/store.install	(working copy)
@@ -1,7 +1,9 @@
 <?php
 // $Id: store.install,v 1.20.2.1.2.12.2.11 2007/07/27 13:10:56 gordon Exp $
 
+if(function_exists('drupal_get_path')){
 require_once(drupal_get_path('module', 'store') . '/store.deps.inc');
+}
 
 /**
  * E-Commerce store.module schema
@@ -39,6 +41,7 @@
         city varchar(32) NOT NULL default '',
         state varchar(32) NOT NULL default '',
         country varchar(2) NOT NULL default '',
+		phone varchar(45) NOT NULL default '',
         PRIMARY KEY  (txnid,type)
       ) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;");
       db_query("CREATE TABLE {ec_transaction_product} (
@@ -49,7 +52,10 @@
         price decimal(10,2) NOT NULL default '0.00',
         qty int(10) unsigned NOT NULL default '0',
         data text,
-        UNIQUE KEY txnid (txnid,nid),
+		last_notify INTEGER UNSIGNED NOT NULL default 0,
+		dataid INTEGER UNSIGNED NOT NULL default 0,
+		item_status INTEGER UNSIGNED NOT NULL default 0,
+		PRIMARY KEY(txnid, nid, last_notify),
         KEY txnid_2 (txnid)
       ) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;");
       db_query("CREATE TABLE {ec_transaction_misc} (
Index: store/store.module
===================================================================
--- store/store.module	(revision 2661)
+++ store/store.module	(working copy)
@@ -81,7 +81,12 @@
      day and then adjust the shipping workflow after a given time period, such
      as 2 week (in case of returns or something) rather than automatically
      closing it here.  */
-  db_query('UPDATE {ec_transaction} SET workflow = 6 WHERE workflow = 3 AND payment_status = 2');
+           $query = db_query("SELECT txnid FROM {ec_transaction} WHERE workflow = 1 AND payment_status = 1 AND changed < '".strtotime('-'.variable_get('accommodation_hold_cust_time',900).' seconds')."'");
+  	 while($txnid = db_fetch_object($query)){
+  	 	$t = store_transaction_load($txnid->txnid);
+  	 	$t->workflow = 5;
+  	 	store_transaction_save($t);
+  	 }
 
   if (variable_get('payment_notices', 0)) {
     global $base_url;
@@ -640,10 +645,10 @@
  */
 function store_transaction_workflow() {
   $transaction_workflow = array (
-    EC_WORKFLOW_RECEIVED => t('received'),
-    EC_WORKFLOW_INVOICED => t('invoiced'),
-    EC_WORKFLOW_SHIPPED => t('shipped'),
-    EC_WORKFLOW_AWAITING_RESPONSE => t('awaiting customer response'),
+    EC_WORKFLOW_RECEIVED => t('booking received'),
+    EC_WORKFLOW_INVOICED => t('awaiting accommodator response'),
+    EC_WORKFLOW_SHIPPED => t('booking confirmed'),
+    EC_WORKFLOW_AWAITING_RESPONSE => t('accommodator payed'),
     EC_WORKFLOW_CANCELED => t('canceled'),
     EC_WORKFLOW_COMPLETED => t('completed'),
     EC_WORKFLOW_SECURITY_VIOLATION => t('security violation'),
@@ -748,7 +753,7 @@
 }
 
 function store_transaction_product_fields() {
-  return array('txnid', 'nid', 'vid', 'title', 'price', 'qty', 'data');
+  return array('txnid', 'nid', 'vid', 'title', 'price', 'qty', 'data','last_notify','dataid','item_status');
 }
 
 function store_transaction_misc_fields() {
@@ -925,29 +930,55 @@
  * Save transaction products.
  */
 function store_transaction_save_product($item) {
-  static $product_cache = array();
+  //static $product_cache = array();
   $product_fields = store_transaction_product_fields();
-
-  if (!$product_cache[$item->txnid]) {
+ if(!$item->last_notify){
+  	$item->last_notify = rand();
+  }
+  /*if (!$product_cache[$item->txnid]) {
     $result = db_query("SELECT vid FROM {ec_transaction_product} WHERE txnid = %d", $item->txnid);
     while ($row = db_fetch_object($result)) {
       $product_cache[$item->txnid][] = $row->vid;
     }
-  }
+  }*/
   // Serialize the data field so that it is saved to the database.
   if (isset($item->data)) {
+  	$localdata  = $item->data;
+  	 $dataid = 0;
+  	if(isset($localdata->subitem)){
+	  $localsubitem = $localdata->subitem;
+	  while($key = key($localsubitem)){
+		if($status != 2){
+		  	$queryresult = db_fetch_object(db_query("SELECT unit_id,status FROM {accommodation_availability} a INNER JOIN {accommodation_inventory} i ON a.iid = i.iid" .
+		  	" WHERE aid =%d",$key));
+		  	if($dataid ==0){
+		  		$dataid = $queryresult->unit_id;
+		  	}
+		  	if($status == 0||$status != $queryresult->status){
+		  		$status = $queryresult->status;
+		  	}
+	  	}
+	  	next($localsubitem);
+	  }
+  	}else{
+  		$dataid = $item->nid;
+  	}
+  	$item -> dataid = $dataid;
+	$item -> item_status = $status;
     $item->data = serialize($item->data);
+  }else{
+  	$item -> dataid = $item->nid;
   }
 
-  if (is_array($product_cache[$item->txnid]) && in_array($item->vid, $product_cache[$item->txnid])) {
-    // Update product
+  $count = db_result(db_query("SELECT count(*) FROM {ec_transaction_product} WHERE vid = %d AND txnid = %d AND last_notify = %d",$item->vid,$item->txnid,$item->last_notify));
+  if($count > 0){
     foreach($product_fields as $key) {
       if (isset($item->$key)) {
         $q[] = db_escape_string($key) ." = '%s'";
         $v[] = $item->$key;
       }
     }
-    db_query('UPDATE {ec_transaction_product} SET '. implode(', ', $q) ." WHERE txnid = '". $item->txnid ."' AND vid = '".$item->vid  ."'", $v);
+    db_query('UPDATE {ec_transaction_product} SET '. implode(', ', $q) ." WHERE txnid = '%s' AND vid = '%s' AND last_notify = '%s'", $v,$item->txnid,$item->vid,$item->last_notify);
     module_invoke($item->ptype, 'productapi', $item, 'transaction', 'update');
   }
   else {
@@ -1137,6 +1168,8 @@
 
 function store_send_invoice_email($txnid, $preview = null) {
   $t = store_transaction_load($txnid);
+  $variables  = token_get_values('global',$t);
+  $from = variable_get("site_mail", ini_get("sendmail_from"));
 
   if ($t->mail && valid_email_address($t->mail)) {
     $to = $t->mail;
@@ -1149,8 +1182,20 @@
     return ec_mail_preview($mid, $to, $t);
   }
   elseif ($to && valid_email_address($to)) {
-    return ec_mail_send_mid($mid, $to, $t);
+  	$adminemail = db_result(db_query("SELECT mail FROM {users} WHERE uid = '1'"));
+  	ec_mail_send_mid($mid, $adminemail, $t,variable_get('reservation_email',variable_get('site_mail','')));
+  	//this doesn't work need to load the transaction
+  	
+  	$emaillist = array();
+  	foreach($t->items as $item){
+	  	$owner = db_result(db_query("SELECT distinct mail FROM {users} u join {node} n on n.uid = u.uid where n.nid = %d", $item->dataid));
+		if (!array_key_exists ($owner,$emaillist)){
+	  		ec_mail_send_mid($mid,$owner,$t,variable_get('reservation_email',variable_get('site_mail','')));
+	  		$emaillist[$owner] = $owner;
   }
+  	}
+    return ec_mail_send_mid($mid,$to,$t,variable_get('reservation_email',variable_get('site_mail','')));
+  }
   else {
     return false;
   }
@@ -1754,7 +1799,7 @@
     // Now that we know the tables, apply the correct column display map.
     $column_map = array(
       'users'          => array(array('data' => t('user'), 'field' => 'u.uid')),
-      'ec_transaction' => array(array('data' => t('txnid'), 'field' => 'st.txnid', 'sort' => 'desc'), array('data' => t('user'), 'field' => 'st.uid'), array('data' => t('payment status'), 'field' => 'st.payment_status'), array('data' => t('workflow'), 'field' => 'st.workflow'), array('data' => t('gross'), 'field' => 'st.gross'), array('data' => t('created'), 'field' => 'st.created'), array('data' => t('changed'), 'field' => 'st.changed'), array('data' => t('duedate'), 'field' => 'st.duedate'))
+      'ec_transaction' => array(array('data' => t('txnid'), 'field' => 'st.txnid', 'sort' => 'desc'), array('data' => t('user'), 'field' => 'st.uid'), array('data' => t('payment status'), 'field' => 'st.payment_status'), array('data' => t('workflow'), 'field' => 'st.workflow'), array('data' => t('gross'), 'field' => 'st.gross'), array('data' => t('changed'), 'field' => 'st.changed'))
     );
 
     // Expand all query parts.
@@ -1775,7 +1820,7 @@
     }
     $columns = array_unique($columns);
     $header = _store_array_distinct($table, 'data');
-    $header[] = t('items ordered');
+    //$header[] = t('items ordered');
     $header[] = t('operations');
 
     // Get SQL sort clause.
@@ -1794,11 +1839,11 @@
       // fields need special formatting.
       foreach ($columns as $col) {
 
-        if (($col == 'created' || $col == 'changed' || $col == 'expires') && $data->$col != 0) {
+        if (($col == 'changed' || $col == 'expires') && $data->$col != 0) {
           $row[] = format_date($data->$col, 'small');
         }
         elseif ($col == 'duedate') {
-          $row[] = $data->$col ? format_date($data->$col, 'small') : '';
+         // $row[] = $data->$col ? format_date($data->$col, 'small') : '';
         }
         elseif ($col == 'uid') {
           $username = db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $data->$col));
@@ -1844,8 +1889,8 @@
       }
 
       // Count the number of items in this transaction
-      $num_items = db_result(db_query("SELECT SUM(qty) as items FROM {ec_transaction_product} WHERE txnid = %d", $data->txnid));
-      $row[] = l(format_plural($num_items, '1 item', '@count items'), "admin/store/transaction/product/view/$data->txnid", array('onclick' => "window.open(this.href, 'items_ordered', 'width=480,height=480,scrollbars=yes,status=yes'); return false"));
+      //$num_items = db_result(db_query("SELECT SUM(qty) as items FROM {ec_transaction_product} WHERE txnid = %d", $data->txnid));
+      //$row[] = l(format_plural($num_items, '1 item', '@count items'), "admin/store/transaction/product/view/$data->txnid", array('onclick' => "window.open(this.href, 'items_ordered', 'width=480,height=480,scrollbars=yes,status=yes'); return false"));
 
       $row[] = l(t('edit'), $edit_uri, array(), $edit_params) .
              '<br />&nbsp;&nbsp;&nbsp;'. l(t('addresses'), "admin/store/transaction/edit/$data->txnid", array(), "section=addresses&". drupal_get_destination()) .
@@ -1877,18 +1922,37 @@
       }
     }
   }
-  return $output;
+  return '<div class="trantab">'.$output.'</div>';
 }
 
 function store_transaction_item_list(&$txn) {
   $rows = array();
   foreach (array_keys($txn->items) as $key) {
     $p =& $txn->items[$key];
-    $rows[] = array($p->title, l(t('edit'), "admin/store/transaction/product/edit/$txn->txnid/$p->nid", array(), drupal_get_destination()));
+    $node = node_load($p->nid);
+    $price = store_adjust_misc($txn, $p);
+    if($p->dataid > 0){
+    	$unitname = db_result(db_query("SELECT title FROM node n where n.nid = " . $p->dataid));
+    }else{
+    	$unitname ='';
   }
-
+    $data = $p->data;
+    $localsubitem = $data->subitem;
+    $first = true;
+    while($key = key($localsubitem)){
+      	if($first == true){
+      		$arrivaldate = $localsubitem[$key]->date;
+      		$propertyowner = $key;
+      		$first = false;
+      	}
+      	next($localsubitem);
+    }
+    $occupants = $p->data->occupants;
+    $rows[] =array(array('data' => $p->qty, 'align' => 'center', 'valign' => 'top'),array('data' => $p->title, 'align' => 'center', 'valign' => 'top'),array('data' => $occupants, 'align' => 'center', 'valign' => 'top'),array('data' => $unitname, 'align' => 'center', 'valign' => 'top'),array('data' => $arrivaldate, 'align' => 'center', 'valign' => 'top'),array('data' => $p->data->days, 'align' => 'center', 'valign' => 'top'),array('data' => payment_format($price), 'valign' => 'top', 'align' => 'right'));;
+  }
+  $header = array(t('Quantity'), t('Item'),t('People'),t('Type'),t('Arrival'),t('Nights'), t('Price'));
   if (count($rows)) {
-    return theme('table', array('product', 'op'), $rows);
+    return theme('table', $header, $rows);
   }
 
   return '';
@@ -1926,7 +1990,7 @@
   }
   $form['items'] = array(
     '#type' => 'item',
-    '#title' => t('Transaction items'),
+    '#title' => t(''),
     '#value' => $items
   );
   $form['txnid'] = array(
@@ -1934,21 +1998,6 @@
     '#value' => $txn->txnid
   );
 
-  $form['products'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Products'),
-  );
-  $form['products']['nids'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Product IDs'),
-    '#default_value' => $txn->nids,
-    '#autocomplete_path' => 'product/autocomplete/all',
-    '#size' => 60,
-    '#maxlength' => 128,
-    '#description' =>  t('Enter a comma separated list of product ids to add to this transaction. Here is a <a href="!product_quicklist" onclick="window.open(this.href, \'!product_quicklist\', \'width=480,height=480,scrollbars=yes,status=yes\'); return false">list of all products</a>.', array('!product_quicklist' => url('admin/store/products/quicklist')))
-  );
-  $form['products'][] = array('#type' => 'submit', '#value' => t('Add products'));
-
   return $form;
 }
 
@@ -2254,11 +2303,10 @@
 
   $header = array(
     array('data' => t('ID'), 'field' => 'st.txnid', 'sort' => 'desc'),
-    array('data' => t('payment status'), 'field' => 'st.payment_status'),
+    //array('data' => t('payment status'), 'field' => 'st.payment_status'),
     array('data' => t('workflow'), 'field' => 'st.workflow'),
     array('data' => t('total'), 'field' => 'st.gross'),
     array('data' => t('created'), 'field' => 'st.created'),
-    array('data' => t('due date'), 'field' => 'st.duedate'),
     t('items ordered'),
     t('operations')
   );
@@ -2275,17 +2323,16 @@
     }
 
     $operations = array(l(t('view'), "store/transaction/view/$txn->txnid"));
-    if ($txn->payment_status == payment_get_status_id('pending')) {
+    /*if ($txn->payment_status == payment_get_status_id('pending')) {
       $operations[] = l(t('make payment'), "store/payment/{$txn->txnid}");
-    };
+    };*/
 
     $rows[] = array(
       $txn->txnid,
-      payment_get_status($txn->payment_status),
+      //payment_get_status($txn->payment_status),
       transaction_get_workflow($txn->workflow),
       module_invoke('payment', 'format', $txn->gross),
       format_date($txn->created, 'small'),
-      $txn->duedate ? (($txn->duedate > time()) ? format_date($txn->duedate, 'small') : t('Overdue')) : '',
       format_plural($num_items, '1 item', '@count items'),
       implode('<br />', $operations)
     );
@@ -2616,8 +2663,8 @@
  * Implements hook_token_list() from the token module.
  */
 function store_token_list($type = 'all') {
-  if (in_array($type, array('all', STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE,
-      ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER,
+  if (in_array($type, array('all', STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE,ECMAIL_TYPE_CUSTOMER_INVOICE_INSTANT,
+      ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER,ECMAIL_TYPE_CONFIRMATION,
       ECMAIL_TYPE_SHIP_NOTICE))) {
     $vars[STORE_TOKEN_TYPE]['txn-id']                = t('Transaction ID.');
     $vars[STORE_TOKEN_TYPE]['txn-balance']           = t('Transaction balance.');
@@ -2639,31 +2686,66 @@
     $vars[STORE_TOKEN_TYPE]['txn-bill-plus-ship']    = t('Three other transaction tokens joined together: [txn-ship-to] [txn-shipping-method] [txn-bill-to].');
     $vars[STORE_TOKEN_TYPE]['txn-items']             = t('Listing of items in the transaction.');
     $vars[STORE_TOKEN_TYPE]['site-url-brief']        = t('Site url without the protocol (http://).');
+    $vars[STORE_TOKEN_TYPE]['billing-name']        = t('Name of the person receiving the bill');
+    $vars[STORE_TOKEN_TYPE]['ourfernie-email']        = t('Reservations email');
+    $vars[STORE_TOKEN_TYPE]['ourfernie-uri']        = t('Reservations uri');
+    $vars[STORE_TOKEN_TYPE]['ourfernie-date']        = t('Date when email was generated');
+    $vars[STORE_TOKEN_TYPE]['ourfernie-owner']        = t('The owner of the properties email address');
+    $vars[STORE_TOKEN_TYPE]['checkin']                =t('Checkin instructions');
   }
 
   return $vars;
 }
 
+
 /**
  * Implements hook_token_values() from the token module.
  */
 function store_token_values($type, $object = NULL) {
   if (in_array($type, array(STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE,
-    ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, 
-    ECMAIL_TYPE_ASK_CUSTOMER, ECMAIL_TYPE_SHIP_NOTICE))) {
+    ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN,ECMAIL_TYPE_CONFIRMATION,
+    ECMAIL_TYPE_CUSTOMER_INVOICE_INSTANT,ECMAIL_TYPE_ASK_CUSTOMER, ECMAIL_TYPE_SHIP_NOTICE))) {
     global $base_url;
+	$billing_name = ucfirst($transaction->address['billing']->firstname). ' '. ucfirst($transaction->address['billing']->lastname);
 
     $txn = (object) $object;
 
     $items = "";
     $subtotal = 0;
+    $checkinlist = array();
     if ($txn->items) {
       foreach ($txn->items as $p) {
         $product = product_load($p);
-        $subtotal += $p->qty * $p->price;
-        $items .= t('@order of @title at @price each', array('@order' => format_plural($p->qty, '1 order', '@count orders'), '@title' => $p->title, '@price' => payment_format($p->price))). "\n";
+      $transactions = $p->data;
+
+      $first = true;
+      $localsubitem = $transactions->subitem;
+      while($key = key($localsubitem)){
+      	if($first == true){
+      		$arrivaldate = $localsubitem[$key]->date;
+      		$propertyowner = $key;
+      		$first = false;
+      		$unitname = db_result(db_query("SELECT title FROM node n inner join accommodation_inventory i on n.nid = i.unit_id inner join accommodation_availability a on a.iid = i.iid where a.aid = " . $key ));
+      	}
+      	next($localsubitem);
       }
+    //needs to take into account unit as well as check policy could be at unit level
+    	if (!array_key_exists ($p->nid,$checkinlist)){
+	  		$checkinlist[$p->nid] = array($p->dataid => $p->dataid);
+  		}else{
+  			$checkinlist[$p->nid][$p->dataid] = $p->dataid;
+  		}
+      //%night stay at %title arriving on %date
+      //we need to check the type - lift ticket??
+      if($product->ptype == 'liftticket'){
+      	$items .= t('%title at %price ', array('%title' => $transactions->title,'%price' => payment_format($p->price))). "\r\n\r\n";
+      }else{
+      	$occupants = $transactions->occupants;
+      	$items .= t('@title for @occupants people staying in a(n) @unitname arriving on @arrival at @price ', array('@title' => $transactions->title,'@unitname' => $unitname, '@arrival' => $arrivaldate,'@price' => payment_format($p->price),'@occupants'=>$occupants)). "\r\n\r\n";
+      }
     }
+    $checkin .= business_format_address($checkinlist);
+  }
 
     $values['txn-id']                = $txn->txnid;
     $values['txn-balance']           = payment_format($txn->gross);
@@ -2685,11 +2767,18 @@
     $values['txn-bill-plus-ship']    = check_plain($values['txn-ship-to'] . $values['txn-shipping-method'] . $values['txn-bill-to']);
     $values['txn-items']             = $items;
     $values['site-url-brief']        = substr($base_url, strlen("http://"));
+    $values['billing-name']          = $billing_name;
+    $values['ourfernie-email']       = variable_get('reservation_email',variable_get('site_mail',''));
+    $values['ourfernie-uri']       = variable_get('reservation_email',variable_get('site_mail',''));
+    $values['ourfernie-date']       = format_date(time());
+    $values['ourfernie-owner']      = $propertyowner;
+    $values['checkin']              = $checkin;
   }
 
   return $values;
 }
 
+
 /**
  * Implementation of hook_mail_types() from ec_mail module.
  */