From ebdfa544897802eda8fbf878e1b851cbb6f9c329 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 5 Dec 2013 17:23:24 +0200 Subject: [PATCH] Added support for themes --- README.md | 6 +- app/config/local/database.php | 2 +- app/controllers/AccountController.php | 5 +- app/controllers/ClientController.php | 58 +++------ app/controllers/CreditController.php | 117 +++++++++++++++--- app/controllers/InvoiceController.php | 41 +++--- app/controllers/PaymentController.php | 107 +++++++++++++--- app/controllers/UserController.php | 9 ++ ...11_05_180133_confide_setup_users_table.php | 17 ++- app/database/seeds/ConstantsSeeder.php | 13 ++ app/models/Activity.php | 19 ++- app/models/Client.php | 2 +- app/models/Contact.php | 4 +- app/models/Credit.php | 7 +- app/models/Invoice.php | 4 +- app/models/Payment.php | 5 + app/models/Theme.php | 7 ++ app/models/User.php | 5 + app/routes.php | 41 ++++-- app/views/clients/edit.blade.php | 4 +- app/views/clients/show.blade.php | 4 +- app/views/credits/edit.blade.php | 62 ++++++++++ app/views/datatable.blade.php | 2 +- app/views/header.blade.php | 50 ++++++-- app/views/invoices/edit.blade.php | 24 +--- app/views/list.blade.php | 21 +++- app/views/payments/edit.blade.php | 102 +++++++++++++-- public/css/bootstrap.space.css | 1 + public/css/themes/amelia.min.css | 1 + public/css/themes/cerulean.min.css | 1 + public/css/themes/cosmo.min.css | 1 + public/css/themes/cyborg.min.css | 1 + public/css/themes/flatly.min.css | 1 + public/css/themes/journal.min.css | 1 + public/css/themes/readable.min.css | 1 + public/css/themes/simplex.min.css | 1 + public/css/themes/slate.min.css | 1 + public/css/themes/spacelab.min.css | 1 + public/css/themes/united.min.css | 1 + public/css/themes/yeti.min.css | 1 + public/js/script.js | 46 +++++++ 41 files changed, 618 insertions(+), 179 deletions(-) create mode 100755 app/models/Theme.php create mode 100755 app/views/credits/edit.blade.php create mode 100755 public/css/bootstrap.space.css create mode 100755 public/css/themes/amelia.min.css create mode 100755 public/css/themes/cerulean.min.css create mode 100755 public/css/themes/cosmo.min.css create mode 100755 public/css/themes/cyborg.min.css create mode 100755 public/css/themes/flatly.min.css create mode 100755 public/css/themes/journal.min.css create mode 100755 public/css/themes/readable.min.css create mode 100755 public/css/themes/simplex.min.css create mode 100755 public/css/themes/slate.min.css create mode 100755 public/css/themes/spacelab.min.css create mode 100755 public/css/themes/united.min.css create mode 100755 public/css/themes/yeti.min.css diff --git a/README.md b/README.md index 2152b77ee2df..e84c2f08a7f9 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,7 @@ Install packages using Composer Configure config/database.php and then initialize the database - php artisan migrate - php artisan db:seed + php artisan migrate --seed ### Frameworks/Libraries @@ -55,4 +54,5 @@ Configure config/database.php and then initialize the database * [omnipay/omnipay](https://github.com/omnipay/omnipay) - A framework agnostic, multi-gateway payment processing library for PHP 5.3+ * [Intervention/image](https://github.com/Intervention/image) - PHP Image Manipulation * [webpatser/laravel-countries](https://github.com/webpatser/laravel-countries) - Almost ISO 3166_2, 3166_3, currency, Capital and more for all countries -* [briannesbitt/Carbon](https://github.com/briannesbitt/Carbon) - A simple API extension for DateTime with PHP 5.3+ \ No newline at end of file +* [briannesbitt/Carbon](https://github.com/briannesbitt/Carbon) - A simple API extension for DateTime with PHP 5.3+ +* [thomaspark/bootswatch](https://github.com/thomaspark/bootswatch) - Themes for Bootstrap \ No newline at end of file diff --git a/app/config/local/database.php b/app/config/local/database.php index 2c2e309a6e1b..1600d4e269e2 100755 --- a/app/config/local/database.php +++ b/app/config/local/database.php @@ -9,7 +9,7 @@ return array( 'host' => 'localhost', 'database' => 'ninja', 'username' => 'ninja', - 'password' => '1234', + 'password' => 'ninja', 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 8f808bfdd9cb..5029dc936658 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -181,9 +181,8 @@ class AccountController extends \BaseController { continue; } - $client = new Client; - $client->account_id = Auth::user()->account_id; - $contact = new Contact; + $client = Client::createNew(); + $contact = Contact::createNew(); $count++; foreach ($row as $index => $value) diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php index 3fc28768d926..86150c4658fb 100755 --- a/app/controllers/ClientController.php +++ b/app/controllers/ClientController.php @@ -21,20 +21,20 @@ class ClientController extends \BaseController { public function getDatatable() { - $clients = Client::scope()->with('contacts')->get(); + $query = DB::table('clients')->join('contacts', 'clients.id', '=','contacts.client_id')->where('contacts.is_primary', '=', true); - return Datatable::collection($clients) + return Datatable::query($query) ->addColumn('checkbox', function($model) { return ''; }) ->addColumn('name', function($model) { return link_to('clients/' . $model->public_id, $model->name); }) - ->addColumn('contact', function($model) { return $model->contacts[0]->getFullName(); }) + ->addColumn('first_name', function($model) { return $model->first_name . ' ' . $model->last_name; }) ->addColumn('balance', function($model) { return '$' . $model->balance; }) - ->addColumn('last_login', function($model) { return $model->contacts[0]->getLastLogin(); }) - ->addColumn('date_created', function($model) { return $model->created_at->toFormattedDateString(); }) - ->addColumn('email', function($model) { return HTML::mailto($model->contacts[0]->email, $model->contacts[0]->email); }) - ->addColumn('phone', function($model) { return $model->contacts[0]->phone; }) + ->addColumn('clients.last_login', function($model) { return timestampToDateString($model->last_login); }) + ->addColumn('clients.created_at', function($model) { return timestampToDateString($model->created_at); }) + ->addColumn('email', function($model) { return HTML::mailto($model->email, $model->email); }) + ->addColumn('phone', function($model) { return $model->phone; }) ->addColumn('dropdown', function($model) { - return '