Make suggested changes from https://www.drupal.org/node/2840526#comment-12074990.
This commit is contained in:
		@@ -558,26 +558,20 @@ function uc_stripe_charge($order_id, $amount, $data) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    //Bail if there's no customer ID
 | 
					    //Bail if there's no customer ID
 | 
				
			||||||
    if (empty($stripe_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
 | 
					    // Set up titles and SKUs
 | 
				
			||||||
    $titles = array();
 | 
						$titles = var_get(uc_s_m_t, FALSE)
 | 
				
			||||||
    $models = array();
 | 
						$models = var_get(uc_s_m_m, FALSE)
 | 
				
			||||||
	foreach($order->products as $item){
 | 
						$metadata = array();
 | 
				
			||||||
            $titles[] = $item->title;
 | 
					 | 
				
			||||||
			$models[] = $item->model;
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (variable_get('uc_stripe_metadata_titles',FALSE)==1 && variable_get('uc_stripe_metadata_models',FALSE)==1) {
 | 
						if (!empty($models)) { 
 | 
				
			||||||
        $metadata = array("titles" => implode(";", $titles),"models" => implode(";", $models));
 | 
						  $metadata['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));
 | 
						if (!empty($titles)) {
 | 
				
			||||||
    } elseif (variable_get('uc_stripe_metadata_titles',FALSE)==0 && variable_get('uc_stripe_metadata_models',FALSE)==1) {
 | 
						  $metadata['titles'] = implode(";", $titles));
 | 
				
			||||||
        $metadata = array("models" => implode(";", $models));
 | 
						}
 | 
				
			||||||
    } elseif (variable_get('uc_stripe_metadata_titles',FALSE)==0 && variable_get('uc_stripe_metadata_models',FALSE)==0) {
 | 
					 | 
				
			||||||
        $metadata = array();
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    $params = array(
 | 
					    $params = array(
 | 
				
			||||||
      "amount" => $amount,
 | 
					      "amount" => $amount,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user