From db908900029b007b4e2ef80421e521ea917ec99c Mon Sep 17 00:00:00 2001
From: Matt <bedrocks@gmail.com>
Date: Sun, 7 May 2017 21:56:23 -0500
Subject: [PATCH] Make suggested changes from
 https://www.drupal.org/node/2840526#comment-12074990.

---
 uc_stripe.module | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/uc_stripe.module b/uc_stripe.module
index d5b8015..ce76153 100644
--- a/uc_stripe.module
+++ b/uc_stripe.module
@@ -558,26 +558,20 @@ function uc_stripe_charge($order_id, $amount, $data) {
 
     //Bail if there's no customer ID
     if (empty($stripe_customer_id)) {
-      throw new Exception('No customer ID found');
+	  throw new Exception('No customer ID found');
     }
 
     // Set up titles and SKUs
-    $titles = array();
-    $models = array();
-	foreach($order->products as $item){
-            $titles[] = $item->title;
-			$models[] = $item->model;
-		}
+	$titles = var_get(uc_s_m_t, FALSE)
+	$models = var_get(uc_s_m_m, FALSE)
+	$metadata = array();
 
-    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,