Working on L5

.env.example

@@ -1,6 +1,7 @@
 APP_ENV=development
 APP_DEBUG=true
 APP_URL=http://ninja.dev
+APP_CIPHER=rijndael-128
 APP_KEY=
 
 DB_TYPE=mysql

app/Console/Commands/SendRecurringInvoices.php

@@ -1,9 +1,15 @@
 <?php namespace App\Console\Commands;
 
+use DateTime;
+use Carbon;
+use Utils;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use App\Ninja\Mailers\ContactMailer as Mailer;
+use App\Models\Invoice;
+use App\Models\InvoiceItem;
+use App\Models\Invitation;
 
 class SendRecurringInvoices extends Command
 {

app/Http/Controllers/AppController.php

@@ -104,6 +104,7 @@ class AppController extends BaseController
         $user = $account->users()->first();
 
         //Auth::login($user, true);
+        $this->accountRepo->registerUser($user);
 
         return Redirect::to('/login');
     }

app/Models/Invoice.php

@@ -236,8 +236,6 @@ Invoice::deleting(function ($invoice) {
     Activity::archiveInvoice($invoice);
 });
 
-// TODO: Fix for L5
-/*Invoice::restoring(function ($invoice) {
+Invoice::restoring(function ($invoice) {
     Activity::restoreInvoice($invoice);
 });
-*/

config/app.php

@@ -80,7 +80,7 @@ return [
 
 	'key' => env('APP_KEY', ''),
 
-	'cipher' => MCRYPT_RIJNDAEL_128,
+	'cipher' => env('APP_CIPHER', MCRYPT_RIJNDAEL_128),
 
 	/*
 	|--------------------------------------------------------------------------

readme.md

@@ -3,7 +3,7 @@
 
 ### [https://www.invoiceninja.com](https://www.invoiceninja.com)
 
-#### Note: the application has recently been updated to Laravel 5. Please use the [1.7.x branch](https://github.com/hillelcoren/invoice-ninja/tree/1.7.x) for a more stable build.
+#### Please [click here](https://bitnami.com/stack/invoice-ninja) to vote for us to be added to Bitnami's one-click install library
 
 If you'd like to use our code to sell your own invoicing app we have an affiliate program. Get in touch for more details.
 

resources/views/auth/login.blade.php

@@ -105,6 +105,7 @@
         @if (!Utils::isNinja())
         <p/>
         <center>
+            <!--
             <div id="fb-root"></div>
             <script>(function(d, s, id) {
                 var js, fjs = d.getElementsByTagName(s)[0];
@@ -120,6 +121,13 @@
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 
             <iframe src="https://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=star&count=false" frameborder="0" scrolling="0" width="50px" height="20px"></iframe>
+            -->
+
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+
+            <iframe allowTransparency="true" frameborder="0" scrolling="no" src="https://bitnami.com/product/invoice-ninja/widget" style="border:none;width:230px; height:100px;"></iframe>
+
         </center>
         @endif