fix urls & remove duplicate function elplatt#281

fix urls & remove duplicate function elplatt#281

crm/modules/member/command.inc.php

@@ -210,8 +210,6 @@ function command_member_membership_add () {
         return crm_url('members');
     }
 
-    // Add membership
-
     // Construct membership object and save
     $membership = array(
         'sid' => $_POST['sid']
@@ -222,7 +220,7 @@ function command_member_membership_add () {
     );
     member_membership_save($membership);
 
-    return crm_url("contact&cid=$_POST[cid]");
+    return crm_url("contact&cid=$_POST[cid]&tab=plan");
 }
 
 /**
@@ -272,7 +270,7 @@ function command_member_membership_delete () {
     // Delete membership
     member_membership_delete($esc_post['sid']);
 
-    return crm_url("contact&cid=$_POST[cid]");
+    return crm_url("contact&cid=$_POST[cid]&tab=plan");
 }
 
 /**
@@ -428,9 +426,6 @@ function command_member_import () {
         );
         $member = array('membership' => $membership);
         $contact['member'] = $member;
-        // Add user
-        $user = array('username' => $username);
-        $contact['user'] = $user;
 
         $contact = contact_save($contact);
 

crm/modules/paypal_payment/expresscheckout.php

@@ -0,0 +1,70 @@
+<?php
+global $crm_root;
+global $Balance_Payment_Amount;
+// Save path of directory containing index.php
+$crm_root = realpath(dirname(__FILE__) . '/../..');
+// Bootstrap the crm
+require_once($crm_root . '/include/crm.inc.php');
+require_once ("paypalfunctions.php");
+// ==================================
+// PayPal Express Checkout Module
+// ==================================
+
+//'------------------------------------
+//' The paymentAmount is the total value of 
+//' the shopping cart, that was set 
+//' earlier in a session variable 
+//' by the shopping cart page
+//'------------------------------------
+$paymentAmount = $Balance_Payment_Amount;
+
+//'------------------------------------
+//' The currencyCodeType and paymentType 
+//' are set to the selections made on the Integration Assistant 
+//'------------------------------------
+$currencyCodeType = $config_currency_code;
+$paymentType = "Sale";
+
+//'------------------------------------
+//' The returnURL is the location where buyers return to when a
+//' payment has been succesfully authorized.
+//'
+//' This is set to the value entered on the Integration Assistant 
+//'------------------------------------
+$returnURL = 'http://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')));
+
+//'------------------------------------
+//' The cancelURL is the location buyers are sent to when they hit the
+//' cancel button during authorization of payment during the PayPal flow
+//'
+//' This is set to the value entered on the Integration Assistant 
+//'------------------------------------
+$cancelURL = 'http://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')));
+
+//'------------------------------------
+//' Calls the SetExpressCheckout API call
+//'
+//' The CallShortcutExpressCheckout function is defined in the file PayPalFunctions.php,
+//' it is included at the top of this file.
+//'-------------------------------------------------
+$resArray = CallShortcutExpressCheckout ($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL);
+$ack = strtoupper($resArray["ACK"]);
+if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+{
+	RedirectToPayPal ( $resArray["TOKEN"] );
+} 
+else  
+{
+	//Display a user friendly Error on the page using any of the following error information returned by PayPal
+	$ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
+	$ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
+	$ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
+	$ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
+
+	echo "SetExpressCheckout API call failed. ";
+	echo "Detailed Error Message: " . $ErrorLongMsg;
+	echo "Short Error Message: " . $ErrorShortMsg;
+	echo "Error Code: " . $ErrorCode;
+	echo "Error Severity Code: " . $ErrorSeverityCode;
+}
+?>

crm/modules/paypal_payment/paypal_payment.inc.php

@@ -554,6 +554,12 @@ function paypal_payment_form_alter(&$form, $form_id) {
                 }
             }
         }
+    }
+    if ($form_id === 'member_add') {
+
+    }
+    if ($form_id === 'register') {
+
     }
     return $form;
 }
@@ -640,3 +646,29 @@ function command_paypal_payment_contact_delete () {
 function theme_paypal_payment_admin () {
     return '<p><a href=' . crm_url('paypal-admin') . '>Administer</a></p>';
 }
+
+/**
+ * Return themed html for a paypal payment button.
+ * @param $cid The cid to create a button for.
+ * @param $params Options for the button.
+ * @return A string containing the themed html.
+ */
+function theme_paypal_payment_button () {
+    require_once ("expresscheckout.php");
+    $html = <<<EOF
+<form action='modules/paypal_payment/expresscheckout.php' METHOD='POST'>
+<input type='image' name='submit' src='https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif' border='0' align='top' alt='Check out with PayPal'/>
+</form>
+EOF;
+    return $html;
+}
+
+/**
+ * Return themed html for a paypal subscription button.
+ * @param $cid The cid to create a button for.
+ * @param $params Options for the button.
+ * @return A string containing the themed html.
+ */
+function theme_paypal_subscription_button ($cid, $params = array()) {
+
+}