View | Details | Raw Unified | Return to bug 4054
Collapse All | Expand All

(-)classes/registration/form/UserRegistrationForm.inc.php (-4 / +10 lines)
 Lines 16-24    Link Here 
16
16
17
import('form.Form');
17
import('form.Form');
18
18
19
define('REGISTRATION_SUCCESSFUL', 0x100000001);
19
define('REGISTRATION_SUCCESSFUL',	0x100000001);
20
define('REGISTRATION_FAILED', 0x100000002);
20
define('REGISTRATION_FAILED',		0x100000002);
21
define('REGISTRATION_NO_PAYMENT', 0x100000003);
21
define('REGISTRATION_NO_PAYMENT',	0x100000003);
22
define('REGISTRATION_FREE',		0x100000004);
22
23
23
24
24
class UserRegistrationForm extends Form {
25
class UserRegistrationForm extends Form {
 Lines 279-285    Link Here 
279
		$queuedPayment =& $paymentManager->createQueuedPayment($schedConf->getConferenceId(), $schedConf->getSchedConfId(), QUEUED_PAYMENT_TYPE_REGISTRATION, $user->getId(), $registrationId, $cost, $registrationType->getCurrencyCodeAlpha());
280
		$queuedPayment =& $paymentManager->createQueuedPayment($schedConf->getConferenceId(), $schedConf->getSchedConfId(), QUEUED_PAYMENT_TYPE_REGISTRATION, $user->getId(), $registrationId, $cost, $registrationType->getCurrencyCodeAlpha());
280
		$queuedPaymentId = $paymentManager->queuePayment($queuedPayment, time() + (60 * 60 * 24 * 30)); // 30 days to complete
281
		$queuedPaymentId = $paymentManager->queuePayment($queuedPayment, time() + (60 * 60 * 24 * 30)); // 30 days to complete
281
282
282
		$paymentManager->displayPaymentForm($queuedPaymentId, $queuedPayment);
283
		if ($cost == 0) {
284
			$paymentManager->fulfillQueuedPayment($queuedPaymentId, $queuedPayment);
285
			return REGISTRATION_FREE;
286
		} else {
287
			$paymentManager->displayPaymentForm($queuedPaymentId, $queuedPayment);
288
		}
283
289
284
		return REGISTRATION_SUCCESSFUL;
290
		return REGISTRATION_SUCCESSFUL;
285
	}
291
	}
(-)locale/en_US/locale.xml (+1 lines)
 Lines 274-279    Link Here 
274
	<message key="schedConf.registration.alreadyRegistered">You are already registered for this conference, although payment has not yet been received. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
274
	<message key="schedConf.registration.alreadyRegistered">You are already registered for this conference, although payment has not yet been received. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
275
	<message key="schedConf.registration.alreadyRegisteredAndPaid">You are already registered for this conference and your registration has been paid. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
275
	<message key="schedConf.registration.alreadyRegisteredAndPaid">You are already registered for this conference and your registration has been paid. Please contact the principal contact in "About" if this is in error or you would like to change your registration.</message>
276
	<message key="schedConf.registration.noPaymentMethodAvailable">Your registration has been recorded. If applicable, you will be contacted regarding payment.</message>
276
	<message key="schedConf.registration.noPaymentMethodAvailable">Your registration has been recorded. If applicable, you will be contacted regarding payment.</message>
277
	<message key="schedConf.registration.free">Your registration has been recorded and no payment is necessary.</message>
277
	<message key="schedConf.registration.conferenceFees">Conference Fees</message>
278
	<message key="schedConf.registration.conferenceFees">Conference Fees</message>
278
	<message key="schedConf.registration.failed">Your registration has failed.  Please try again.</message>
279
	<message key="schedConf.registration.failed">Your registration has failed.  Please try again.</message>
279
	<message key="schedConf.registration.type">Registration Type</message>
280
	<message key="schedConf.registration.type">Registration Type</message>
(-)pages/schedConf/SchedConfHandler.inc.php (+6 lines)
 Lines 295-300    Link Here 
295
					$templateMgr->assign('backLinkLabel', 'common.back');
295
					$templateMgr->assign('backLinkLabel', 'common.back');
296
					$templateMgr->assign('backLink', Request::url(null, null, 'index'));
296
					$templateMgr->assign('backLink', Request::url(null, null, 'index'));
297
					$templateMgr->display('common/message.tpl');
297
					$templateMgr->display('common/message.tpl');
298
				} elseif ($registrationError == REGISTRATION_FREE) {
299
					// Registration successful; no payment required (free)
300
					$templateMgr->assign('message', 'schedConf.registration.free');
301
					$templateMgr->assign('backLinkLabel', 'common.back');
302
					$templateMgr->assign('backLink', Request::url(null, null, 'index'));
303
					$templateMgr->display('common/message.tpl');
298
				}
304
				}
299
			}
305
			}
300
			// Otherwise, payment is handled for us.
306
			// Otherwise, payment is handled for us.

Return to bug 4054