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

Compare commits

merge into: matt:7.x-3.1
Branches Tags
matt:master matt:add-metadata-endracing-7.x-3.1 matt:7.x-3.x-dev matt:7.x-3.1 matt:add-metadata-endracing matt:7.x-2.x-dev
...
pull from: matt:7.x-2.x-dev
Branches Tags
matt:add-metadata-endracing-7.x-3.1 matt:7.x-3.x-dev matt:7.x-3.1 matt:master matt:add-metadata-endracing matt:7.x-2.x-dev

2 Commits
7.x-3.1 ... 7.x-2.x-de

Author SHA1 Message Date
mattbk
8493a9c1f7 Update branch from d.o. 2017-05-19 09:53:14 -05:00
Matt
c2a752501f Sync with Drupal.org. 2017-05-07 09:16:56 -05:00
3 changed files with 12 additions and 50 deletions
Expand all files Collapse all files

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

6
uc_stripe.info
View File

@ -8,9 +8,9 @@ core = 7.x
php = 5.3
; Information added by Drupal.org packaging script on 2016-10-03
version = "7.x-2.2+1-dev"
; Information added by Drupal.org packaging script on 2017-05-19
version = "7.x-2.2+2-dev"
core = "7.x"
project = "uc_stripe"
datestamp = "1475516941"
datestamp = "1495159090"

36
uc_stripe.module
View File

@ -154,7 +154,7 @@ function uc_stripe_form_uc_cart_checkout_form_alter(&$form, &$form_state) {
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>",
'#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,
);
}
@ -323,20 +323,6 @@ function uc_stripe_settings_form() {
'#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 +539,7 @@ function uc_stripe_charge($order_id, $amount, $data) {
return $result;
}
// Charge the customer
try {
@ -561,30 +548,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;