Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #118 from Pear-Trading/Release-v0.10.8

Browse source 
Release v0.10.8
This commit is contained in:
Tom Bloor 2018-05-24 13:32:16 +01:00 committed by GitHub
commit a088ab0738
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -2,7 +2,11 @@
# Next Release # Next Release
# v.10.7 # v0.10.8
* Added yearly recurring payments
# v0.10.7
* Added `cron_daily` script for holding all daily cronjobs * Added `cron_daily` script for holding all daily cronjobs
* **Admin Fix** Parse currency without a currency symbol on import * **Admin Fix** Parse currency without a currency symbol on import

4
lib/Pear/LocalLoop/Command/recur_transactions.pm
View file

@ -47,6 +47,7 @@ sub run {
my $match_date_fortnight = $app->format_iso_date($datetime->clone->subtract( weeks => 2 )); my $match_date_fortnight = $app->format_iso_date($datetime->clone->subtract( weeks => 2 ));
my $match_date_month = $app->format_iso_date($datetime->clone->subtract( months => 1 )); my $match_date_month = $app->format_iso_date($datetime->clone->subtract( months => 1 ));
my $match_date_quarter = $app->format_iso_date($datetime->clone->subtract( months => 3)); my $match_date_quarter = $app->format_iso_date($datetime->clone->subtract( months => 3));
my $match_date_year = $app->format_iso_date($datetime->clone->subtract( years => 1 ));
my $schema = $app->schema; my $schema = $app->schema;
my $dtf = $schema->storage->datetime_parser; my $dtf = $schema->storage->datetime_parser;
@ -78,6 +79,9 @@ sub run {
} elsif ( $recurring_period eq 'quarterly' ) { } elsif ( $recurring_period eq 'quarterly' ) {
next unless $start_time eq $match_date_quarter; next unless $start_time eq $match_date_quarter;
say "matched recurring transaction ID " . $recur_result->id . " to quarterly"; say "matched recurring transaction ID " . $recur_result->id . " to quarterly";
} elsif ( $recurring_period eq 'yearly' ) {
next unless $start_time eq $match_date_year;
say "matched recurring transaction ID " . $recur_result->id . " to yearly";
} else { } else {
say "Invalid recurring time period given"; say "Invalid recurring time period given";
return; return;