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

Add metadata in 7.x-3.x-dev #10

Open
mattbk wants to merge 16 commits from add-metadata-endracing-7.x-3.1 into 7.x-3.x-dev
pull from: add-metadata-endracing-7.x-3.1
merge into: matt:7.x-3.x-dev
Conversation 6 Commits 16 Files Changed 4 +2 -56
3 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2a752501f - Show all commits

6
README.txt
View File

@@ -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

7
images/solid-dark.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

45
uc_stripe.module
View File

@@ -150,15 +150,6 @@ function uc_stripe_form_uc_cart_checkout_form_alter(&$form, &$form_state) {
'#weight' => -1000,
);
// Powered by Stripe (logo from https://stripe.com/about/resources)
if (variable_get('uc_stripe_poweredby', FALSE)) {
$payment_form['field_message'] = array(
'#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>",
'#weight' => 1,
);
}
$payment_form['stripe_token'] = array(
'#type' => 'hidden',
'#default_value' => 'default',
@@ -319,24 +310,10 @@ function uc_stripe_settings_form() {
$form['uc_stripe_settings']['uc_stripe_poweredby'] = array(
'#type' => 'checkbox',
'#title' => t('Powered by Stripe'),
'#description' => 'Show "powered by Stripe" in checkout.',
'#description' => 'Show "powered by Stripe" in shopping cart.',
'#default_value' => variable_get('uc_stripe_poweredby', FALSE),
);
$form['uc_stripe_settings']['uc_stripe_metadata_titles'] = array(
'#type' => 'checkbox',
'#title' => t('Metadata: Title'),
'#description' => t('Include order item title(s) in Stripe metadata.'),
'#default_value' => variable_get('uc_stripe_metadata_titles', FALSE),
);
$form['uc_stripe_settings']['uc_stripe_metadata_models'] = array(
'#type' => 'checkbox',
'#title' => t('Metadata: Model'),
'#description' => t('Include item model(s) (SKU(s)) in Stripe metadata.'),
'#default_value' => variable_get('uc_stripe_metadata_models', FALSE),
);
return $form;
}
@@ -553,6 +530,7 @@ function uc_stripe_charge($order_id, $amount, $data) {
return $result;
}
// Charge the customer
try {
@@ -561,30 +539,11 @@ function uc_stripe_charge($order_id, $amount, $data) {
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;
}
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();
}
$params = array(
"amount" => $amount,
"currency" => strtolower($order->currency),
"customer" => $stripe_customer_id,
"description" => t("Order #@order_id", array("@order_id" => $order_id)),
"metadata" => $metadata,
);
if (!empty($shipping_info)) {
$params['shipping'] = $shipping_info;