From 17af1e2b9c3c51e9a5adf7e12bd038df4e58b6b7 Mon Sep 17 00:00:00 2001 From: steenrabol Date: Thu, 7 Jan 2016 16:14:11 +0100 Subject: [PATCH] Expenses --- app/Events/ExpenseWasArchived.php | 1 + app/Events/ExpenseWasCreated.php | 2 +- app/Events/ExpenseWasDeleted.php | 2 +- app/Events/ExpenseWasRestored.php | 2 +- app/Http/Controllers/ExpenseController.php | 1 + app/Http/Requests/CreateExpenseRequest.php | 1 + app/Http/Requests/UpdateExpenseRequest.php | 4 +- app/Listeners/ExpenseListener.php | 1 + app/Models/Expense.php | 1 + app/Models/ExpenseActivity.php | 2 +- app/Ninja/Presenters/ExpensePresenter.php | 1 + .../ExpenseActivityRepository.php | 1 + app/Ninja/Repositories/ExpenseRepository.php | 1 + app/Services/ExpenseService.php | 1 + ...016_01_06_155001_create_expenses_table.php | 1 + ...191912_create_expense_activities_table.php | 1 + invoiceninja.komodoproject | 43 +++++++++++++++++++ 17 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 invoiceninja.komodoproject diff --git a/app/Events/ExpenseWasArchived.php b/app/Events/ExpenseWasArchived.php index 7ff42b7b97e2..fe27998d29c4 100644 --- a/app/Events/ExpenseWasArchived.php +++ b/app/Events/ExpenseWasArchived.php @@ -6,6 +6,7 @@ use Illuminate\Queue\SerializesModels; class ExpenseWasArchived extends Event { + // Expenses use SerializesModels; public $expense; diff --git a/app/Events/ExpenseWasCreated.php b/app/Events/ExpenseWasCreated.php index efeb308d9bc9..da3a16d24689 100644 --- a/app/Events/ExpenseWasCreated.php +++ b/app/Events/ExpenseWasCreated.php @@ -5,7 +5,7 @@ use App\Events\Event; use Illuminate\Queue\SerializesModels; class ExpenseWasCreated extends Event { - + // Expenses use SerializesModels; public $expense; diff --git a/app/Events/ExpenseWasDeleted.php b/app/Events/ExpenseWasDeleted.php index a058cf1666e1..1549b483b497 100644 --- a/app/Events/ExpenseWasDeleted.php +++ b/app/Events/ExpenseWasDeleted.php @@ -5,7 +5,7 @@ use App\Events\Event; use Illuminate\Queue\SerializesModels; class ExpenseWasDeleted extends Event { - + // Expenses use SerializesModels; public $expense; diff --git a/app/Events/ExpenseWasRestored.php b/app/Events/ExpenseWasRestored.php index ca308e4ca0f8..b52a2d119a2d 100644 --- a/app/Events/ExpenseWasRestored.php +++ b/app/Events/ExpenseWasRestored.php @@ -5,7 +5,7 @@ use App\Events\Event; use Illuminate\Queue\SerializesModels; class ExpenseWasRestored extends Event { - + // Expenses use SerializesModels; public $expense; diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 8ecb5184ccd4..72dc2a4073b7 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -17,6 +17,7 @@ use App\Http\Requests\CreateExpenseRequest; class ExpenseController extends BaseController { + // Expenses protected $expenseRepo; protected $expenseService; diff --git a/app/Http/Requests/CreateExpenseRequest.php b/app/Http/Requests/CreateExpenseRequest.php index 0a0c71dd8208..a2c08cdfb8d7 100644 --- a/app/Http/Requests/CreateExpenseRequest.php +++ b/app/Http/Requests/CreateExpenseRequest.php @@ -5,6 +5,7 @@ use Illuminate\Validation\Factory; class CreateExpenseRequest extends Request { + // Expenses /** * Determine if the user is authorized to make this request. * diff --git a/app/Http/Requests/UpdateExpenseRequest.php b/app/Http/Requests/UpdateExpenseRequest.php index 83b192280849..6ee77877e6c0 100644 --- a/app/Http/Requests/UpdateExpenseRequest.php +++ b/app/Http/Requests/UpdateExpenseRequest.php @@ -2,9 +2,9 @@ use App\Http\Requests\Request; use Illuminate\Validation\Factory; -use App\Models\Invoice; -class UpdatePaymentRequest extends Request + +class UpdateExpenseRequest extends Request { /** * Determine if the user is authorized to make this request. diff --git a/app/Listeners/ExpenseListener.php b/app/Listeners/ExpenseListener.php index 8d02f00ff4db..0bccaffdb0ae 100644 --- a/app/Listeners/ExpenseListener.php +++ b/app/Listeners/ExpenseListener.php @@ -7,6 +7,7 @@ use App\Ninja\Repositories\ExpenseRepository; class ExpenseListener { + // Expenses protected $expenseRepo; public function __construct(ExpenseRepository $expenseRepo) diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 6376ac016f99..675ad96bcbed 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -6,6 +6,7 @@ use App\Events\ExpenseWasCreated; class Expense extends EntityModel { + // Expenses use SoftDeletes; use PresentableTrait; diff --git a/app/Models/ExpenseActivity.php b/app/Models/ExpenseActivity.php index 14f93e06c2f8..ddd23ab13e75 100644 --- a/app/Models/ExpenseActivity.php +++ b/app/Models/ExpenseActivity.php @@ -8,7 +8,7 @@ use Request; use Carbon; class ExpenseActivity extends Eloquent { - + // Expenses public $timestamps = true; public function scopeScope($query) diff --git a/app/Ninja/Presenters/ExpensePresenter.php b/app/Ninja/Presenters/ExpensePresenter.php index 72da1cfef2f1..3c7237d39d64 100644 --- a/app/Ninja/Presenters/ExpensePresenter.php +++ b/app/Ninja/Presenters/ExpensePresenter.php @@ -5,6 +5,7 @@ use Laracasts\Presenter\Presenter; class ExpensePresenter extends Presenter { + // Expenses public function vendor() { return $this->entity->vendor ? $this->entity->vendor->getDisplayName() : ''; diff --git a/app/Ninja/Repositories/ExpenseActivityRepository.php b/app/Ninja/Repositories/ExpenseActivityRepository.php index aa9dc7e9823e..db4fcdd8b777 100644 --- a/app/Ninja/Repositories/ExpenseActivityRepository.php +++ b/app/Ninja/Repositories/ExpenseActivityRepository.php @@ -10,6 +10,7 @@ use App\Models\Expense; class ExpenseActivityRepository { + // Expenses public function create(Expense $entity, $activityTypeId) { // init activity and copy over context diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php index 2cfaa600c062..5d87fea4d9d1 100644 --- a/app/Ninja/Repositories/ExpenseRepository.php +++ b/app/Ninja/Repositories/ExpenseRepository.php @@ -8,6 +8,7 @@ use App\Ninja\Repositories\BaseRepository; class ExpenseRepository extends BaseRepository { + // Expenses public function getClassName() { return 'App\Models\Expense'; diff --git a/app/Services/ExpenseService.php b/app/Services/ExpenseService.php index 92ffc85306ce..f316ecaabc99 100644 --- a/app/Services/ExpenseService.php +++ b/app/Services/ExpenseService.php @@ -8,6 +8,7 @@ use App\Ninja\Repositories\ExpenseRepository; class ExpenseService extends BaseService { + // Expenses protected $expenseRepo; protected $datatableService; diff --git a/database/migrations/2016_01_06_155001_create_expenses_table.php b/database/migrations/2016_01_06_155001_create_expenses_table.php index 56e74fbc7963..9a8a654f041a 100644 --- a/database/migrations/2016_01_06_155001_create_expenses_table.php +++ b/database/migrations/2016_01_06_155001_create_expenses_table.php @@ -5,6 +5,7 @@ use Illuminate\Database\Migrations\Migration; class CreateExpensesTable extends Migration { + // Expenses model /** * Run the migrations. * diff --git a/database/migrations/2016_01_06_191912_create_expense_activities_table.php b/database/migrations/2016_01_06_191912_create_expense_activities_table.php index a7106568cebe..9b5981741c25 100644 --- a/database/migrations/2016_01_06_191912_create_expense_activities_table.php +++ b/database/migrations/2016_01_06_191912_create_expense_activities_table.php @@ -5,6 +5,7 @@ use Illuminate\Database\Migrations\Migration; class CreateExpenseActivitiesTable extends Migration { + // Expenses model /** * Run the migrations. * diff --git a/invoiceninja.komodoproject b/invoiceninja.komodoproject new file mode 100644 index 000000000000..9f6ba7068341 --- /dev/null +++ b/invoiceninja.komodoproject @@ -0,0 +1,43 @@ + + + + + + + + + + + + + PHP + + + + application/x-www-form-urlencoded + GET + 1 + 0 + 0 + + + + + PHP + %25d/%25m/%25Y %25H:%25M:%25S + 1 + + default + default + PHP + Project + None + None + None + c:\wamp\bin\php\php5.6.15\php.exe + C:\webdev\invoiceninja;C:\webdev\invoiceninja\lavarelcodecomplete + 1 + None + None + +