matt/uc_stripe
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Create a function to add metadata in both places it may be needed.

Browse Source
This commit is contained in:
mburtonkelly
2019-10-04 15:03:30 -05:00
parent 6a7858b6fa
commit 06a97cf9c9
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
uc_stripe.module
View File

@@ -612,25 +612,12 @@ function uc_stripe_charge($order_id, $amount, $data) {
} }
$stripe_payment_method_id = $_SESSION['stripe']['payment_method']; $stripe_payment_method_id = $_SESSION['stripe']['payment_method'];
//Get item titles and models
foreach($order->products as $item){
$titles[] = $item->title;
$models[] = $item->model;
}
$metadata = array();
if (!empty($models)) {
$metadata['models'] = implode(";", $models);
}
if (!empty($titles)) {
$metadata['titles'] = implode(";", $titles);
}
$params = array( $params = array(
"amount" => $amount, "amount" => $amount,
"currency" => strtolower($order->currency), "currency" => strtolower($order->currency),
"customer" => $stripe_customer_id, "customer" => $stripe_customer_id,
"description" => t("Order #@order_id", array("@order_id" => $order_id)), "description" => t("Order #@order_id", array("@order_id" => $order_id)),
"metadata" => $metadata, "metadata" => make_metadata($order),
"payment_method" => $stripe_payment_method_id, "payment_method" => $stripe_payment_method_id,
"payment_method_types" => ['card'], "payment_method_types" => ['card'],
"confirm" => true, "confirm" => true,
@@ -638,6 +625,8 @@ function uc_stripe_charge($order_id, $amount, $data) {
); );
drupal_set_message(print_r($metadata, true), 'status'); drupal_set_message(print_r($metadata, true), 'status');
drupal_set_message(print_r($params, true), 'status');
$intent_id = $order->data['payment_intent_id']; $intent_id = $order->data['payment_intent_id'];
@@ -1027,11 +1016,11 @@ function _uc_stripe_confirm_payment(){
$intent = null; $intent = null;
try { try {
if (isset($data['payment_method_id'])) { if (isset($data['payment_method_id'])) {
$params = array( $params = array(
'payment_method' => $data['payment_method_id'], 'payment_method' => $data['payment_method_id'],
"description" => t("Order #@order_id", array("@order_id" => $order_id)), "description" => t("Order #@order_id", array("@order_id" => $order_id)),
"metadata" => $metadata, "metadata" => make_metadata($order),
'amount' => $amount, 'amount' => $amount,
'currency' => strtolower($order->currency), 'currency' => strtolower($order->currency),
'confirmation_method' => 'manual', 'confirmation_method' => 'manual',
@@ -1039,6 +1028,8 @@ function _uc_stripe_confirm_payment(){
'setup_future_usage' => 'off_session', 'setup_future_usage' => 'off_session',
'save_payment_method' => true, 'save_payment_method' => true,
); );
drupal_set_message(print_r($params, true), 'status');
if(!$stripe_customer_id) { if(!$stripe_customer_id) {
$customer = _uc_stripe_create_stripe_customer($order, $data['payment_method_id']); $customer = _uc_stripe_create_stripe_customer($order, $data['payment_method_id']);
@@ -1135,6 +1126,25 @@ function _uc_stripe_create_stripe_customer($order, $payment_method_id = NULL){
} }
function make_metadata($order){
//Get item titles and models
foreach($order->products as $item){
$titles[] = $item->title;
$models[] = $item->model;
}
$metadata = array();
if (!empty($models)) {
$metadata['models'] = implode(";", $models);
}
if (!empty($titles)) {
$metadata['titles'] = implode(";", $titles);
}
return $metadata;
}
/** /**
* *
* @param string $stripe_id * @param string $stripe_id