Merge pull request #7 from shivampaw/develop

Version 3.1.0 - Custom Views

.env.example

@@ -31,4 +31,5 @@ STRIPE_SECRET=
 
 
 ## If you wish to change any of the following then remove the # and make your change!
-#SITE_TITLE=
+# SITE_TITLE="UltimateCRM"
+# CURRENCY=£

.gitignore

@@ -4,5 +4,4 @@
 Homestead.yaml
 Homestead.json
 .env
-**/.DS_Store
-/public/project_files
+**/.DS_Store

app/Console/Commands/CreateSuperAdmin.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class CreateSuperAdmin extends Command

app/Http/Controllers/AdminsController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use App\Admin;
 use App\Http\Requests;
 use Illuminate\Http\Request;
@@ -50,9 +50,7 @@ public function store(Request $request)
             'email' => 'required|email|unique:clients|unique:users',
         ];
         $this->validate($request, $rules);
-
         $user = addUser($request, true);
-
         flash('Admin Created!');
         return redirect('/admins');
     }
@@ -78,13 +76,9 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, User $admin)
     {
-        $admin = User::where('is_admin', 1)->findOrFail($id);
-        $admin->name = $request->name;
-        $admin->email = $request->email;
-        $admin->save();
-
+        $admin->update($request->all());
         flash('Admin ('.$admin->name.') Updated!');
         return redirect('/admins');
     }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
 use App\Http\Controllers\Controller;

app/Http/Controllers/ClientsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
-use App\Client;
+use App\Models\User;
+use App\Models\Client;
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -54,14 +54,8 @@ public function store(Request $request)
         $this->validate($request, $rules);
 
         $user = addUser($request);
-
-        $client = new Client();
-        $client->full_name = $request->name;
-        $client->email = $request->email;
-        $client->number = $request->number;
-        $client->address = $request->address;
-        $client->user_id = $user->id;
-        $client->save();
+        $client = new Client($request->all());
+        $user->client()->save($client);
 
         flash('Client Created!');
         return redirect('/clients');
@@ -70,7 +64,7 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param \App\Client $client
+     * @param \App\Models\Client $client
      *
      * @return \Illuminate\Http\Response
      */
@@ -82,7 +76,7 @@ public function show(Client $client)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Client $client
+     * @param \App\Models\Client $client
      *
      * @return \Illuminate\Http\Response
      */
@@ -95,21 +89,14 @@ public function edit(Client $client)
      * Update the specified resource in storage.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \App\Client              $client
+     * @param \App\Models\Client       $client
      *
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Client $client)
     {
-        $client->full_name = $request->full_name;
-        $client->email = $request->email;
-        $client->number = $request->number;
-        $client->address = $request->address;
-        $client->save();
-
-        $client->user->name = $client->full_name;
-        $client->user->email = $client->email;
-        $client->user->save();
+        $client->update($request->all());
+        $client->user->update($request->all());
 
         flash('Client Updated!');
         return redirect('/clients/'.$client->id);
@@ -118,7 +105,7 @@ public function update(Request $request, Client $client)
     /**
      * Remove the specified resource from storage.
      *
-     * @param \App\Client $client
+     * @param \App\Models\Client $client
      *
      * @return \Illuminate\Http\Response
      */

app/Http/Controllers/ClientsOnlyController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Invoice;
+use App\Models\Invoice;
 use Carbon\Carbon;
 use Stripe\Charge;
 use Stripe\Stripe;
@@ -23,21 +23,18 @@ public function __construct()
     public function allInvoices()
     {
         $invoices = Auth::user()->client->invoices;
-
         return view('clientsOnly.invoices.index', compact('invoices'));
     }
 
     public function showInvoice($id)
     {
         $invoice = Auth::user()->client->invoices()->findOrFail($id);
-
         return view('clientsOnly.invoices.show', compact('invoice'));
     }
 
     public function payInvoice($id)
     {
         $invoice = Auth::user()->client->invoices()->where('paid', false)->findOrFail($id);
-
         return view('clientsOnly.invoices.pay', compact('invoice'));
     }
 
@@ -63,12 +60,11 @@ public function paidInvoice(Request $request, $id)
             $invoice->save();
 
             Mail::send('emails.invoices.paid', ['client' => $client, 'invoice' => $invoice], function ($mail) use ($client, $invoice) {
-                $mail->to($client->email, $client->full_name);
-                $mail->subject('['.$client->full_name.'] Invoice #'.$invoice->id.' Has Been Paid For');
+                $mail->to($client->email, $client->name);
+                $mail->subject('['.$client->name.'] Invoice #'.$invoice->id.' Has Been Paid For');
             });
 
             flash('Invoice Paid!');
-
             return redirect('/invoices/'.$id);
         } catch (\Stripe\Error\Base $e) {
             flash($e->getMessage(), 'danger');
@@ -85,14 +81,12 @@ public function paidInvoice(Request $request, $id)
     public function allProjects()
     {
         $projects = Auth::user()->client->projects;
-
         return view('clientsOnly.projects.index', compact('projects'));
     }
 
     public function showProject($id)
     {
         $project = Auth::user()->client->projects()->findOrFail($id);
-
         return view('clientsOnly.projects.show', compact('project'));
     }
 
@@ -104,7 +98,6 @@ public function acceptProject($id)
         $project->save();
 
         flash('Project Accepted');
-
         return redirect('/projects/'.$project->id);
     }
 }

