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

changed logic of start time for transaction and submitted time

Browse source
This commit is contained in:
Finn 2018-03-08 16:41:45 +00:00
parent 0dfa3a8aa9
commit 87a03c1e40
11 changed files with 3879 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,13 @@ sub run {
for my $recur_result ( $recur_rs->all ) {
my $start_time = $app->format_iso_date($recur_result->start_time);
my $start_time_dt;
if ( defined $recur_result->last_updated ) {
$start_time_dt = $recur_result->last_updated;
} else {
$start_time_dt = $recur_result->start_time;
}
my $start_time = $app->format_iso_date($start_time_dt);
my $recurring_period = $recur_result->recurring_period;
if ( $recurring_period eq 'daily' ) {
@ -77,7 +83,16 @@ sub run {
return;
}
my $purchase_time = DateTime->now();
my $now = DateTime->now();
my $purchase_time = DateTime->new(
year => $now->year,
month => $now->month,
day => $now->day,
hour => $start_time_dt->hour,
minute => $start_time_dt->minute,
second => $start_time_dt->second,
time_zone => 'UTC',
);
my $category = $recur_result->category_id;
my $essential = $recur_result->essential;
my $distance = $recur_result->distance;
@ -103,7 +118,7 @@ sub run {
});
}
$recur_result->update({ start_time => $purchase_time });
$recur_result->update({ last_updated => $purchase_time });
}
}

2
lib/Pear/LocalLoop/Schema.pm
View file

@ -6,7 +6,7 @@ use warnings;
use base 'DBIx::Class::Schema';
our $VERSION = 32;
our $VERSION = 33;
__PACKAGE__->load_namespaces;

6
lib/Pear/LocalLoop/Schema/Result/TransactionRecurring.pm
View file

@ -37,12 +37,12 @@ __PACKAGE__->add_columns(
data_type => "datetime",
timezone => "UTC",
is_nullable => 0,
set_on_create => 1,
},
"last_updated" => {
data_type => "datetime",
is_nullable => 0,
set_on_create => 1,
timezone => "UTC",
is_nullable => 1,
datetime_undef_if_invalid => 1,
},
"essential" => {
data_type => "boolean",