'. t('For Express Checkout, you need to !cp_link and !wpp_link.', array('!cp_link' => l(t('enable the cart pane'), 'admin/store/settings/cart/edit/panes'), '!wpp_link' => l(t('configure the PayFlow Pro settings'), 'admin/store/settings/payment/edit/gateways'))) .'
',
- );
- return $form;
- }
-}
-
-// Handles the review page for Express Checkout Mark Flow.
-function uc_payflowpro_ec_review_redirect() {
- if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
- unset($_SESSION['cart_order']);
- unset($_SESSION['have_details']);
- unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
- drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
- drupal_goto('cart');
- }
-
- $request = _uc_payflowpro_get_ec_xml($_SESSION['TOKEN']);
- $response = _uc_payflowpro_submit_xml($request);
-
- $_SESSION['PAYERID'] = $response->PayPalResult->PayerID;
-
- drupal_goto('cart/checkout/review');
-}
-
-// Handles the review page for Express Checkout Shortcut Flow.
-function uc_payflowpro_ec_review() {
- if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
- unset($_SESSION['cart_order']);
- unset($_SESSION['have_details']);
- unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
- drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
- drupal_goto('cart');
- }
-
- if ($_SESSION['have_details'][$order->order_id] !== TRUE) {
- $request = _uc_payflowpro_get_ec_xml($_SESSION['TOKEN']);
- $response = _uc_payflowpro_submit_xml($request);
-
- $_SESSION['PAYERID'] = $response->PayPalResult->PayerID;
-
- // get variables to populate form
- $billto_name = check_plain(trim($response->PayPalResult->Name));
- $name_split = strrpos($billto_name, ' ');
- if ($name_split > 0) {
- $billto_firstname = substr($billto_name, 0, $name_split);
- $billto_lastname = substr($billto_name, $name_split);
- }
- else {
- $billto_firstname = $billto_name;
- $billto_lastname = '';
- }
-
- if (empty($response->PayPalResult->ShipTo->Name)) {
- $shipto_firstname = $billto_firstname;
- $shipto_lastname = $billto_lastname;
- }
- else {
- $shipto_name = check_plain(trim($response->PayPalResult->Name));
- $name_split = strrpos($shipto_name, ' ');
- if ($name_split > 0) {
- $shipto_firstname = substr($shipto_name, 0, $name_split);
- $shipto_lastname = substr($shipto_name, $name_split);
- }
- else {
- $shipto_firstname = $shipto_name;
- $shipto_lastname = '';
- }
- }
-
- $zone_id = db_result(db_query("SELECT zone_id FROM {uc_zones} WHERE zone_code = '%s'", check_plain($response->PayPalResult->ShipTo->Address->State)));
- $country_id = db_result(db_query("SELECT country_id FROM {uc_countries} WHERE country_iso_code_2 = '%s'", check_plain($response->PayPalResult->ShipTo->Address->Country)));
-
- $order->delivery_first_name = $shipto_firstname;
- $order->delivery_last_name = $shipto_lastname;
- $order->delivery_street1 = check_plain($response->PayPalResult->ShipTo->Street);
- $order->delivery_city = check_plain($response->PayPalResult->ShipTo->City);
- $order->delivery_zone = !empty($zone_id) ? $zone_id : 0;
- $order->delivery_postal_code = check_plain($response->PayPalResult->ShipTo->Zip);
- $order->delivery_country = !empty($country_id) ? $country_id : 840;
-
- $order->billing_first_name = $billto_firstname;
- $order->billing_last_name = $billto_lastname;
- $order->billing_street1 = $response->PayPalResult->EMail;
-
- if (empty($order->primary_email)) {
- $order->primary_email = $response->PayPalResult->EMail;
- }
- $order->payment_method = 'payflowpro_ec';
-
- uc_order_save($order);
-
- $_SESSION['have_details'][$order->order_id] = TRUE;
- }
-
- $output = t("Your order is almost complete! Please fill in the following details and click 'Continue checkout' to finalize the purchase.");
-
- $output .= drupal_get_form('uc_payflowpro_ec_review_form', $order);
-
- return $output;
-}
-
-// Present the final total to the user for checkout!
-function uc_payflowpro_ec_submit() {
- if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
- unset($_SESSION['cart_order'], $_SESSION['have_details']);
- unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
- drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
- drupal_goto('cart');
- }
-
- // [ML] FIXME: this doesn't seem normal to be here..
- $output = '
'. t("Your order is not complete until you click the 'Submit order' button below. Your PayPal account will be charged for the amount shown above once your order is placed. You will receive confirmation once your payment is complete.") .'
',
+ );
+
+ return $panes;
+}
+
+/**
+* Implementation of hook_payment_method().
+ */
+function uc_payflowpro_ec_payment_method() {
+ $title1 = ''
+ . t('PayPal - pay without sharing your financial information.');
+
+ $methods[] = array(
+ 'id' => 'payflowpro_ec',
+ 'name' => t('PayPal Express Checkout'),
+ 'title' => $title1,
+ 'review' => t('PayPal'),
+ 'desc' => t('Complete orders through PayPal Express Checkout.'),
+ 'callback' => 'uc_payment_method_payflowpro_ec',
+ 'weight' => 1,
+ 'checkout' => FALSE,
+ 'backend' => FALSE,
+ );
+
+ return $methods;
+}
+
+function uc_payflowpro_ec_form_uc_payment_gateways_form_alter(&$form, $form_state) {
+ // TODO: fix this.
+
+ /*$form['payflowpro_settings']['ec'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Express Checkout'),
+ '#description' => t('These settings are specifically for the alternate checkout system offered by Express Checkout. To enable this on your site, you must enable the corresponding cart pane in the Cart settings menu.'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['payflowpro_settings']['ec']['uc_payflowpro_ec_reqconfirmed_addr'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Require Express Checkout users to use a PayPal confirmed shipping address.'),
+ '#default_value' => variable_get('uc_payflowpro_ec_reqconfirmed_addr', FALSE),
+ );
+ $form['payflowpro_settings']['ec']['uc_payflowpro_ec_review_shipping'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Enable the shipping select form on the Review payment page.'),
+ '#default_value' => variable_get('uc_payflowpro_ec_review_shipping', TRUE),
+ );
+ $form['payflowpro_settings']['ec']['uc_paypflowpro_ec_review_company'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Enable the company name box on the Review payment page.'),
+ '#default_value' => variable_get('uc_payflowpro_ec_review_company', TRUE),
+ );
+ $form['payflowpro_settings']['ec']['uc_payflowpro_ec_review_phone'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Enable the contact phone number box on the Review payment page.'),
+ '#default_value' => variable_get('uc_payflowpro_ec_review_phone', TRUE),
+ );
+ $form['payflowpro_settings']['ec']['uc_payflowpro_ec_review_comment'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Enable the comment text box on the Review payment page.'),
+ '#default_value' => variable_get('uc_payflowpro_ec_review_comment', TRUE),
+ );*/
+
+ /*$fields = array(
+ '#type' => 'fieldset',
+ '#title' => t('Recurring Settings'),
+ '#description' => t('Settings specific to recurring profiles.'),
+ '#collapsible' => TRUE,
+ '#collapsied' => TRUE,
+ );
+ // TODO: remove this option? also change in uninstall / update hooks
+ $fields['uc_payflowpro_recurring_create_order'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Successful recurring payments should create a duplicate order'),
+ '#default_value' => variable_get('uc_payflowpro_recurring_create_order', FALSE),
+ '#description' => t('If this box is unchecked, the original order will be updated instead.'),
+ );
+ $fields['uc_payflowpro_recurring_site_key'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Site key'),
+ '#description' => t('The site key is used to namespace your site from other
+ sites. This should be short, all letters or numbers or both,
+ e.g. mysite, or prodsite, etc.'),
+ '#default_value' => variable_get('uc_payflowpro_recurring_site_key', ''),
+ );
+
+ $form['gateways']['payflowpro']['payflowpro_settings']['recurring'] = $fields;*/
+}
+
+
+/*******************************************************************************
+ * Express Checkout Functions
+ ******************************************************************************/
+
+// Handles the Express Checkout payment method
+function uc_payment_method_payflowpro_ec($op, &$arg1) {
+ switch ($op) {
+ //case 'order-view':
+ case 'settings':
+ $form['redirect'] = array(
+ '#value' => '
'. t('For Express Checkout, you need to !cp_link and !wpp_link.', array('!cp_link' => l(t('enable the cart pane'), 'admin/store/settings/cart/edit/panes'), '!wpp_link' => l(t('configure the PayFlow Pro settings'), 'admin/store/settings/payment/edit/gateways'))) .'
',
+ );
+ return $form;
+ }
+}
+
+// Handles the review page for Express Checkout Mark Flow.
+function uc_payflowpro_ec_review_redirect() {
+ if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
+ unset($_SESSION['cart_order']);
+ unset($_SESSION['have_details']);
+ unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
+ drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
+ drupal_goto('cart');
+ }
+
+ $request = _uc_payflowpro_get_ec_xml($_SESSION['TOKEN']);
+ $response = _uc_payflowpro_submit_xml($request);
+
+ $_SESSION['PAYERID'] = $response->PayPalResult->PayerID;
+
+ drupal_goto('cart/checkout/review');
+}
+
+// Handles the review page for Express Checkout Shortcut Flow.
+function uc_payflowpro_ec_review() {
+ if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
+ unset($_SESSION['cart_order']);
+ unset($_SESSION['have_details']);
+ unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
+ drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
+ drupal_goto('cart');
+ }
+
+ if ($_SESSION['have_details'][$order->order_id] !== TRUE) {
+ $request = _uc_payflowpro_get_ec_xml($_SESSION['TOKEN']);
+ $response = _uc_payflowpro_submit_xml($request);
+
+ $_SESSION['PAYERID'] = $response->PayPalResult->PayerID;
+
+ // get variables to populate form
+ $billto_name = check_plain(trim($response->PayPalResult->Name));
+ $name_split = strrpos($billto_name, ' ');
+ if ($name_split > 0) {
+ $billto_firstname = substr($billto_name, 0, $name_split);
+ $billto_lastname = substr($billto_name, $name_split);
+ }
+ else {
+ $billto_firstname = $billto_name;
+ $billto_lastname = '';
+ }
+
+ if (empty($response->PayPalResult->ShipTo->Name)) {
+ $shipto_firstname = $billto_firstname;
+ $shipto_lastname = $billto_lastname;
+ }
+ else {
+ $shipto_name = check_plain(trim($response->PayPalResult->Name));
+ $name_split = strrpos($shipto_name, ' ');
+ if ($name_split > 0) {
+ $shipto_firstname = substr($shipto_name, 0, $name_split);
+ $shipto_lastname = substr($shipto_name, $name_split);
+ }
+ else {
+ $shipto_firstname = $shipto_name;
+ $shipto_lastname = '';
+ }
+ }
+
+ $zone_id = db_result(db_query("SELECT zone_id FROM {uc_zones} WHERE zone_code = '%s'", check_plain($response->PayPalResult->ShipTo->Address->State)));
+ $country_id = db_result(db_query("SELECT country_id FROM {uc_countries} WHERE country_iso_code_2 = '%s'", check_plain($response->PayPalResult->ShipTo->Address->Country)));
+
+ $order->delivery_first_name = $shipto_firstname;
+ $order->delivery_last_name = $shipto_lastname;
+ $order->delivery_street1 = check_plain($response->PayPalResult->ShipTo->Street);
+ $order->delivery_city = check_plain($response->PayPalResult->ShipTo->City);
+ $order->delivery_zone = !empty($zone_id) ? $zone_id : 0;
+ $order->delivery_postal_code = check_plain($response->PayPalResult->ShipTo->Zip);
+ $order->delivery_country = !empty($country_id) ? $country_id : 840;
+
+ $order->billing_first_name = $billto_firstname;
+ $order->billing_last_name = $billto_lastname;
+ $order->billing_street1 = $response->PayPalResult->EMail;
+
+ if (empty($order->primary_email)) {
+ $order->primary_email = $response->PayPalResult->EMail;
+ }
+ $order->payment_method = 'payflowpro_ec';
+
+ uc_order_save($order);
+
+ $_SESSION['have_details'][$order->order_id] = TRUE;
+ }
+
+ $output = t("Your order is almost complete! Please fill in the following details and click 'Continue checkout' to finalize the purchase.");
+
+ $output .= drupal_get_form('uc_payflowpro_ec_review_form', $order);
+
+ return $output;
+}
+
+// Present the final total to the user for checkout!
+function uc_payflowpro_ec_submit() {
+ if (!isset($_SESSION['TOKEN']) || ($order = uc_order_load($_SESSION['cart_order'])) == FALSE) {
+ unset($_SESSION['cart_order'], $_SESSION['have_details']);
+ unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
+ drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
+ drupal_goto('cart');
+ }
+
+ // [ML] FIXME: this doesn't seem normal to be here..
+ $output = '
'. t("Your order is not complete until you click the 'Submit order' button below. Your PayPal account will be charged for the amount shown above once your order is placed. You will receive confirmation once your payment is complete.") .'
'
- . t('PayPal - pay without sharing your financial information.');
-
- $methods[] = array(
- 'id' => 'payflowpro_ec',
- 'name' => t('PayPal Express Checkout'),
- 'title' => $title1,
- 'review' => t('PayPal'),
- 'desc' => t('Complete orders through PayPal Express Checkout.'),
- 'callback' => 'uc_payment_method_payflowpro_ec',
- 'weight' => 1,
- 'checkout' => FALSE,
- 'backend' => FALSE,
- );
-
- return $methods;
-}
-
-/**
* Implementation of hook_payment_gateway()
*/
function uc_payflowpro_payment_gateway() {
@@ -454,427 +368,6 @@ function uc_payflow_pro_pfp_gateway_validate($element, &$form_state) {
}
/*******************************************************************************
- * Express Checkout Functions
- ******************************************************************************/
-
-// Handles the Express Checkout payment method
-function uc_payment_method_payflowpro_ec($op, &$arg1) {
- switch ($op) {
- //case 'order-view':
- case 'settings':
- $form['redirect'] = array(
- '#value' => '