Ignore ptaches.

.gitignore

@@ -0,0 +1 @@
+*.patch

README.txt

@@ -1,9 +1,3 @@
-Based on the 7.x-2.x-dev branch at https://www.drupal.org/project/uc_stripe. Using 
-this as a working repo to track changes. I’m using this on some production sites,
-but no guarantees are made for anyone else. Look through the code!
-
-——
-
 This is an Ubercart payment gateway module for Stripe.
 
 Versions of the Stripe PHP Library and Stripe API that this module currently

uc_stripe.info

@@ -8,9 +8,9 @@ core = 7.x
 php = 5.3
 
 
-; Information added by Drupal.org packaging script on 2016-10-03
+; Information added by Drupal.org packaging script on 2017-05-19
-version = "7.x-2.2+1-dev"
+version = "7.x-2.2+2-dev"
 core = "7.x"
 project = "uc_stripe"
-datestamp = "1475516941"
+datestamp = "1495159090"
 

uc_stripe.module

@@ -150,14 +150,14 @@ function uc_stripe_form_uc_cart_checkout_form_alter(&$form, &$form_state) {
     '#weight' => -1000,
   );
 
-    // Powered by Stripe (logo from https://stripe.com/about/resources)
+  // Powered by Stripe (logo from https://stripe.com/about/resources)
-    if (variable_get('uc_stripe_poweredby', FALSE)) {
+  if (variable_get('uc_stripe_poweredby', FALSE)) {
-		$payment_form['field_message'] = array(
+    $payment_form['field_message'] = array(
-		'#type' => 'item',
+      '#type' => 'item',
-		'#markup' => "<a href='http://stripe.com'><img src=".base_path().drupal_get_path('module', 'uc_stripe') . '/images/solid-dark.svg' . " alt='Powered by Stripe'></a>",
+      '#markup' => "<a href='http://stripe.com'><img src=" . '/' . drupal_get_path('module', 'uc_stripe') . '/images/solid-dark.svg' . " alt='Powered by Stripe'></a>",
-		'#weight' => 1,
+      '#weight' => 1,
-	    );
+    );
-	}
+  }
 
   $payment_form['stripe_token'] = array(
     '#type' => 'hidden',
@@ -561,24 +561,18 @@ function uc_stripe_charge($order_id, $amount, $data) {
       throw new Exception('No customer ID found');
     }
 
-    // Set up titles and SKUs
+    foreach($order->products as $item){
-    $titles = array();
+      $titles[] = $item->title;
-    $models = array();
+      $models[] = $item->model;
-	foreach($order->products as $item){
+      }
-            $titles[] = $item->title;
+    $metadata = array();
-			$models[] = $item->model;
-		}
-
-    if (variable_get('uc_stripe_metadata_titles',FALSE)==1 && variable_get('uc_stripe_metadata_models',FALSE)==1) {
-        $metadata = array("titles" => implode(";", $titles),"models" => implode(";", $models));
-    } elseif (variable_get('uc_stripe_metadata_titles',FALSE)==1 && variable_get('uc_stripe_metadata_models',FALSE)==0) {
-        $metadata = array("titles" => implode(";", $titles));
-    } elseif (variable_get('uc_stripe_metadata_titles',FALSE)==0 && variable_get('uc_stripe_metadata_models',FALSE)==1) {
-        $metadata = array("models" => implode(";", $models));
-    } elseif (variable_get('uc_stripe_metadata_titles',FALSE)==0 && variable_get('uc_stripe_metadata_models',FALSE)==0) {
-        $metadata = array();
-        }
 
+    if (!empty($models)) {
+      $metadata['models'] = implode(";", $models);
+      }
+    if (!empty($titles)) {
+      $metadata['titles'] = implode(";", $titles);
+      }
     $params = array(
       "amount" => $amount,
       "currency" => strtolower($order->currency),