From 7ebd69085276d22bc121508fd8615b09f59db8fd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 19 Nov 2014 21:51:53 +0200
Subject: [PATCH] Registering new sign ups

---
 app/config/app.php                      |   2 +-
 app/controllers/AccountController.php   |  25 ++++++++++++++++++++++++
 app/ninja/mailers/Mailer.php            |   7 ++++++-
 app/routes.php                          |   5 ++++-
 app/views/header.blade.php              |   3 ++-
 app/views/invoices/pdf.blade.php        |   2 +-
 public/apple-touch-icon-precomposed.png | Bin 0 -> 2207 bytes
 7 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100755 public/apple-touch-icon-precomposed.png

diff --git a/app/config/app.php b/app/config/app.php
index 1aacbf06ef96..4e029327dbe9 100755
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -26,7 +26,7 @@ return array(
 	|
 	*/
 
-	'url' => 'https://www.invoiceninja.com',
+	'url' => '',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 46b788f4fbf3..c996d417a2f0 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -918,6 +918,13 @@ class AccountController extends \BaseController {
 		{
 			$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();
 		foreach ($activities as $activity) 
@@ -936,6 +943,24 @@ class AccountController extends \BaseController {
 		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()
 	{
 		$account = Auth::user()->account;
diff --git a/app/ninja/mailers/Mailer.php b/app/ninja/mailers/Mailer.php
index 7f758d49ed32..cf566da051c6 100755
--- a/app/ninja/mailers/Mailer.php
+++ b/app/ninja/mailers/Mailer.php
@@ -15,7 +15,12 @@ class Mailer {
 		Mail::send($views, $data, function($message) use ($toEmail, $fromEmail, $fromName, $subject)
 		{
 			$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);
 		});		
diff --git a/app/routes.php b/app/routes.php
index e58b1606f6f4..88eaab596057 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -61,6 +61,7 @@ Route::get('claim_license', 'PaymentController@claim_license');
 
 Route::post('signup/validate', 'AccountController@checkEmail');
 Route::post('signup/submit', 'AccountController@submitSignup');
+Route::get('signup/register', 'AccountController@doRegister');
 
 // Confide routes
 Route::get('login', 'UserController@login');
@@ -265,8 +266,10 @@ define('PRO_PLAN_PRICE', 50);
 define('PRODUCT_ONE_CLICK_INSTALL', 1);
 define('PRODUCT_INVOICE_DESIGNS', 2);
 define('PRODUCT_WHITE_LABEL', 3);
-define('DESIGNS_AFFILIATE_KEY', 'T3RS74');
+define('PRODUCT_SELF_HOST', 4);
 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_CLOUD_HOST', 'CLOUD_HOST');
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index f8dfeb0fe90a..eb4932197104 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -257,8 +257,9 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
         <br/>
         <h3>{{ trans('texts.success') }}</h3>
         @if (Utils::isNinja())
-          {{ trans('texts.success_message') }}<br/>&nbsp;
+          {{ trans('texts.success_message') }}
         @endif
+        <br/>&nbsp;
       </div>
 
       <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">	      	
diff --git a/app/views/invoices/pdf.blade.php b/app/views/invoices/pdf.blade.php
index 01fce95094c7..2d39e29d30a4 100644
--- a/app/views/invoices/pdf.blade.php
+++ b/app/views/invoices/pdf.blade.php
@@ -37,7 +37,7 @@
         @if (Utils::isNinjaProd())
           <button type="button" class="btn btn-primary" onclick="showProPlan('invoice_designs')">{{ trans('texts.go_pro') }}</button>
         @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
       </div>
     </div>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100755
index 0000000000000000000000000000000000000000..2a5a5d1f069d56ae9a746137d0935e098f12bd07
GIT binary patch
literal 2207
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
BoDKj0

literal 0
HcmV?d00001