Skip to content

Commit

Permalink
fix bill and invoice reminders
Browse files Browse the repository at this point in the history
  • Loading branch information
ysfkaya committed Dec 5, 2018
1 parent a5dc30e commit e8821f2
Show file tree
Hide file tree
Showing 5 changed files with 172 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/Models/Expense/Bill.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function vendor()

public function scopeDue($query, $date)
{
return $query->where('due_at', '=', $date);
return $query->whereDate('due_at', '=', $date);
}

public function scopeLatest($query)
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Income/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function totals()

public function scopeDue($query, $date)
{
return $query->where('due_at', '=', $date);
return $query->whereDate('due_at', '=', $date);
}

public function scopeLatest($query)
Expand Down
4 changes: 4 additions & 0 deletions database/seeds/TestCompany.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ private function createCompany()
Setting::set('general.default_currency', 'USD');
Setting::set('general.default_account', '1');
Setting::set('general.default_payment_method', 'offlinepayment.cash.1');
Setting::set('general.schedule_bill_days', '10,5,3,1');
Setting::set('general.schedule_invoice_days', '1,3,5,10');
Setting::set('general.send_invoice_reminder', true);
Setting::set('general.send_bill_reminder', true);
Setting::save();

$this->command->info('Test company created.');
Expand Down
80 changes: 80 additions & 0 deletions tests/Feature/Commands/BillReminderTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

namespace Tests\Feature\Commands;

use App\Models\Expense\Bill;
use App\Notifications\Expense\Bill as BillNotification;
use Illuminate\Support\Facades\Notification;
use Jenssegers\Date\Date;
use Tests\Feature\FeatureTestCase;

class BillReminderTest extends FeatureTestCase
{
private $addDay;

protected function setUp()
{
parent::setUp();

$this->addDay = 3;
}

public function testBillReminderByDueDate()
{
Notification::fake();

$bill = Bill::create($this->getBillRequest());

Date::setTestNow(Date::now()->subDays($this->addDay));

$this->artisan('reminder:bill');

Notification::assertSentTo(
$this->user,
BillNotification::class,
function ($notification, $channels) use ($bill) {
return $notification->bill->id === $bill->id;
}
);
}

/**
* Copied in InvoicesTest
*
* @param int $recurring
* @return array
*/
private function getBillRequest()
{
$amount = $this->faker->randomFloat(2, 2);

$items = [['name' => $this->faker->text(5), 'item_id' => null, 'quantity' => '1', 'price' => $amount, 'currency' => 'USD']];


$data = [
'vendor_id' => '0',
'billed_at' => $this->faker->date(),
'due_at' => Date::now()->subDays($this->addDay - 1),
'bill_number' => '1',
'order_number' => '1',
'currency_code' => setting('general.default_currency'),
'currency_rate' => '1',
'item' => $items,
'discount' => '0',
'notes' => $this->faker->text(5),
'category_id' => $this->company->categories()->type('income')->first()->id,
'recurring_frequency' => 'no',
'vendor_name' => $this->faker->name,
'vendor_email' => $this->faker->email,
'vendor_tax_number' => null,
'vendor_phone' => null,
'vendor_address' => $this->faker->address,
'bill_status_code' => 'sent',
'amount' => $amount,
'company_id' => $this->company->id,
];


return $data;
}
}
86 changes: 86 additions & 0 deletions tests/Feature/Commands/InvoiceReminderTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?php

namespace Tests\Feature\Commands;

use App\Models\Income\Invoice;
use App\Notifications\Income\Invoice as InvoiceNotification;
use Illuminate\Support\Facades\Notification;
use Jenssegers\Date\Date;
use Tests\Feature\FeatureTestCase;

class InvoiceReminderTest extends FeatureTestCase
{
private $addDay;

protected function setUp()
{
parent::setUp();

$this->addDay = 3;
}

public function testInvoiceReminderByDueDate()
{
Notification::fake();

$invoice = Invoice::create($this->getInvoiceRequest());

Date::setTestNow(Date::now()->addDay($this->addDay));

$this->artisan('reminder:invoice');

Notification::assertSentTo(
$this->user,
InvoiceNotification::class,
function ($notification, $channels) use ($invoice) {
return $notification->invoice->id === $invoice->id;
}
);
}

/**
* Copied in InvoicesTest
*
* @param int $recurring
* @return array
*/
private function getInvoiceRequest($recurring = 0)
{
$amount = $this->faker->randomFloat(2, 2);

$items = [['name' => $this->faker->text(5), 'item_id' => null, 'quantity' => '1', 'price' => $amount, 'currency' => 'USD']];


$data = [
'customer_id' => '0',
'invoiced_at' => $this->faker->date(),
'due_at' => Date::now()->addDay($this->addDay - 1),
'invoice_number' => '1',
'order_number' => '1',
'currency_code' => setting('general.default_currency'),
'currency_rate' => '1',
'item' => $items,
'discount' => '0',
'notes' => $this->faker->text(5),
'category_id' => $this->company->categories()->type('income')->first()->id,
'recurring_frequency' => 'no',
'customer_name' => $this->faker->name,
'customer_email' => $this->faker->email,
'customer_tax_number' => null,
'customer_phone' => null,
'customer_address' => $this->faker->address,
'invoice_status_code' => 'sent',
'amount' => $amount,
'company_id' => $this->company->id,
];

if ($recurring) {
$data['recurring_frequency'] = 'yes';
$data['recurring_interval'] = '1';
$data['recurring_custom_frequency'] = $this->faker->randomElement(['monthly', 'weekly']);
$data['recurring_count'] = '1';
}

return $data;
}
}

0 comments on commit e8821f2

Please sign in to comment.