app/Http/Controllers/InvoicesController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Client;
-use App\Invoice;
-use App\Project;
+use App\Models\Client;
+use App\Models\Invoice;
+use App\Models\Project;
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -59,8 +59,8 @@ public function store(Request $request, Client $client)
         $client->addInvoice($invoice);
 
         Mail::send('emails.invoices.new', ['client' => $client, 'invoice' => $invoice], function ($mail) use ($client) {
-            $mail->to($client->email, $client->full_name);
-            $mail->subject('['.$client->full_name.'] New Invoice Generated');
+            $mail->to($client->email, $client->name);
+            $mail->subject('['.$client->name.'] New Invoice Generated');
         });
 
         flash('Invoice Created!');

app/Http/Controllers/PagesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

app/Http/Controllers/ProjectsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Client;
-use App\Project;
+use App\Models\Client;
+use App\Models\Project;
 use App\Http\Requests;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
@@ -65,9 +65,9 @@ public function store(Request $request, Client $client)
             $client->addProject($project);
 
             Mail::send('emails.projects.new', ['client' => $client, 'project' => $project], function ($mail) use ($client, $project) {
-                $mail->to($client->email, $client->full_name);
+                $mail->to($client->email, $client->name);
                 $mail->attach(public_path().$project->pdf_path);
-                $mail->subject('['.$client->full_name.'] New Project Created');
+                $mail->subject('['.$client->name.'] New Project Created');
             });
 
             flash('The project has been created!');

app/Client.php → app/Models/Client.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
-use App\Invoice;
-use App\Project;
+use App\Models\Invoice;
+use App\Models\Project;
 use Illuminate\Database\Eloquent\Model;
 
 class Client extends Model
 {
-    protected $fillable = ['full_name', 'email', 'number', 'address', 'stripe_customer_id'];
+    protected $fillable = ['name', 'email', 'number', 'address', 'stripe_customer_id'];
 
     public function invoices()
     {

app/Invoice.php → app/Models/Invoice.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
-use App\Transaction;
 use Illuminate\Database\Eloquent\Model;
 
 class Invoice extends Model

app/Project.php → app/Models/Project.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Database\Eloquent\Model;

app/User.php → app/Models/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Foundation\Auth\User as Authenticatable;

app/helpers.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 function flash($message, $level = 'success')
@@ -36,5 +36,5 @@ function addUser(Request $request, $admin = false)
 
 function formatInvoiceTotal($number)
 {
-    return '£'.number_format($number/100, 2);
+    return config('crm.currency').number_format($number/100, 2);
 }

config/auth.php

@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model'  => App\User::class,
+            'model'  => App\Models\User::class,
         ],
 
         // 'users' => [

config/crm.php

@@ -2,4 +2,5 @@
 
 return [
     'site_title' => env('SITE_TITLE', 'UltimateCRM'),
+    'currency'   => env('CURRENCY', '£'),
 ];

config/services.php

@@ -30,7 +30,7 @@
     ],
 
     'stripe' => [
-        'model'  => App\User::class,
+        'model'  => App\Models\User::class,
         'key'    => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
     ],

config/view.php

@@ -14,6 +14,7 @@
     */
 
     'paths' => [
+        realpath(base_path('resources/customViews')),
         realpath(base_path('resources/views')),
     ],
 

database/factories/ModelFactory.php

@@ -11,7 +11,7 @@
 |
 */
 
-$factory->define(App\User::class, function (Faker\Generator $faker) {
+$factory->define(App\Models\User::class, function (Faker\Generator $faker) {
     return [
         'name'           => $faker->name,
         'email'          => $faker->safeEmail,

database/migrations/2016_11_13_093810_create_clients_table.php

@@ -15,7 +15,7 @@ public function up()
         Schema::create('clients', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id')->unsigned()->index();
-            $table->string('full_name');
+            $table->string('name');
             $table->string('email')->unique();
             $table->string('number')->nullable();
             $table->text('address')->nullable();