Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 12:42:36 +01:00
Code Issues Releases Activity

Fixes for documentation

Browse Source
This commit is contained in:
David Bomba 2020-11-23 22:04:58 +11:00
parent 53e40a4e6a
commit 9ccfc96055
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,6 +11,8 @@
/resources/assets/bower /resources/assets/bower
/storage/*.key /storage/*.key
/storage/documents /storage/documents
/storage/import
/storage/migrations
/bootstrap/compiled.php /bootstrap/compiled.php
/bootstrap/environment.php /bootstrap/environment.php
/vendor /vendor

2
app/Console/Commands/ExportMigrations.php
View File

@ -68,7 +68,7 @@ class ExportMigrations extends Command
$fileName = "{$accountKey}-{$date}-invoiceninja"; $fileName = "{$accountKey}-{$date}-invoiceninja";
$data = [ $data['data'] = [
'company' => $this->getCompany(), 'company' => $this->getCompany(),
'users' => $this->getUsers(), 'users' => $this->getUsers(),
'tax_rates' => $this->getTaxRates(), 'tax_rates' => $this->getTaxRates(),

10
app/Traits/GenerateMigrationResources.php
View File

@ -879,7 +879,7 @@ trait GenerateMigrationResources
'invitation_id' => $payment->invitation_id, 'invitation_id' => $payment->invitation_id,
'company_gateway_id' => $payment->account_gateway_id, 'company_gateway_id' => $payment->account_gateway_id,
'type_id' => $payment->payment_type_id, 'type_id' => $payment->payment_type_id,
'status_id' => $payment->payment_status_id, 'status_id' => $this->transformPaymentStatus($payment),
'amount' => $payment->amount ?: 0, 'amount' => $payment->amount ?: 0,
'applied' => $payment->amount ?: 0, 'applied' => $payment->amount ?: 0,
'refunded' => $payment->refunded ?: 0, 'refunded' => $payment->refunded ?: 0,
@ -899,6 +899,14 @@ trait GenerateMigrationResources
return $transformed; return $transformed;
} }
private function transformPaymentStatus($payment)
{
if($payment->is_deleted && $payment->payment_status_id == 4)
return 2;
return $payment->payment_status_id;
}
private function getCredits() private function getCredits()
{ {
$credits = Credit::where('account_id', $this->account->id)->where('balance', '>', 0)->whereIsDeleted(false) $credits = Credit::where('account_id', $this->account->id)->where('balance', '>', 0)->whereIsDeleted(false)

2
docs/index.rst
View File

@ -1,4 +1,4 @@
Invoice Ninja User Guide Invoice Ninja V4.x User Guide. For Version 5.x documentation, please go to <a href="https://invoiceninja.github.io">invoiceninja.github.io</a>
======================== ========================
Want to find out everything there is to know about how to use your Invoice Ninja account? Look no further than our User Guide, where you’ll learn all about creating and sending invoices, receiving payments, creating tasks, converting quotes to invoices, recurring invoices, entering credits and much, much more. Want to find out everything there is to know about how to use your Invoice Ninja account? Look no further than our User Guide, where you’ll learn all about creating and sending invoices, receiving payments, creating tasks, converting quotes to invoices, recurring invoices, entering credits and much, much more.

2
storage/import/.gitignore vendored Executable file → Normal file
View File

@ -1,2 +0,0 @@
*
!.gitignore

2
storage/migrations/.gitignore vendored
View File

@ -1,2 +0,0 @@
*
!.gitignore