Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for carbon types

Browse Source
This commit is contained in:
David Bomba 2020-11-22 16:42:12 +11:00
parent eb6cddeb08
commit 52d15bc388
1 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
app/Traits/GenerateMigrationResources.php
View File

@ -150,9 +150,9 @@ trait GenerateMigrationResources
'rate' => $rate->rate, 'rate' => $rate->rate,
'company_id' => $rate->account_id, 'company_id' => $rate->account_id,
'user_id' => $rate->user_id, 'user_id' => $rate->user_id,
'created_at' => $rate->created_at ? $rate->created_at->toDateString() : null, 'created_at' => $rate->created_at ? Carbon::parse($rate->created_at)->toDateString() : null,
'updated_at' => $rate->updated_at ? $rate->updated_at->toDateString() : null, 'updated_at' => $rate->updated_at ? Carbon::parse($rate->updated_at)->toDateString() : null,
'deleted_at' => $rate->deleted_at ? $rate->deleted_at->toDateString() : null, 'deleted_at' => $rate->deleted_at ? Carbon::parse($rate->deleted_at)->toDateString() : null,
]; ];
} }
@ -195,6 +195,9 @@ trait GenerateMigrationResources
'shipping_country_id' => $client->shipping_country_id, 'shipping_country_id' => $client->shipping_country_id,
'contacts' => $this->getClientContacts($client->contacts), 'contacts' => $this->getClientContacts($client->contacts),
'settings' => $this->getClientSettings($client), 'settings' => $this->getClientSettings($client),
'created_at' => $client->created_at ? Carbon::parse($client->created_at)->toDateString() : null,
'updated_at' => $client->updated_at ? Carbon::parse($client->updated_at)->toDateString() : null,
'deleted_at' => $client->deleted_at ? Carbon::parse($client->deleted_at)->toDateString() : null,
]; ];
} }
@ -237,6 +240,9 @@ trait GenerateMigrationResources
'password' => $contact->password, 'password' => $contact->password,
'remember_token' => $contact->remember_token, 'remember_token' => $contact->remember_token,
'contact_key' => $contact->contact_key, 'contact_key' => $contact->contact_key,
'created_at' => $contact->created_at ? Carbon::parse($contact->created_at)->toDateString() : null,
'updated_at' => $contact->updated_at ? Carbon::parse($contact->updated_at)->toDateString() : null,
'deleted_at' => $contact->deleted_at ? Carbon::parse($contact->deleted_at)->toDateString() : null,
]; ];
} }
@ -265,9 +271,9 @@ trait GenerateMigrationResources
'tax_name2' => $product->tax_name2, 'tax_name2' => $product->tax_name2,
'tax_rate1' => $product->tax_rate1, 'tax_rate1' => $product->tax_rate1,
'tax_rate2' => $product->tax_rate2, 'tax_rate2' => $product->tax_rate2,
'created_at' => $product->created_at ? $product->created_at->toDateString() : null, 'created_at' => $product->created_at ? Carbon::parse($product->created_at)->toDateString() : null,
'updated_at' => $product->updated_at ? $product->updated_at->toDateString() : null, 'updated_at' => $product->updated_at ? Carbon::parse($product->updated_at)->toDateString() : null,
'deleted_at' => $product->deleted_at ? $product->deleted_at->toDateString() : null, 'deleted_at' => $product->deleted_at ? Carbon::parse($product->deleted_at)->toDateString() : null,
]; ];
} }
@ -298,9 +304,9 @@ trait GenerateMigrationResources
'accepted_terms_version' => $user->accepted_terms_version, 'accepted_terms_version' => $user->accepted_terms_version,
'password' => $user->password, 'password' => $user->password,
'remember_token' => $user->remember_token, 'remember_token' => $user->remember_token,
'created_at' => $user->created_at ? $user->created_at->toDateString() : null, 'created_at' => $user->created_at ? Carbon::parse($user->created_at)->toDateString() : null,
'updated_at' => $user->updated_at ? $user->updated_at->toDateString() : null, 'updated_at' => $user->updated_at ? Carbon::parse($user->updated_at)->toDateString() : null,
'deleted_at' => $user->deleted_at ? $user->deleted_at->toDateString() : null, 'deleted_at' => $user->deleted_at ? Carbon::parse($user->deleted_at)->toDateString() : null,
'company_user' => [], 'company_user' => [],
]; ];
} }
@ -353,9 +359,9 @@ trait GenerateMigrationResources
'partial' => $credit->partial ?: 0, 'partial' => $credit->partial ?: 0,
'partial_due_date' => $credit->partial_due_date, 'partial_due_date' => $credit->partial_due_date,
'line_items' => $this->getInvoiceItems($credit->invoice_items), 'line_items' => $this->getInvoiceItems($credit->invoice_items),
'created_at' => $credit->created_at ? $credit->created_at->toDateString() : null, 'created_at' => $credit->created_at ? Carbon::parse($credit->created_at)->toDateString() : null,
'updated_at' => $credit->updated_at ? $credit->updated_at->toDateString() : null, 'updated_at' => $credit->updated_at ? Carbon::parse($credit->updated_at)->toDateString() : null,
'deleted_at' => $credit->deleted_at ? $credit->deleted_at->toDateString() : null, 'deleted_at' => $credit->deleted_at ? Carbon::parse($credit->deleted_at)->toDateString() : null,
]; ];
} }
@ -368,8 +374,8 @@ trait GenerateMigrationResources
$invoices = []; $invoices = [];
$export_invoices = Invoice::where('account_id', $this->account->id) $export_invoices = Invoice::where('account_id', $this->account->id)
->where('amount', '>=', '0') ->where('amount', '>=', 0)
->where('invoice_type_id', '=', INVOICE_TYPE_STANDARD) ->where('invoice_type_id', INVOICE_TYPE_STANDARD)
->where('is_recurring', false) ->where('is_recurring', false)
->withTrashed() ->withTrashed()
->get(); ->get();
@ -380,7 +386,7 @@ trait GenerateMigrationResources
'client_id' => $invoice->client_id, 'client_id' => $invoice->client_id,
'user_id' => $invoice->user_id, 'user_id' => $invoice->user_id,
'company_id' => $invoice->account_id, 'company_id' => $invoice->account_id,
'status_id' => $this->transformStatusId($invoice->invoice_status_id), 'status_id' => $this->transformStatusId($invoice->invoice_status_id, $invoice->is_public),
'design_id' => $this->getDesignId($invoice->invoice_design_id), 'design_id' => $this->getDesignId($invoice->invoice_design_id),
'number' => $invoice->invoice_number, 'number' => $invoice->invoice_number,
'discount' => $invoice->discount, 'discount' => $invoice->discount,
@ -407,9 +413,9 @@ trait GenerateMigrationResources
'partial' => $invoice->partial ?: 0, 'partial' => $invoice->partial ?: 0,
'partial_due_date' => $invoice->partial_due_date, 'partial_due_date' => $invoice->partial_due_date,
'line_items' => $this->getInvoiceItems($invoice->invoice_items), 'line_items' => $this->getInvoiceItems($invoice->invoice_items),
'created_at' => $invoice->created_at ? $invoice->created_at->toDateString() : null, 'created_at' => $invoice->created_at ? Carbon::parse($invoice->created_at)->toDateString() : null,
'updated_at' => $invoice->updated_at ? $invoice->updated_at->toDateString() : null, 'updated_at' => $invoice->updated_at ? Carbon::parse($invoice->updated_at)->toDateString() : null,
'deleted_at' => $invoice->deleted_at ? $invoice->deleted_at->toDateString() : null, 'deleted_at' => $invoice->deleted_at ? Carbon::parse($invoice->deleted_at)->toDateString() : null,
//'invitations' => $this->getResourceInvitations($invoice->invitations, 'invoice_id'), //'invitations' => $this->getResourceInvitations($invoice->invitations, 'invoice_id'),
]; ];
} }
@ -431,7 +437,7 @@ trait GenerateMigrationResources
$invoices = []; $invoices = [];
$export_invoices = Invoice::where('account_id', $this->account->id) $export_invoices = Invoice::where('account_id', $this->account->id)
->where('amount', '>=', '0') ->where('amount', '>=', 0)
->where('is_recurring', true) ->where('is_recurring', true)
->withTrashed() ->withTrashed()
->get(); ->get();
@ -472,9 +478,9 @@ trait GenerateMigrationResources
'partial' => $invoice->partial ?: 0, 'partial' => $invoice->partial ?: 0,
'partial_due_date' => $invoice->partial_due_date, 'partial_due_date' => $invoice->partial_due_date,
'line_items' => $this->getInvoiceItems($invoice->invoice_items), 'line_items' => $this->getInvoiceItems($invoice->invoice_items),
'created_at' => $invoice->created_at ? $invoice->created_at->toDateString() : null, 'created_at' => $invoice->created_at ? Carbon::parse($invoice->created_at)->toDateString() : null,
'updated_at' => $invoice->updated_at ? $invoice->updated_at->toDateString() : null, 'updated_at' => $invoice->updated_at ? Carbon::parse($invoice->updated_at)->toDateString() : null,
'deleted_at' => $invoice->deleted_at ? $invoice->deleted_at->toDateString() : null, 'deleted_at' => $invoice->deleted_at ? Carbon::parse($invoice->deleted_at)->toDateString() : null,
'next_send_date' => $this->getNextSendDateForMigration($invoice), 'next_send_date' => $this->getNextSendDateForMigration($invoice),
'frequency_id' => $this->transformFrequencyId($invoice), 'frequency_id' => $this->transformFrequencyId($invoice),
'due_date_days' => $this->transformDueDate($invoice), 'due_date_days' => $this->transformDueDate($invoice),
@ -687,11 +693,14 @@ trait GenerateMigrationResources
const STATUS_CANCELLED = 5; const STATUS_CANCELLED = 5;
const STATUS_REVERSED = 6; const STATUS_REVERSED = 6;
*/ */
private function transformStatusId($status) private function transformStatusId($status, $is_public)
{ {
if(!$is_public)
return 1;
switch ($status) { switch ($status) {
case 1: case 1:
return 1; return 2;
break; break;
case 2: case 2:
return 2; return 2;
@ -734,9 +743,9 @@ trait GenerateMigrationResources
'sent_date' => $invitation->sent_date, 'sent_date' => $invitation->sent_date,
'viewed_date' => $invitation->viewed_date, 'viewed_date' => $invitation->viewed_date,
'opened_date' => $invitation->opened_date, 'opened_date' => $invitation->opened_date,
'created_at' => $invitation->created_at ? $invitation->created_at->toDateString() : null, 'created_at' => $invitation->created_at ? Carbon::parse($invitation->created_at)->toDateString() : null,
'updated_at' => $invitation->updated_at ? $invitation->updated_at->toDateString() : null, 'updated_at' => $invitation->updated_at ? Carbon::parse($invitation->updated_at)->toDateString() : null,
'deleted_at' => $invitation->deleted_at ? $invitation->deleted_at->toDateString() : null, 'deleted_at' => $invitation->deleted_at ? Carbon::parse($invitation->deleted_at)->toDateString() : null,
]; ];
} }
@ -776,7 +785,7 @@ trait GenerateMigrationResources
$transformed = []; $transformed = [];
$quotes = Invoice::where('account_id', $this->account->id) $quotes = Invoice::where('account_id', $this->account->id)
->where('invoice_type_id', '=', INVOICE_TYPE_QUOTE) ->where('invoice_type_id', INVOICE_TYPE_QUOTE)
->withTrashed() ->withTrashed()
->get(); ->get();
@ -813,9 +822,9 @@ trait GenerateMigrationResources
'partial' => $quote->partial ?: 0, 'partial' => $quote->partial ?: 0,
'partial_due_date' => $quote->partial_due_date, 'partial_due_date' => $quote->partial_due_date,
'line_items' => $this->getInvoiceItems($quote->invoice_items), 'line_items' => $this->getInvoiceItems($quote->invoice_items),
'created_at' => $quote->created_at ? $quote->created_at->toDateString() : null, 'created_at' => $quote->created_at ? Carbon::parse($quote->created_at)->toDateString() : null,
'updated_at' => $quote->updated_at ? $quote->updated_at->toDateString() : null, 'updated_at' => $quote->updated_at ? Carbon::parse($quote->updated_at)->toDateString() : null,
'deleted_at' => $quote->deleted_at ? $quote->deleted_at->toDateString() : null, 'deleted_at' => $quote->deleted_at ? Carbon::parse($quote->deleted_at)->toDateString() : null,
//'invitations' => $this->getResourceInvitations($quote->invitations, 'quote_id'), //'invitations' => $this->getResourceInvitations($quote->invitations, 'quote_id'),
]; ];
} }
@ -881,9 +890,9 @@ trait GenerateMigrationResources
'exchange_rate' => $payment->exchange_rate ? number_format((float) $payment->exchange_rate, 6) : null, 'exchange_rate' => $payment->exchange_rate ? number_format((float) $payment->exchange_rate, 6) : null,
'exchange_currency_id' => $payment->exchange_currency_id, 'exchange_currency_id' => $payment->exchange_currency_id,
'currency_id' => isset($payment->client->currency->id) ? $payment->client->currency->id : $this->account->currency_id, 'currency_id' => isset($payment->client->currency->id) ? $payment->client->currency->id : $this->account->currency_id,
'updated_at' => $payment->updated_at ? $payment->updated_at->toDateString() : null, 'updated_at' => $payment->updated_at ? Carbon::parse($payment->updated_at)->toDateString() : null,
'created_at' => $payment->created_at ? $payment->created_at->toDateString() : null, 'created_at' => $payment->created_at ? Carbon::parse($payment->created_at)->toDateString() : null,
'deleted_at' => $payment->deleted_at ? $payment->deleted_at->toDateString() : null, 'deleted_at' => $payment->deleted_at ? Carbon::parse($payment->deleted_at)->toDateString() : null,
]; ];
} }
@ -892,7 +901,7 @@ trait GenerateMigrationResources
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)
->withTrashed() ->withTrashed()
->get(); ->get();
@ -908,9 +917,9 @@ trait GenerateMigrationResources
'applied' => 0, 'applied' => 0,
'refunded' => 0, 'refunded' => 0,
'date' => $credit->date, 'date' => $credit->date,
'created_at' => $credit->created_at ? $credit->created_at->toDateString() : null, 'created_at' => $credit->created_at ? Carbon::parse($credit->created_at)->toDateString() : null,
'updated_at' => $credit->updated_at ? $credit->updated_at->toDateString() : null, 'updated_at' => $credit->updated_at ? Carbon::parse($credit->updated_at)->toDateString() : null,
'deleted_at' => $credit->deleted_at ? $credit->deleted_at->toDateString() : null, 'deleted_at' => $credit->deleted_at ? Carbon::parse($credit->deleted_at)->toDateString() : null,
]; ];
} }
@ -939,8 +948,8 @@ trait GenerateMigrationResources
'size' => $document->size, 'size' => $document->size,
'width' => $document->width, 'width' => $document->width,
'height' => $document->height, 'height' => $document->height,
'created_at' => $document->created_at ? $document->created_at->toDateString() : null, 'created_at' => $document->created_at ? Carbon::parse($document->created_at)->toDateString() : null,
'updated_at' => $document->updated_at ? $document->updated_at->toDateString() : null, 'updated_at' => $document->updated_at ? Carbon::parse($document->updated_at)->toDateString() : null,
]; ];
} }
@ -1030,9 +1039,9 @@ trait GenerateMigrationResources
'company_id' => $this->account->id, 'company_id' => $this->account->id,
'num_days' => $payment_term->num_days, 'num_days' => $payment_term->num_days,
'is_deleted' => $payment_term->is_deleted, 'is_deleted' => $payment_term->is_deleted,
'created_at' => $payment_term->created_at ? $payment_term->created_at->toDateString() : null, 'created_at' => $payment_term->created_at ? Carbon::parse($payment_term->created_at)->toDateString() : null,
'updated_at' => $payment_term->updated_at ? $payment_term->updated_at->toDateString() : null, 'updated_at' => $payment_term->updated_at ? Carbon::parse($payment_term->updated_at)->toDateString() : null,
'deleted_at' => $payment_term->deleted_at ? $payment_term->deleted_at->toDateString() : null, 'deleted_at' => $payment_term->deleted_at ? Carbon::parse($payment_term->deleted_at)->toDateString() : null,
]; ];
} }
@ -1075,9 +1084,9 @@ trait GenerateMigrationResources
'user_id' => $task_status->user_id, 'user_id' => $task_status->user_id,
'status_sort_order' => $task_status->sort_order, 'status_sort_order' => $task_status->sort_order,
'is_deleted' => false, 'is_deleted' => false,
'created_at' => $task_status->created_at ? $task_status->created_at->toDateString() : null, 'created_at' => $task_status->created_at ? Carbon::parse($task_status->created_at)->toDateString() : null,
'updated_at' => $task_status->updated_at ? $task_status->updated_at->toDateString() : null, 'updated_at' => $task_status->updated_at ? Carbon::parse($task_status->updated_at)->toDateString() : null,
'deleted_at' => $task_status->deleted_at ? $task_status->deleted_at->toDateString() : null, 'deleted_at' => $task_status->deleted_at ? Carbon::parse($task_status->deleted_at)->toDateString() : null,
]; ];
} }
@ -1099,9 +1108,9 @@ trait GenerateMigrationResources
'id' => $category->id, 'id' => $category->id,
'user_id' => $category->user_id, 'user_id' => $category->user_id,
'is_deleted' => $category->is_deleted, 'is_deleted' => $category->is_deleted,
'created_at' => $category->created_at ? $category->created_at->toDateString() : null, 'created_at' => $category->created_at ? Carbon::parse($category->created_at)->toDateString() : null,
'updated_at' => $category->updated_at ? $category->updated_at->toDateString() : null, 'updated_at' => $category->updated_at ? Carbon::parse($category->updated_at)->toDateString() : null,
'deleted_at' => $category->deleted_at ? $category->deleted_at->toDateString() : null, 'deleted_at' => $category->deleted_at ? Carbon::parse($category->deleted_at)->toDateString() : null,
]; ];
} }
@ -1151,9 +1160,9 @@ trait GenerateMigrationResources
'transaction_reference' => $expense->transaction_reference, 'transaction_reference' => $expense->transaction_reference,
'vendor_id' => $expense->vendor_id, 'vendor_id' => $expense->vendor_id,
'is_deleted' => $expense->is_deleted, 'is_deleted' => $expense->is_deleted,
'created_at' => $expense->created_at ? $expense->created_at->toDateString() : null, 'created_at' => $expense->created_at ? Carbon::parse($expense->created_at)->toDateString() : null,
'updated_at' => $expense->updated_at ? $expense->updated_at->toDateString() : null, 'updated_at' => $expense->updated_at ? Carbon::parse($expense->updated_at)->toDateString() : null,
'deleted_at' => $expense->deleted_at ? $expense->deleted_at->toDateString() : null, 'deleted_at' => $expense->deleted_at ? Carbon::parse($expense->deleted_at)->toDateString() : null,
]; ];
} }
@ -1193,9 +1202,9 @@ trait GenerateMigrationResources
'time_log' => $task->time_log, 'time_log' => $task->time_log,
'user_id' => $task->user_id, 'user_id' => $task->user_id,
'is_deleted' => $task->is_deleted, 'is_deleted' => $task->is_deleted,
'created_at' => $task->created_at ? $task->created_at->toDateString() : null, 'created_at' => $task->created_at ? Carbon::parse($task->created_at)->toDateString() : null,
'updated_at' => $task->updated_at ? $task->updated_at->toDateString() : null, 'updated_at' => $task->updated_at ? Carbon::parse($task->updated_at)->toDateString() : null,
'deleted_at' => $task->deleted_at ? $task->deleted_at->toDateString() : null, 'deleted_at' => $task->deleted_at ? Carbon::parse($task->deleted_at)->toDateString() : null,
]; ];
} }
@ -1232,9 +1241,9 @@ trait GenerateMigrationResources
'task_rate' => $project->task_rate, 'task_rate' => $project->task_rate,
'user_id' => $project->user_id, 'user_id' => $project->user_id,
'is_deleted' => $project->is_deleted, 'is_deleted' => $project->is_deleted,
'created_at' => $project->created_at ? $project->created_at->toDateString() : null, 'created_at' => $project->created_at ? Carbon::parse($project->created_at)->toDateString() : null,
'updated_at' => $project->updated_at ? $project->updated_at->toDateString() : null, 'updated_at' => $project->updated_at ? Carbon::parse($project->updated_at)->toDateString() : null,
'deleted_at' => $project->deleted_at ? $project->deleted_at->toDateString() : null, 'deleted_at' => $project->deleted_at ? Carbon::parse($project->deleted_at)->toDateString() : null,
]; ];
} }
@ -1276,6 +1285,9 @@ trait GenerateMigrationResources
'custom_value4' => '', 'custom_value4' => '',
'transaction_name' => '', 'transaction_name' => '',
'contacts' => $this->getVendorContacts($vendor->vendor_contacts), 'contacts' => $this->getVendorContacts($vendor->vendor_contacts),
'created_at' => $vendor->created_at ? Carbon::parse($vendor->created_at)->toDateString() : null,
'updated_at' => $vendor->updated_at ? Carbon::parse($vendor->updated_at)->toDateString() : null,
'deleted_at' => $vendor->deleted_at ? Carbon::parse($vendor->deleted_at)->toDateString() : null,
]; ];
} }
@ -1309,6 +1321,9 @@ trait GenerateMigrationResources
'password' => $contact->password ?: '', 'password' => $contact->password ?: '',
'is_locked' => false, 'is_locked' => false,
'confirmed' => true, 'confirmed' => true,
'created_at' => $contact->created_at ? Carbon::parse($contact->created_at)->toDateString() : null,
'updated_at' => $contact->updated_at ? Carbon::parse($contact->updated_at)->toDateString() : null,
'deleted_at' => $contact->deleted_at ? Carbon::parse($contact->deleted_at)->toDateString() : null,
// 'remember_token' => $contact->remember_token, // 'remember_token' => $contact->remember_token,
// 'contact_key' => $contact->contact_key, // 'contact_key' => $contact->contact_key,
]; ];