Fixes for recurring expense payment dates

This commit is contained in:
David Bomba 2023-05-18 09:19:01 +10:00
parent 9bd1946bc4
commit dd59cb6de6
5 changed files with 12 additions and 10 deletions

View File

@ -40,7 +40,7 @@ class RecurringExpenseToExpenseFactory
$expense->tax_name3 = $recurring_expense->tax_name3;
$expense->tax_rate3 = $recurring_expense->tax_rate3;
$expense->date = now()->format('Y-m-d');
$expense->payment_date = $recurring_expense->payment_date;
$expense->payment_date = $recurring_expense->payment_date ?: now()->format('Y-m-d');
$expense->amount = $recurring_expense->amount;
$expense->foreign_amount = $recurring_expense->foreign_amount ?: 0;

View File

@ -145,8 +145,11 @@ class DocumentController extends BaseController
* @return Response
*/
public function update(UpdateDocumentRequest $request, Document $document)
{
return $this->itemResponse($document);
{
$document->fill($request->all());
$document->save();
return $this->itemResponse($document->fresh());
}
/**

View File

@ -30,7 +30,9 @@ class UpdateDocumentRequest extends Request
public function rules()
{
return [];
return [
'name' => 'sometimes|alpha_num'
];
}
public function prepareForValidation()

View File

@ -98,15 +98,10 @@ class RecurringExpensesCron
}
}
private function getRecurringExpenses()
{
//extracting this back to the if/else block to test duplicate crons
}
private function generateExpense(RecurringExpense $recurring_expense)
{
$expense = RecurringExpenseToExpenseFactory::create($recurring_expense);
$expense->save();
$expense->saveQuietly();
$expense->number = $this->getNextExpenseNumber($expense);
$expense->save();

View File

@ -90,6 +90,8 @@ class AccountTransformer extends EntityTransformer
'set_react_as_default_ap' => (bool) $account->set_react_as_default_ap,
'trial_days_left' => Ninja::isHosted() ? (int) $account->getTrialDays() : 0,
'account_sms_verified' => (bool) $account->account_sms_verified,
'has_iap_plan' => (bool)$account->inapp_transaction_id,
];
}