Registering new sign ups

This commit is contained in:
Hillel Coren 2014-11-19 21:51:53 +02:00
parent 680b67bf7b
commit 7ebd690852
7 changed files with 39 additions and 5 deletions

View File

@ -26,7 +26,7 @@ return array(
| |
*/ */
'url' => 'https://www.invoiceninja.com', 'url' => '',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -918,6 +918,13 @@ class AccountController extends \BaseController {
{ {
$this->userMailer->sendConfirmation($user); $this->userMailer->sendConfirmation($user);
} }
else
{
//@file_get_contents(NINJA_APP_URL . "/signup/register/?first_name={$user->first_name}&last_name={$user->last_name}&email={$user->email}");
@file_get_contents('http://ninja.dev' . '/signup/register/?first_name=' . urlencode($user->first_name)
. '&last_name=' . urlencode($user->last_name)
. '&email=' . urlencode($user->email));
}
$activities = Activity::scope()->get(); $activities = Activity::scope()->get();
foreach ($activities as $activity) foreach ($activities as $activity)
@ -936,6 +943,24 @@ class AccountController extends \BaseController {
return "{$user->first_name} {$user->last_name}"; return "{$user->first_name} {$user->last_name}";
} }
public function doRegister()
{
$affiliate = Affiliate::where('affiliate_key', '=', SELF_HOST_AFFILIATE_KEY)->first();
$license = new License;
$license->first_name = Input::get('first_name');
$license->last_name = Input::get('last_name');
$license->email = Input::get('email');
$license->transaction_reference = Request::getClientIp();
$license->license_key = Utils::generateLicense();
$license->affiliate_id = $affiliate->id;
$license->product_id = PRODUCT_SELF_HOST;
$license->is_claimed = 1;
$license->save();
return 'success';
}
public function cancelAccount() public function cancelAccount()
{ {
$account = Auth::user()->account; $account = Auth::user()->account;

View File

@ -15,7 +15,12 @@ class Mailer {
Mail::send($views, $data, function($message) use ($toEmail, $fromEmail, $fromName, $subject) Mail::send($views, $data, function($message) use ($toEmail, $fromEmail, $fromName, $subject)
{ {
$replyEmail = $fromEmail; $replyEmail = $fromEmail;
$fromEmail = NINJA_FROM_EMAIL;
// http://stackoverflow.com/questions/2421234/gmail-appearing-to-ignore-reply-to
if ($toEmail != CONTACT_EMAIL)
{
$fromEmail = NINJA_FROM_EMAIL;
}
$message->to($toEmail)->from($fromEmail, $fromName)->replyTo($replyEmail, $fromName)->subject($subject); $message->to($toEmail)->from($fromEmail, $fromName)->replyTo($replyEmail, $fromName)->subject($subject);
}); });

View File

@ -61,6 +61,7 @@ Route::get('claim_license', 'PaymentController@claim_license');
Route::post('signup/validate', 'AccountController@checkEmail'); Route::post('signup/validate', 'AccountController@checkEmail');
Route::post('signup/submit', 'AccountController@submitSignup'); Route::post('signup/submit', 'AccountController@submitSignup');
Route::get('signup/register', 'AccountController@doRegister');
// Confide routes // Confide routes
Route::get('login', 'UserController@login'); Route::get('login', 'UserController@login');
@ -265,8 +266,10 @@ define('PRO_PLAN_PRICE', 50);
define('PRODUCT_ONE_CLICK_INSTALL', 1); define('PRODUCT_ONE_CLICK_INSTALL', 1);
define('PRODUCT_INVOICE_DESIGNS', 2); define('PRODUCT_INVOICE_DESIGNS', 2);
define('PRODUCT_WHITE_LABEL', 3); define('PRODUCT_WHITE_LABEL', 3);
define('DESIGNS_AFFILIATE_KEY', 'T3RS74'); define('PRODUCT_SELF_HOST', 4);
define('WHITE_LABEL_AFFILIATE_KEY', '92D2J5'); define('WHITE_LABEL_AFFILIATE_KEY', '92D2J5');
define('INVOICE_DESIGNS_AFFILIATE_KEY', 'T3RS74');
define('SELF_HOST_AFFILIATE_KEY', '8S69AD');
define('USER_TYPE_SELF_HOST', 'SELF_HOST'); define('USER_TYPE_SELF_HOST', 'SELF_HOST');
define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST'); define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST');

View File

@ -257,8 +257,9 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
<br/> <br/>
<h3>{{ trans('texts.success') }}</h3> <h3>{{ trans('texts.success') }}</h3>
@if (Utils::isNinja()) @if (Utils::isNinja())
{{ trans('texts.success_message') }}<br/>&nbsp; {{ trans('texts.success_message') }}
@endif @endif
<br/>&nbsp;
</div> </div>
<div class="modal-footer" id="signUpFooter" style="margin-top: 0px"> <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">

View File

@ -37,7 +37,7 @@
@if (Utils::isNinjaProd()) @if (Utils::isNinjaProd())
<button type="button" class="btn btn-primary" onclick="showProPlan('invoice_designs')">{{ trans('texts.go_pro') }}</button> <button type="button" class="btn btn-primary" onclick="showProPlan('invoice_designs')">{{ trans('texts.go_pro') }}</button>
@else @else
<button type="button" class="btn btn-primary" onclick="buyProduct('{{ DESIGNS_AFFILIATE_KEY }}', '{{ PRODUCT_INVOICE_DESIGNS }}')">{{ trans('texts.buy') }}</button> <button type="button" class="btn btn-primary" onclick="buyProduct('{{ INVOICE_DESIGNS_AFFILIATE_KEY }}', '{{ PRODUCT_INVOICE_DESIGNS }}')">{{ trans('texts.buy') }}</button>
@endif @endif
</div> </div>
</div> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB