From 8ba3e9f79327d88770dd1dffa9dd10a96c7277d8 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 26 Jul 2018 22:38:00 +0800 Subject: [PATCH] Add invoice discount - closes #10 --- .../Controllers/Invoices/InvoicesController.php | 12 +- app/Http/Controllers/Invoices/ItemsController.php | 12 +- .../2017_10_05_162758_create_invoices_table.php | 2 + resources/lang/de/invoice.php | 3 + resources/lang/en/invoice.php | 3 + resources/lang/id/invoice.php | 3 + resources/views/invoices/edit.blade.php | 2 + .../views/invoices/partials/item-list.blade.php | 2 +- resources/views/invoices/pdf.blade.php | 19 +++ resources/views/invoices/show.blade.php | 21 ++- tests/Feature/Invoices/ManageInvoicesTest.php | 151 +++++++++++++++++++-- 11 files changed, 206 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/Invoices/InvoicesController.php b/app/Http/Controllers/Invoices/InvoicesController.php index 45bded1..02f9d96 100644 --- a/app/Http/Controllers/Invoices/InvoicesController.php +++ b/app/Http/Controllers/Invoices/InvoicesController.php @@ -36,11 +36,15 @@ class InvoicesController extends Controller public function update(Invoice $invoice) { $invoiceData = request()->validate([ - 'project_id' => 'required|exists:projects,id', - 'date' => 'required|date', - 'due_date' => 'nullable|date|after:date', - 'notes' => 'nullable|string|max:255', + 'project_id' => 'required|exists:projects,id', + 'date' => 'required|date', + 'due_date' => 'nullable|date|after:date', + 'discount' => 'nullable|numeric', + 'discount_notes' => 'nullable|string|max:255', + 'notes' => 'nullable|string|max:255', ]); + $invoiceSubtotal = collect($invoice->items)->sum('amount'); + $invoiceData['amount'] = $invoiceSubtotal - $invoiceData['discount']; $invoice->update($invoiceData); diff --git a/app/Http/Controllers/Invoices/ItemsController.php b/app/Http/Controllers/Invoices/ItemsController.php index 3cbc95a..f7f7ecd 100644 --- a/app/Http/Controllers/Invoices/ItemsController.php +++ b/app/Http/Controllers/Invoices/ItemsController.php @@ -20,10 +20,10 @@ class ItemsController extends Controller 'amount' => $itemData['new_item_amount'], ]; $invoice->items = $items; - $invoice->amount = collect($items)->sum('amount'); + $invoice->amount = (int) collect($items)->sum('amount') - $invoice->discount; $invoice->save(); - flash(trans('invoice.item_added')); + flash(__('invoice.item_added')); return back(); } @@ -46,10 +46,10 @@ class ItemsController extends Controller 'amount' => $amount, ]; $invoice->items = $items; - $invoice->amount = collect($items)->sum('amount'); + $invoice->amount = (int) collect($items)->sum('amount') - $invoice->discount; $invoice->save(); - flash(trans('invoice.item_updated')); + flash(__('invoice.item_updated')); return back(); } @@ -65,10 +65,10 @@ class ItemsController extends Controller $items = $invoice->items; unset($items[$itemIndex]); $invoice->items = $items; - $invoice->amount = (int) collect($items)->sum('amount'); + $invoice->amount = (int) collect($items)->sum('amount') - $invoice->discount; $invoice->save(); - flash(trans('invoice.item_removed')); + flash(__('invoice.item_removed')); return back(); } diff --git a/database/migrations/2017_10_05_162758_create_invoices_table.php b/database/migrations/2017_10_05_162758_create_invoices_table.php index 9426cfc..6e74b04 100644 --- a/database/migrations/2017_10_05_162758_create_invoices_table.php +++ b/database/migrations/2017_10_05_162758_create_invoices_table.php @@ -21,6 +21,8 @@ class CreateInvoicesTable extends Migration $table->date('due_date')->nullable(); $table->text('items'); $table->unsignedInteger('amount'); + $table->unsignedInteger('discount')->nullable(); + $table->string('discount_notes')->nullable(); $table->string('notes')->nullable(); $table->unsignedTinyInteger('status_id'); $table->unsignedInteger('creator_id'); diff --git a/resources/lang/de/invoice.php b/resources/lang/de/invoice.php index 9c262e9..3e1e841 100644 --- a/resources/lang/de/invoice.php +++ b/resources/lang/de/invoice.php @@ -56,4 +56,7 @@ return [ 'item_description' => 'Beschreibung', 'item_amount' => 'Summe', 'items_count' => 'Summe Positionen', + 'subtotal' => 'Subtotal', + 'discount' => 'Discount', + 'discount_notes' => 'Discount Notes', ]; diff --git a/resources/lang/en/invoice.php b/resources/lang/en/invoice.php index 504d8d8..db22e96 100644 --- a/resources/lang/en/invoice.php +++ b/resources/lang/en/invoice.php @@ -56,4 +56,7 @@ return [ 'item_description' => 'Description', 'item_amount' => 'Amount', 'items_count' => 'Item Count', + 'subtotal' => 'Subtotal', + 'discount' => 'Discount', + 'discount_notes' => 'Discount Notes', ]; diff --git a/resources/lang/id/invoice.php b/resources/lang/id/invoice.php index 4cb5211..ea637b4 100644 --- a/resources/lang/id/invoice.php +++ b/resources/lang/id/invoice.php @@ -56,4 +56,7 @@ return [ 'item_description' => 'Deskripsi', 'item_amount' => 'Biaya', 'items_count' => 'Jumlah Item', + 'subtotal' => 'Subtotal', + 'discount' => 'Diskon', + 'discount_notes' => 'Catatan Diskon', ]; diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 25b3384..8b66cbb 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -56,6 +56,8 @@
{!! FormField::text('due_date', ['label' => trans('invoice.due_date')]) !!}
{!! FormField::textarea('notes', ['label' => trans('invoice.notes')]) !!} + {!! FormField::price('discount', ['label' => __('invoice.discount'), 'currency' => Option::get('money_sign', 'Rp')]) !!} + {!! FormField::text('discount_notes', ['label' => __('invoice.discount_notes')]) !!}
{{ Form::submit(trans('invoice.update'), ['class' => 'btn btn-info']) }} diff --git a/resources/views/invoices/partials/item-list.blade.php b/resources/views/invoices/partials/item-list.blade.php index 2ef7f53..7834873 100644 --- a/resources/views/invoices/partials/item-list.blade.php +++ b/resources/views/invoices/partials/item-list.blade.php @@ -77,7 +77,7 @@ {{ trans('invoice.amount') }} : - {{ formatRp($invoice->amount) }} + {{ formatRp(collect($invoice->items)->sum('amount')) }} diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php index 34c7439..984ce6d 100755 --- a/resources/views/invoices/pdf.blade.php +++ b/resources/views/invoices/pdf.blade.php @@ -103,15 +103,34 @@ + @php + $subtotal = 0; + @endphp @foreach ($invoice->items as $key => $item) {{ 1 + $key }} {!! nl2br($item['description']) !!} {{ formatRp($item['amount']) }} + @php + $subtotal += $item['amount']; + @endphp @endforeach + @if ($invoice->discount) + + {{ __('invoice.subtotal') }} : + {{ formatRp($subtotal) }} + + + + {{ __('invoice.discount') }} + {{ $invoice->discount_notes ? '('.$invoice->discount_notes.')': '' }} : + + - {{ formatRp($invoice->discount) }} + + @endif {{ trans('app.total') }} {{ formatRp($invoice->amount) }} diff --git a/resources/views/invoices/show.blade.php b/resources/views/invoices/show.blade.php index d79a8f3..d0737b5 100644 --- a/resources/views/invoices/show.blade.php +++ b/resources/views/invoices/show.blade.php @@ -32,15 +32,34 @@ + @php + $subtotal = 0; + @endphp @foreach($invoice->items as $key => $item) {{ $key + 1 }} - {{ $item['description'] }} + {!! nl2br($item['description']) !!} {{ formatRp($item['amount']) }} + @php + $subtotal += $item['amount']; + @endphp @endforeach + @if ($invoice->discount) + + {{ __('invoice.subtotal') }} : + {{ formatRp($subtotal) }} + + + + {{ __('invoice.discount') }} + {{ $invoice->discount_notes ? '('.$invoice->discount_notes.')': '' }} : + + - {{ formatRp($invoice->discount) }} + + @endif {{ trans('app.total') }} : {{ formatRp($invoice->amount) }} diff --git a/tests/Feature/Invoices/ManageInvoicesTest.php b/tests/Feature/Invoices/ManageInvoicesTest.php index b668ca2..e3e6a6f 100644 --- a/tests/Feature/Invoices/ManageInvoicesTest.php +++ b/tests/Feature/Invoices/ManageInvoicesTest.php @@ -22,7 +22,7 @@ class ManageInvoicesTest extends TestCase $this->visit(route('invoices.index')); $this->seePageIs(route('invoices.index')); - $this->see(trans('invoice.list')); + $this->see(__('invoice.list')); $this->see($invoice->number); } @@ -34,14 +34,14 @@ class ManageInvoicesTest extends TestCase $this->visit(route('invoices.edit', $invoice)); - $this->submitForm(trans('invoice.update'), [ + $this->submitForm(__('invoice.update'), [ 'project_id' => $invoice->project_id, 'date' => '2011-01-01', 'due_date' => '2011-01-30', 'notes' => 'Catatan invoice 123', ]); - $this->see(trans('invoice.updated')); + $this->see(__('invoice.updated')); $this->seePageIs(route('invoices.show', $invoice)); $this->seeInDatabase('invoices', [ @@ -53,6 +53,45 @@ class ManageInvoicesTest extends TestCase } /** @test */ + public function user_can_edit_invoice_with_additional_discount() + { + $this->adminUserSigningIn(); + $invoice = factory(Invoice::class)->create([ + 'date' => '2010-10-10', + 'due_date' => '2010-10-30', + 'amount' => 3000, + 'items' => [ + ['description' => 'Deskripsi item invoice', 'amount' => 1000], + ['description' => 'Deskripsi item invoice', 'amount' => 2000], + ], + ]); + + $this->visit(route('invoices.edit', $invoice)); + + $this->submitForm(__('invoice.update'), [ + 'project_id' => $invoice->project_id, + 'date' => '2011-01-01', + 'due_date' => '2011-01-30', + 'discount' => 500, + 'discount_notes' => 'Diskon 500.', + 'notes' => 'Catatan invoice 123', + ]); + + $this->see(__('invoice.updated')); + $this->seePageIs(route('invoices.show', $invoice)); + + $this->seeInDatabase('invoices', [ + 'id' => $invoice->id, + 'notes' => 'Catatan invoice 123', + 'date' => '2011-01-01', + 'due_date' => '2011-01-30', + 'amount' => 2500, + 'discount' => 500, + 'discount_notes' => 'Diskon 500.', + ]); + } + + /** @test */ public function user_can_add_invoice_item_on_invoice_edit_page() { $this->adminUserSigningIn(); @@ -60,19 +99,19 @@ class ManageInvoicesTest extends TestCase $this->visit(route('invoices.edit', $invoice)); - $this->submitForm(trans('invoice.add_item'), [ + $this->submitForm(__('invoice.add_item'), [ 'new_item_description' => 'Testing deskripsi invoice item', 'new_item_amount' => 2000, ]); - $this->see(trans('invoice.item_added')); + $this->see(__('invoice.item_added')); - $this->submitForm(trans('invoice.add_item'), [ + $this->submitForm(__('invoice.add_item'), [ 'new_item_description' => 'Testing deskripsi invoice item', 'new_item_amount' => 3000, ]); - $this->see(trans('invoice.item_added')); + $this->see(__('invoice.item_added')); $this->seePageIs(route('invoices.edit', $invoice)); @@ -84,6 +123,32 @@ class ManageInvoicesTest extends TestCase } /** @test */ + public function user_can_add_invoice_item_on_invoice_with_discount_and_sum_correct_amount() + { + $this->adminUserSigningIn(); + $invoice = factory(Invoice::class)->create([ + 'discount' => 300, + ]); + + $this->visit(route('invoices.edit', $invoice)); + + $this->submitForm(__('invoice.add_item'), [ + 'new_item_description' => 'Testing deskripsi invoice item', + 'new_item_amount' => 2000, + ]); + + $this->see(__('invoice.item_added')); + + $this->seePageIs(route('invoices.edit', $invoice)); + + $this->seeInDatabase('invoices', [ + 'id' => $invoice->id, + 'amount' => 1700, + 'discount' => 300, + ]); + } + + /** @test */ public function user_can_update_invoice_item_on_invoice_edit_page() { $this->adminUserSigningIn(); @@ -103,7 +168,7 @@ class ManageInvoicesTest extends TestCase 'amount[1]' => 100, ]); - $this->see(trans('invoice.item_updated')); + $this->see(__('invoice.item_updated')); $this->seePageIs(route('invoices.edit', $invoice)); @@ -115,6 +180,38 @@ class ManageInvoicesTest extends TestCase } /** @test */ + public function user_can_update_invoice_item_on_invoice_with_discount_and_sum_correct_amount() + { + $this->adminUserSigningIn(); + + $invoice = factory(Invoice::class)->create([ + 'items' => [ + ['description' => 'Testing deskripsi invoice item', 'amount' => '1111'], + ['description' => 'Testing deskripsi invoice item', 'amount' => '2222'], + ], + 'discount' => 50, + ]); + + $this->visit(route('invoices.edit', $invoice)); + + $this->submitForm('update-item-1', [ + 'item_key[1]' => 1, + 'description[1]' => 'Testing deskripsi Update', + 'amount[1]' => 100, + ]); + + $this->see(__('invoice.item_updated')); + + $this->seePageIs(route('invoices.edit', $invoice)); + + $this->seeInDatabase('invoices', [ + 'id' => $invoice->id, + 'items' => '[{"description":"Testing deskripsi invoice item","amount":"1111"},{"description":"Testing deskripsi Update","amount":"100"}]', + 'amount' => 1161, + ]); + } + + /** @test */ public function user_can_remove_invoice_item_on_invoice_edit_page() { $this->adminUserSigningIn(); @@ -132,7 +229,7 @@ class ManageInvoicesTest extends TestCase 'item_index' => 1, ]); - $this->see(trans('invoice.item_removed')); + $this->see(__('invoice.item_removed')); $this->seePageIs(route('invoices.edit', $invoice)); @@ -144,6 +241,36 @@ class ManageInvoicesTest extends TestCase } /** @test */ + public function user_can_remove_invoice_item_on_invoice_with_discount_and_sum_correct_amount() + { + $this->adminUserSigningIn(); + + $invoice = factory(Invoice::class)->create([ + 'items' => [ + ['description' => 'Testing deskripsi invoice item', 'amount' => '1111'], + ['description' => 'Testing deskripsi invoice item', 'amount' => '2222'], + ], + 'discount' => 50, + ]); + + $this->visit(route('invoices.edit', $invoice)); + + $this->submitForm('remove-item-1', [ + 'item_index' => 1, + ]); + + $this->see(__('invoice.item_removed')); + + $this->seePageIs(route('invoices.edit', $invoice)); + + $this->seeInDatabase('invoices', [ + 'id' => $invoice->id, + 'items' => '[{"description":"Testing deskripsi invoice item","amount":"1111"}]', + 'amount' => 1061, + ]); + } + + /** @test */ public function user_can_delete_an_invoice() { $this->adminUserSigningIn(); @@ -151,14 +278,14 @@ class ManageInvoicesTest extends TestCase $this->visit(route('invoices.edit', $invoice)); - $this->click(trans('invoice.delete')); + $this->click(__('invoice.delete')); $this->seePageIs(route('invoices.edit', [$invoice, 'action' => 'delete'])); - $this->submitForm(trans('invoice.delete'), [ + $this->submitForm(__('invoice.delete'), [ 'invoice_id' => $invoice->id, ]); - $this->see(trans('invoice.deleted')); + $this->see(__('invoice.deleted')); $this->seePageIs(route('projects.invoices', $invoice->project_id));