mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Fixes for migrations including implementing migrations for payment terms
This commit is contained in:
parent
5fdb21cbf9
commit
5a8148c09f
@ -213,6 +213,7 @@ class StepsController extends BaseController
|
|||||||
'company' => $this->getCompany(),
|
'company' => $this->getCompany(),
|
||||||
'users' => $this->getUsers(),
|
'users' => $this->getUsers(),
|
||||||
'tax_rates' => $this->getTaxRates(),
|
'tax_rates' => $this->getTaxRates(),
|
||||||
|
'payment_terms' => $this->getPaymentTerms(),
|
||||||
'clients' => $this->getClients(),
|
'clients' => $this->getClients(),
|
||||||
'products' => $this->getProducts(),
|
'products' => $this->getProducts(),
|
||||||
'invoices' => $this->getInvoices(),
|
'invoices' => $this->getInvoices(),
|
||||||
|
@ -11,6 +11,7 @@ use App\Models\Document;
|
|||||||
use App\Models\Invoice;
|
use App\Models\Invoice;
|
||||||
use App\Models\Payment;
|
use App\Models\Payment;
|
||||||
use App\Models\PaymentMethod;
|
use App\Models\PaymentMethod;
|
||||||
|
use App\Models\PaymentTerm;
|
||||||
use App\Models\Product;
|
use App\Models\Product;
|
||||||
use App\Models\TaxRate;
|
use App\Models\TaxRate;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
@ -220,7 +221,7 @@ trait GenerateMigrationResources
|
|||||||
'custom_value2' => $contact->custom_value2,
|
'custom_value2' => $contact->custom_value2,
|
||||||
'email' => $contact->email,
|
'email' => $contact->email,
|
||||||
'is_primary' => $contact->is_primary,
|
'is_primary' => $contact->is_primary,
|
||||||
'send_invoice' => $contact->send_invoice,
|
'send_email' => $contact->send_invoice,
|
||||||
'confirmed' => $contact->confirmation_token ? true : false,
|
'confirmed' => $contact->confirmation_token ? true : false,
|
||||||
'last_login' => $contact->last_login,
|
'last_login' => $contact->last_login,
|
||||||
'password' => $contact->password,
|
'password' => $contact->password,
|
||||||
@ -365,7 +366,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' => $invoice->invoice_status_id,
|
'status_id' => $this->transformStatusId($invoice->invoice_status_id),
|
||||||
'design_id' => $invoice->invoice_design_id,
|
'design_id' => $invoice->invoice_design_id,
|
||||||
'number' => $invoice->invoice_number,
|
'number' => $invoice->invoice_number,
|
||||||
'discount' => $invoice->discount,
|
'discount' => $invoice->discount,
|
||||||
@ -402,6 +403,50 @@ trait GenerateMigrationResources
|
|||||||
return $invoices;
|
return $invoices;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
define('INVOICE_STATUS_DRAFT', 1);
|
||||||
|
define('INVOICE_STATUS_SENT', 2);
|
||||||
|
define('INVOICE_STATUS_VIEWED', 3);
|
||||||
|
define('INVOICE_STATUS_APPROVED', 4);
|
||||||
|
define('INVOICE_STATUS_PARTIAL', 5);
|
||||||
|
define('INVOICE_STATUS_PAID', 6);
|
||||||
|
define('INVOICE_STATUS_OVERDUE', -1);
|
||||||
|
define('INVOICE_STATUS_UNPAID', -2);
|
||||||
|
|
||||||
|
const STATUS_DRAFT = 1;
|
||||||
|
const STATUS_SENT = 2;
|
||||||
|
const STATUS_PARTIAL = 3;
|
||||||
|
const STATUS_PAID = 4;
|
||||||
|
const STATUS_CANCELLED = 5;
|
||||||
|
const STATUS_REVERSED = 6;
|
||||||
|
*/
|
||||||
|
private function transformStatusId($status)
|
||||||
|
{
|
||||||
|
switch ($status) {
|
||||||
|
case 1:
|
||||||
|
return 1;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
return 3;
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
return 4;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function getResourceInvitations($items, $resourceKeyId)
|
public function getResourceInvitations($items, $resourceKeyId)
|
||||||
{
|
{
|
||||||
$transformed = [];
|
$transformed = [];
|
||||||
@ -507,6 +552,31 @@ trait GenerateMigrationResources
|
|||||||
return $transformed;
|
return $transformed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
const STATUS_DRAFT = 1;
|
||||||
|
const STATUS_SENT = 2;
|
||||||
|
const STATUS_APPROVED = 3;
|
||||||
|
const STATUS_EXPIRED = -1;
|
||||||
|
*/
|
||||||
|
private function transformQuoteStatus($status)
|
||||||
|
{
|
||||||
|
switch ($status) {
|
||||||
|
case 1:
|
||||||
|
return 1;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
return 3;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return 2;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function getPayments()
|
public function getPayments()
|
||||||
{
|
{
|
||||||
$transformed = [];
|
$transformed = [];
|
||||||
@ -668,6 +738,30 @@ trait GenerateMigrationResources
|
|||||||
return $transformed;
|
return $transformed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function getPaymentTerms()
|
||||||
|
{
|
||||||
|
$payment_terms = PaymentTerm::where('account_id', 0)->orWhere('account_id', $this->account->id)->get();
|
||||||
|
|
||||||
|
$transformed = [];
|
||||||
|
|
||||||
|
foreach($payment_terms as $payment_term)
|
||||||
|
{
|
||||||
|
|
||||||
|
if($payment_term->num_days == -1)
|
||||||
|
$payment_term->num_days = 0;
|
||||||
|
|
||||||
|
$transformed[] = [
|
||||||
|
'user_id' => 0,
|
||||||
|
'company_id' => $this->account->id,
|
||||||
|
'num_days' => $payment_term->num_days,
|
||||||
|
'deleted_at' => $payment_term->deleted_at,
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return $transformed;
|
||||||
|
}
|
||||||
|
|
||||||
private function convertMeta($payment_method)
|
private function convertMeta($payment_method)
|
||||||
{
|
{
|
||||||
$expiry = explode('-', $payment_method->expiration);
|
$expiry = explode('-', $payment_method->expiration);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user