4 Commits

Author SHA1 Message Date
c0cb9f8f81 Ignore ptaches. 2019-10-03 21:39:35 -05:00
0675dcb249 Init from ENDracing production version. 2018-02-23 14:19:19 -06:00
8493a9c1f7 Update branch from d.o. 2017-05-19 09:53:14 -05:00
c2a752501f Sync with Drupal.org. 2017-05-07 09:16:56 -05:00
4 changed files with 23 additions and 34 deletions

1
.gitignore vendored Normal file
View File

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

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. Im 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

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"

View File

@ -150,14 +150,14 @@ 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,
);
}
// 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(
'#type' => 'hidden',
@ -561,24 +561,18 @@ 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();
}
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(
"amount" => $amount,
"currency" => strtolower($order->currency),