',
);
- $form['uc_paypal_ec_landingpage_style'] = array(
- '#type' => 'radios',
- '#title' => t('PayPal landing page style'),
- '#description' => t('PayPal Express Checkout landing page may show a credit card submission form (allowing credit card payments without a PayPal account) or may show only a PayPal login form, thereby restricting payment to PayPal users.'),
- '#options' => array(
- 'Billing' => t('Show credit card submission form.'),
- 'Login' => t('Do not show credit card submission form.'),
- ),
- '#default_value' => variable_get('uc_paypal_ec_landingpage_style', 'Billing'),
- );
return $form;
}
}
@@ -646,9 +623,7 @@ function uc_payment_method_paypal_ec($op
* Module and Helper Functions
******************************************************************************/
-/**
- * Redirects if a customer selects PayPal Express Checkout as a payment method.
- */
+// Redirects if a customer selects PayPal Express Checkout as a payment method.
function uc_paypal_ec_checkout($form, &$form_state) {
if ($form_state['values']['panes']['payment']['payment_method'] != 'paypal_ec') {
return;
@@ -704,7 +679,6 @@ function uc_paypal_ec_checkout($form, &$
'SHIPTOCOUNTRYCODE' => $country[0]['country_iso_code_2'],
'SHIPTOZIP' => substr($order->delivery_postal_code, 0, 20),
'PHONENUM' => substr($order->delivery_phone, 0, 20),
- 'LANDINGPAGE' => variable_get('uc_paypal_ec_landingpage_style', 'Billing'),
);
if (!uc_cart_is_shippable()) {
@@ -729,12 +703,12 @@ function uc_paypal_ec_checkout($form, &$
exit();
}
-/**
- * Returns the form for Express Checkout Shortcut Flow.
- *
- * @see uc_paypal_ec_form_submit()
- */
+// Returns the form for Express Checkout Shortcut Flow.
function uc_paypal_ec_form() {
+ if (!variable_get('uc_cap_uc_paypal_ec_enabled', FALSE)) {
+ return;
+ }
+
// Hack to allow the image button to submit.
if (isset($_POST['submit_x'])) {
$form['submit'] = array(
@@ -750,11 +724,6 @@ function uc_paypal_ec_form() {
return $form;
}
-/**
- * Submit handler for uc_paypal_ec_form().
- *
- * @see uc_paypal_ec_form()
- */
function uc_paypal_ec_form_submit($form, &$form_state) {
global $user;
$items = uc_cart_get_contents();
@@ -790,7 +759,6 @@ function uc_paypal_ec_form_submit($form,
'REQCONFIRMSHIPPING' => variable_get('uc_paypal_ec_rqconfirmed_addr', 0),
'BUTTONSOURCE' => 'Ubercart_ShoppingCart_EC_US',
'NOTIFYURL' => url('uc_paypal/ipn/'. $order->order_id, array('absolute' => TRUE)),
- 'LANDINGPAGE' => variable_get('uc_paypal_ec_landingpage_style', 'Billing'),
);
$order->products = $items;
@@ -801,7 +769,6 @@ function uc_paypal_ec_form_submit($form,
$_SESSION['cart_order'] = $order->order_id;
$_SESSION['TOKEN'] = $nvp_response['TOKEN'];
- $sandbox = '';
if (strpos(variable_get('uc_paypal_wpp_server', 'https://api-3t.sandbox.paypal.com/nvp'), 'sandbox') > 0) {
$sandbox = 'sandbox.';
}
@@ -810,11 +777,6 @@ function uc_paypal_ec_form_submit($form,
exit();
}
-/**
- * Additional submit handler for uc_cart_checkout_review_form().
- *
- * @see uc_cart_checkout_review_form()
- */
function uc_paypal_ec_submit_form_submit($form, &$form_state) {
$order = uc_order_load($_SESSION['cart_order']);
@@ -880,9 +842,7 @@ function uc_paypal_ec_submit_form_submit
$form_state['redirect'] = 'cart/checkout/complete';
}
-/**
- * Returns the form elements for the Website Payments Standard form.
- */
+// Returns the form elements for the Website Payments Standard form.
function uc_paypal_wps_form($form_state, $order) {
$shipping = 0;
foreach ($order->line_items as $item) {
@@ -957,7 +917,7 @@ function uc_paypal_wps_form($form_state,
// Transaction information
'currency_code' => variable_get('uc_paypal_wps_currency', 'USD'),
'handling_cart' => uc_price($shipping, $context, $options),
- 'invoice' => $order->order_id .'-'. uc_cart_get_id(),
+ 'invoice' => $order->order_id .'-'. time(),
'tax_cart' => uc_price($tax, $context, $options),
// Shopping cart specific variables
@@ -1008,7 +968,7 @@ function uc_paypal_wps_form($form_state,
$data['quantity_'. $i] = $item->qty;
// PayPal will only display the first two...
- if (!empty($item->data['attributes']) && count($item->data['attributes']) > 0) {
+ if (is_array($item->data['attributes']) && count($item->data['attributes']) > 0) {
$o = 0;
foreach ($item->data['attributes'] as $name => $setting) {
$data['on'. $o .'_'. $i] = $name;
@@ -1017,20 +977,6 @@ function uc_paypal_wps_form($form_state,
}
}
}
-
- // Apply discounts (negative amount line items). For example, this handles line items created by uc_coupon.
- $discount = 0;
-
- foreach ($order->line_items as $item) {
- if ($item['amount'] < 0) {
- // The minus sign is not an error! The discount amount must be positive.
- $discount -= $item['amount'];
- }
- }
-
- if ($discount != 0) {
- $data['discount_amount_cart'] = $discount;
- }
}
else {
// List the whole cart as a single item to account for fees/discounts
@@ -1058,28 +1004,21 @@ function uc_paypal_wps_form($form_state,
return $form;
}
-/**
- * Sends a request to PayPal and returns a response array.
- */
+// Sends a request to PayPal and returns a response array.
function uc_paypal_api_request($request, $server) {
- // We use $request += to add API credentials so that
- // if a key already exists, it will not be overridden
- $request += array(
- 'USER' => variable_get('uc_paypal_api_username', ''),
- 'PWD' => variable_get('uc_paypal_api_password', ''),
- 'VERSION' => '3.0',
- 'SIGNATURE' => variable_get('uc_paypal_api_signature', ''),
- );
+ $request['USER'] = variable_get('uc_paypal_api_username', '');
+ $request['PWD'] = variable_get('uc_paypal_api_password', '');
+ $request['VERSION'] = UC_PAYPAL_API;
+ $request['SIGNATURE'] = variable_get('uc_paypal_api_signature', '');
$data = '';
foreach ($request as $key => $value) {
- $data .= $key .'='. urlencode(str_replace(',', '', $value)) .'&';
+ $data .= $key .'='. urlencode(ereg_replace(',', '', $value)) .'&';
}
$data = substr($data, 0, -1);
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $server);
- curl_setopt($ch, CURLOPT_VERBOSE, 0);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -1095,9 +1034,7 @@ function uc_paypal_api_request($request,
return _uc_paypal_nvp_to_array($response);
}
-/**
- * Returns the description and subtotal of the products on an order.
- */
+// Returns the description and subtotal of the products on an order.
function _uc_paypal_product_details($items) {
$desc = '';
$subtotal = 0;
@@ -1107,7 +1044,7 @@ function _uc_paypal_product_details($ite
if (!empty($desc)) {
$desc .= ' / ';
}
- $desc .= $item->qty .'× '. $item->title;
+ $desc .= $item->qty .'× '. $item->title;
$subtotal += $item->qty * $item->price;
}
}
@@ -1115,9 +1052,7 @@ function _uc_paypal_product_details($ite
return array($desc, $subtotal);
}
-/**
- * Returns the PayPal approved credit card type for a card number.
- */
+// Returns the PayPal approved credit card type for a card number.
function _uc_paypal_card_type($cc_number) {
switch (substr(strval($cc_number), 0, 1)) {
case '3':
@@ -1133,9 +1068,7 @@ function _uc_paypal_card_type($cc_number
return FALSE;
}
-/**
- * Turns PayPal's NVP response to an API call into an associative array.
- */
+// Turns PayPal's NVP response to an API call into an associative array.
function _uc_paypal_nvp_to_array($nvpstr) {
foreach (explode('&', $nvpstr) as $nvp) {
list($key, $value) = explode('=', $nvp);
@@ -1145,9 +1078,9 @@ function _uc_paypal_nvp_to_array($nvpstr
return $nvp_array;
}
-/**
- * Returns a human readable message for the AVS code.
- */
+
+
+// Returns a human readable message for the AVS code.
function _uc_paypal_avscode_message($code) {
if (is_numeric($code)) {
switch ($code) {
@@ -1200,9 +1133,7 @@ function _uc_paypal_avscode_message($cod
}
}
-/**
- * Returns a human readable message for the CVV2 match code.
- */
+// Returns a human readable message for the CVV2 match code.
function _uc_paypal_cvvmatch_message($code) {
if (is_numeric($code)) {
switch ($code) {
@@ -1239,9 +1170,7 @@ function _uc_paypal_cvvmatch_message($co
}
}
-/**
- * Return a message for the pending reason of a PayPal payment.
- */
+// Return a message for the pending reason of a PayPal payment.
function _uc_paypal_pending_message($reason) {
switch ($reason) {
case 'address':
@@ -1266,9 +1195,7 @@ function _uc_paypal_pending_message($rea
}
}
-/**
- * Return a message for the reason code of a PayPal reversal.
- */
+// Return a message for the reason code of a PayPal reversal.
function _uc_paypal_reversal_message($reason) {
switch ($reason) {
case 'chargeback':
@@ -1285,9 +1212,8 @@ function _uc_paypal_reversal_message($re
}
}
-/**
- * Returns an array of possible currency codes.
- */
+// Returns an array of possible currency codes.
function _uc_paypal_currency_array() {
- return drupal_map_assoc(array('AUD', 'BRL', 'CAD', 'CHF', 'CZK', 'DKK', 'EUR', 'GBP', 'HKD', 'HUF', 'ILS', 'JPY', 'MXN', 'MYR', 'NOK', 'NZD', 'PHP', 'PLN', 'SEK', 'SGD', 'THB', 'TWD', 'USD'));
+ return drupal_map_assoc(array('AUD', 'CAD', 'CHF', 'CZK', 'DKK', 'EUR', 'GBP', 'HKD', 'HUF', 'ILS', 'JPY', 'MXN', 'NOK', 'NZD', 'PLN', 'SEK', 'SGD', 'USD'));
}
+
';
+ $title2 .= ' 