From dfd4de33bd0671b3c61f38e8f4332b69b1d1240b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 13 Apr 2014 08:28:16 +0300
Subject: [PATCH] Working on pro plan

---
 app/controllers/AccountController.php         | 3 +++
 app/database/seeds/PaymentLibrariesSeeder.php | 2 ++
 app/lang/en/texts.php                         | 2 +-
 app/models/Gateway.php                        | 2 +-
 app/views/accounts/payments.blade.php         | 4 +---
 app/views/invoices/edit.blade.php             | 7 +++----
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 25a9ca835968..20567c18a763 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -100,6 +100,7 @@ class AccountController extends \BaseController {
 		$invitation = new Invitation();
 		$invitation->account_id = $account->id;
 		$invitation->user_id = $account->users()->first()->id;
+		$invitation->public_id = $publicId;
 		$invitation->invoice_id = $invoice->id;
 		$invitation->contact_id = $client->contacts()->first()->id;
 		$invitation->invitation_key = str_random(RANDOM_KEY_LENGTH);
@@ -134,6 +135,8 @@ class AccountController extends \BaseController {
 			$user->password = $random;
 			$user->password_confirmation = $random;			
 			$user->username = $random;
+			$user->first_name = 'Invoice';
+			$user->last_name = 'Ninja';
 			$user->notify_sent = false;
 			$user->notify_paid = false;
 			$account->users()->save($user);			
diff --git a/app/database/seeds/PaymentLibrariesSeeder.php b/app/database/seeds/PaymentLibrariesSeeder.php
index 422ae53465f3..d9fcc428784d 100644
--- a/app/database/seeds/PaymentLibrariesSeeder.php
+++ b/app/database/seeds/PaymentLibrariesSeeder.php
@@ -5,6 +5,8 @@ class PaymentLibrariesSeeder extends Seeder
 
 	public function run()
 	{
+		Eloquent::unguard();
+
 		$gateways = [
 			array('name'=>'BeanStream', 'provider'=>'BeanStream', 'payment_library_id' => 2),
 			array('name'=>'Psigate', 'provider'=>'Psigate', 'payment_library_id' => 2)
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 829f3c7cb2ed..e69096172896 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -308,6 +308,6 @@ return array(
 
   'pro_plan_product' => 'Pro Plan',
   'pro_plan_description' => 'One year enrollment in the Invoice Ninja Pro Plan',
-  'pro_plan_succes' => 'We\'ve sent you an invoice. Once paid the kfeatures will be enabled.',
+  'pro_plan_succes' => 'Thanks for joining! Once the invoice is paid your membership will begin.',
 
 );
diff --git a/app/models/Gateway.php b/app/models/Gateway.php
index c1e747ffa8f7..64623caeab7b 100755
--- a/app/models/Gateway.php
+++ b/app/models/Gateway.php
@@ -25,7 +25,7 @@ class Gateway extends Eloquent
 		}
 		else 
 		{
-			$fields = Payment_Utility::load('config', 'drivers/'.$this->provider);
+			$fields = Payment_Utility::load('config', 'drivers/'.strtolower($this->provider));
 		}		
 
 		if($fields == null)
diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php
index 53ab0d38f3c5..57b0aef340f2 100755
--- a/app/views/accounts/payments.blade.php
+++ b/app/views/accounts/payments.blade.php
@@ -10,9 +10,7 @@
 	{{ Former::populateField('notify_paid', intval(Auth::user()->notify_paid)) }}
 
 	{{ Former::legend('Payment Gateway') }}
-	
-	{{Former::label('Lorem Ipsum goes here.')}}
-	
+		
 	<div class="two-column">
 	{{ Former::radios('recommendedGateway_id')
 		->label('Recommended Gateways')
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index b2afdbca94c8..3ab26a420710 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -455,16 +455,15 @@
         </div>
       </div>
 
-      <div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="proPlanSuccessDiv">
+      <div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="proPlanSuccess">
         <br/>
         <h3>{{ trans('texts.success') }}</h3>
         {{ trans('texts.pro_plan_succes') }}<br/>&nbsp;
       </div>
 
-
 	     <div class="modal-footer" style="margin-top: 0px" id="proPlanFooter">
 	      	<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>	      	
-	      	<button type="button" class="btn btn-primary" data-dismiss="modal" id="proPlanButton" onclick="submitProPlan()">{{ trans('texts.sign_up') }}</button>	      		      	
+	      	<button type="button" class="btn btn-primary" id="proPlanButton" onclick="submitProPlan()">{{ trans('texts.sign_up') }}</button>	      		      	
 	     </div>	  	
 	    </div>
 	  </div>
@@ -495,7 +494,7 @@
       type: 'POST',
       url: '{{ URL::to('account/go_pro') }}',
       success: function(result) { 
-        $('#proPlanSuccessDiv, #proPlanFooter').show();
+        $('#proPlanSuccess, #proPlanFooter').show();
         $('#proPlanWorking, #proPlanButton').hide();
       }
     });