http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96037
Revision: 96037
Author: awjrichards
Date: 2011-09-01 20:35:31 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
MFT r95917
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
Property Changed:
----------------
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
Modified:
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
===================================================================
---
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
2011-09-01 20:31:36 UTC (rev 96036)
+++
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
2011-09-01 20:35:31 UTC (rev 96037)
@@ -253,7 +253,14 @@
'amount_given' => '',
'contribution_tracking_id' => '',
'notify_url' => '',
- 'item_name' => ''
+ 'item_name' => '',
+ 'address1' => '',
+ 'city' => '',
+ 'state' => '',
+ 'zip' => '',
+ 'country' => 'US',
+ 'address_override' => '0'
+
);
}
@@ -329,7 +336,7 @@
$repost['fields']['return'] = $returnto;
$repost['fields']['currency_code'] =
$input['currency_code'];
- // additional fields to pass to PayPal from single-step
credit card form
+ // additional fields to pass to PayPal from single-step
credit card form and 1st step with address fields
if ( array_key_exists( 'fname', $input ) && !empty(
$input['fname'] ) ) {
$repost['fields']['first_name'] =
$input['fname'];
}
@@ -340,6 +347,32 @@
$repost['fields']['email'] = $input['email'];
}
+ if ( array_key_exists( 'address1', $input ) && !empty(
$input['address1'] ) ) {
+ $repost['fields']['address1'] =
$input['address1'];
+ }
+
+ if ( array_key_exists( 'city', $input ) && !empty(
$input['city'] ) ) {
+ $repost['fields']['city'] = $input['city'];
+ }
+
+ if ( array_key_exists( 'state', $input ) && !empty(
$input['state'] ) ) {
+ $repost['fields']['state'] = $input['state'];
+ }
+
+ if ( array_key_exists( 'zip', $input ) && !empty(
$input['zip'] ) ) {
+ $repost['fields']['zip'] = $input['zip'];
+ }
+
+
+ if ( array_key_exists( 'country', $input ) && !empty(
$input['country'] ) ) {
+ $repost['fields']['country'] =
$input['country'];
+ }
+
+ if ( array_key_exists( 'address_override', $input ) &&
!empty( $input['address_override'] ) ) {
+ $repost['fields']['address_override'] =
$input['address_override'];
+ }
+
+
// if this is a recurring donation, we have add'l
fields to send to paypal
if ( $input['recurring_paypal'] &&
$input['recurring_paypal'] != 0 ) {
Property changes on:
branches/wmf/1.17wmf1/extensions/ContributionTracking/ContributionTracking.processor.php
___________________________________________________________________
Added: svn:mergeinfo
+
/branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking.processor.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/ContributionTracking/ContributionTracking.processor.php:60970
/trunk/extensions/ContributionReporting/ContributionTracking.processor.php:74440-74491
/trunk/extensions/ContributionTracking/ContributionTracking.processor.php:64690-95543,95664-96036
/trunk/phase3/extensions/ContributionTracking/ContributionTracking.processor.php:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
