Skip to content

Commit

Permalink
Merge pull request #6571 from n-stein/fix(#6570)
Browse files Browse the repository at this point in the history
fix(#6570): scheduled transaction fixes
  • Loading branch information
whalley committed Mar 8, 2024
2 parents cdfe950 + eee9e55 commit f81ffb0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
5 changes: 3 additions & 2 deletions src/billsdepositsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,9 @@ void mmBDDialog::CreateControls()
wxBoxSizer* repeatTimesBoxSizer = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer52->Add(repeatTimesBoxSizer);

textNumRepeats_ = new wxTextCtrl(this, ID_DIALOG_BD_TEXTCTRL_NUM_TIMES, ""
, wxDefaultPosition, m_date_due->GetSize(), 0, wxIntegerValidator<int>());
wxIntegerValidator<int> intValidator(nullptr, wxNUM_VAL_ZERO_AS_BLANK);
intValidator.SetMin(0);
textNumRepeats_ = new wxTextCtrl(this, ID_DIALOG_BD_TEXTCTRL_NUM_TIMES, "", wxDefaultPosition, m_date_due->GetSize(), 0, intValidator);
repeatTimesBoxSizer->Add(textNumRepeats_, g_flagsH);
textNumRepeats_->SetMaxLength(12);
setRepeatDetails();
Expand Down
8 changes: 4 additions & 4 deletions src/billsdepositspanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -530,11 +530,11 @@ const wxString mmBillsDepositsPanel::GetFrequency(const Model_Billsdeposits::Dat
const wxString mmBillsDepositsPanel::GetRemainingDays(const Model_Billsdeposits::Data* item) const
{
int repeats = item->REPEATS % BD_REPEATS_MULTIPLEX_BASE; // DeMultiplex the Auto Executable fields.

int daysRemaining = Model_Billsdeposits::TRANSDATE(item)
.Subtract(this->getToday()).GetDays();
.Subtract(this->getToday()).GetSeconds().GetValue() / 86400;
int daysOverdue = Model_Billsdeposits::NEXTOCCURRENCEDATE(item)
.Subtract(this->getToday()).GetDays();
.Subtract(this->getToday()).GetSeconds().GetValue() / 86400;
wxString text = wxString::Format(wxPLURAL("%d day remaining", "%d days remaining", daysRemaining), daysRemaining);

if (daysRemaining == 0)
Expand Down Expand Up @@ -601,7 +601,7 @@ int billsDepositsListCtrl::OnGetItemImage(long item) const
repeats %= BD_REPEATS_MULTIPLEX_BASE;

int daysRemaining = Model_Billsdeposits::NEXTOCCURRENCEDATE(m_bdp->bills_[item])
.Subtract(m_bdp->getToday()).GetDays();
.Subtract(m_bdp->getToday()).GetSeconds().GetValue() / 86400;
wxString daysRemainingStr = wxString::Format(wxPLURAL("%d day remaining", "%d days remaining", daysRemaining), daysRemaining);

if (daysRemaining == 0)
Expand Down
3 changes: 2 additions & 1 deletion src/mmframe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -577,14 +577,15 @@ void mmGUIFrame::OnAutoRepeatTransactionsTimer(wxTimerEvent& /*event*/)
Model_CustomFieldData::instance().ReleaseSavepoint();
}
Model_Billsdeposits::instance().completeBDInSeries(q1.BDID);
createHomePage();
}
}

if (continueExecution)
{
autoRepeatTransactionsTimer_.Start(5, wxTIMER_ONE_SHOT);
}
else
refreshPanelData();
}
//----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/model/Model_Billsdeposits.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ void Model_Billsdeposits::decode_fields(const Data& q1)
}

m_requireExecution = (Model_Billsdeposits::NEXTOCCURRENCEDATE(&q1)
.Subtract(wxDate::Today()).GetDays() < 1);
.Subtract(wxDate::Today()).GetSeconds().GetValue() / 86400 < 1);
}

bool Model_Billsdeposits::autoExecuteManual()
Expand Down

0 comments on commit f81ffb0

Please sign in to comment.