Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 21:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for recurring expense payment dates

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/RecurringExpenseToExpenseFactory.php
View File

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

7
app/Http/Controllers/DocumentController.php
View File

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

4
app/Http/Requests/Document/UpdateDocumentRequest.php
View File

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

7
app/Jobs/Cron/RecurringExpensesCron.php
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) private function generateExpense(RecurringExpense $recurring_expense)
{ {
$expense = RecurringExpenseToExpenseFactory::create($recurring_expense); $expense = RecurringExpenseToExpenseFactory::create($recurring_expense);
$expense->save(); $expense->saveQuietly();
$expense->number = $this->getNextExpenseNumber($expense); $expense->number = $this->getNextExpenseNumber($expense);
$expense->save(); $expense->save();

2
app/Transformers/AccountTransformer.php
View File

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