Index: ec_cart/ec_cart.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_cart/ec_cart.module,v
retrieving revision 1.5
diff -u -r1.5 ec_cart.module
--- ec_cart/ec_cart.module	17 Oct 2008 02:35:25 -0000	1.5
+++ ec_cart/ec_cart.module	7 Feb 2009 13:09:32 -0000
@@ -94,7 +94,7 @@
       'file' => 'ec_cart.theme.inc',
     ),
     'ec_cart_display_block_title' => array(
-      'arguments' => array('item_count' => NULL, $text => NULL),
+      'arguments' => array('item_count' => NULL, 'text' => NULL),
       'file' => 'ec_cart.theme.inc',
     ),
   );
@@ -291,7 +291,7 @@
   // I think we've already validated the items, but we're doing it again
   // before sending to the checkout.
   foreach ($data->items as $nid => $item) {
-    ec_checkout_validate_item($item, 'cart', $item->qty, $item_data);
+    ec_checkout_validate_item($item, 'cart', $item->qty, $item->data);
   }
   $errors = form_get_errors();
   if (!empty($errors)) {
@@ -336,7 +336,7 @@
     $form['products'][$item->nid]['#node'] = $item;
 
     // Some stuff that is to be moved out of ec_cart.
-    ec_cart_view_cart_to_move($form, $node);
+    ec_cart_view_cart_to_move($form, $item);
 
     // Add quantity elements.
     if (ec_product_has_quantity($item)) {
@@ -353,7 +353,7 @@
       );
     }
 
-    if (ec_product_attributes_get($node, 'product_form_additional_fields')) {
+    if (ec_product_attributes_get($item, 'product_form_additional_fields')) {
       $form['#product_cart_form'] = TRUE;
       // Add place holder for additional data and fields.
       $form['products'][$item->nid]['data'] = array();
Index: ec_address/ec_address.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_address/ec_address.views.inc,v
retrieving revision 1.3
diff -u -r1.3 ec_address.views.inc
--- ec_address/ec_address.views.inc	17 Oct 2008 05:57:34 -0000	1.3
+++ ec_address/ec_address.views.inc	7 Feb 2009 13:09:31 -0000
@@ -141,7 +141,4 @@
       ),
     ),
   );
-
-  return $data;
 }
-
Index: ec_address/ec_address.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_address/ec_address.module,v
retrieving revision 1.4
diff -u -r1.4 ec_address.module
--- ec_address/ec_address.module	22 Oct 2008 12:49:08 -0000	1.4
+++ ec_address/ec_address.module	7 Feb 2009 13:09:31 -0000
@@ -124,6 +124,7 @@
   module_load_include('inc', 'ec_store', 'ec_store.localization');
   $states = _ec_store_location_states($country);
 
+  $counter = 0;
   if (!empty($states)) {
     while (list($code, $name) = each($states)) {
       if ($counter < 5) {
Index: ec_store/ec_store.manage.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_store/ec_store.manage.inc,v
retrieving revision 1.2
diff -u -r1.2 ec_store.manage.inc
--- ec_store/ec_store.manage.inc	1 Nov 2008 04:32:09 -0000	1.2
+++ ec_store/ec_store.manage.inc	7 Feb 2009 13:09:33 -0000
@@ -134,7 +134,7 @@
   }
   else {
     ec_store_transaction_save((object)$form_state['values']);
-    form_state['redirect'] = 'admin/store/transaction';
+    $form_state['redirect'] = 'admin/store/transaction';
   }
 }
 
Index: ec_store/ec_store.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_store/ec_store.module,v
retrieving revision 1.12
diff -u -r1.12 ec_store.module
--- ec_store/ec_store.module	1 Nov 2008 04:49:13 -0000	1.12
+++ ec_store/ec_store.module	7 Feb 2009 13:09:33 -0000
@@ -406,7 +406,7 @@
 
   if (!empty($txn->txnid)) {
     drupal_write_record('ec_transaction', $txn, 'txnid');
-    ec_store_invoke_ec_transactionapi($txn, 'update', $paid);
+    ec_store_invoke_ec_transactionapi($txn, 'update');
   }
   else {
     // INSERT