diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index 9f2ae4dfcd..259dd675ab 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -34,7 +34,7 @@ use Crypt; */ final class Entry { - //@formatter:off + // @formatter:off public $journal_id; public $date; public $description; @@ -55,7 +55,7 @@ final class Entry public $budget_name; public $category_id; public $category_name; - //@formatter:on + // @formatter:on /** * Entry constructor. diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index dd7b6631cc..f086a4b19b 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -311,20 +311,6 @@ class BillRepository implements BillRepositoryInterface return $paginator; } - /** - * Get all journals that were recorded on this bill between these dates. - * - * @param Bill $bill - * @param Carbon $start - * @param Carbon $end - * - * @return Collection - */ - public function getJournalsInRange(Bill $bill, Carbon $start, Carbon $end): Collection - { - return $bill->transactionJournals()->before($end)->after($start)->get(); - } - /** * @param Bill $bill * @@ -466,21 +452,6 @@ class BillRepository implements BillRepositoryInterface return $avg; } - /** - * @param Bill $bill - * - * @return \Carbon\Carbon - */ - public function lastFoundMatch(Bill $bill): Carbon - { - $last = $bill->transactionJournals()->orderBy('date', 'DESC')->first(); - if ($last) { - return $last->date; - } - - return Carbon::now()->addDays(2); // in the future! - } - /** * Given a bill and a date, this method will tell you at which moment this bill expects its next * transaction. Whether or not it is there already, is not relevant. diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 4c70efc871..26e5f22aef 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -113,17 +113,6 @@ interface BillRepositoryInterface */ public function getJournals(Bill $bill, int $page, int $pageSize = 50): LengthAwarePaginator; - /** - * Get all journals that were recorded on this bill between these dates. - * - * @param Bill $bill - * @param Carbon $start - * @param Carbon $end - * - * @return Collection - */ - public function getJournalsInRange(Bill $bill, Carbon $start, Carbon $end): Collection; - /** * @param Bill $bill * @@ -166,14 +155,6 @@ interface BillRepositoryInterface */ public function getYearAverage(Bill $bill, Carbon $date): string; - /** - * @param Bill $bill - * - * @return \Carbon\Carbon - */ - public function lastFoundMatch(Bill $bill): Carbon; - - /** * Given a bill and a date, this method will tell you at which moment this bill expects its next * transaction. Whether or not it is there already, is not relevant. diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index c5a986c6cd..5e3cc55a51 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -73,6 +73,7 @@ return [ 'field_supports_markdown' => 'This field supports Markdown.', // repeat frequencies: + 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', 'weekly' => 'weekly', 'quarterly' => 'quarterly',