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

Add metadata #7

Closed
mattbk wants to merge 4 commits from add-metadata into 7.x-2.x-dev
pull from: add-metadata
merge into: matt:7.x-2.x-dev
Conversation 0 Commits 4 Files Changed 3 +21 -17
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

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

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

29
uc_stripe.module
View File

@@ -150,15 +150,6 @@ function uc_stripe_form_uc_cart_checkout_form_alter(&$form, &$form_state) {
'#weight' => -1000, '#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=" . '/' . drupal_get_path('module', 'uc_stripe') . '/images/solid-dark.svg' . " alt='Powered by Stripe'></a>",
'#weight' => 1,
);
}
$payment_form['stripe_token'] = array( $payment_form['stripe_token'] = array(
'#type' => 'hidden', '#type' => 'hidden',
'#default_value' => 'default', '#default_value' => 'default',
@@ -319,7 +310,7 @@ function uc_stripe_settings_form() {
$form['uc_stripe_settings']['uc_stripe_poweredby'] = array( $form['uc_stripe_settings']['uc_stripe_poweredby'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Powered by Stripe'), '#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), '#default_value' => variable_get('uc_stripe_poweredby', FALSE),
); );
@@ -548,6 +539,24 @@ function uc_stripe_charge($order_id, $amount, $data) {
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;
}
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( $params = array(
"amount" => $amount, "amount" => $amount,
"currency" => strtolower($order->currency), "currency" => strtolower($order->currency),