Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00
Code Issues Releases Activity

Check for duplicate invoice number when approving a quote

Browse Source
This commit is contained in:
Hillel Coren 2015-11-06 10:21:45 +02:00
parent a30b9039de
commit aa69a17232
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Account.php
View File

@ -132,6 +132,15 @@ class Account extends Eloquent
return !$this->language_id || $this->language_id == DEFAULT_LANGUAGE;
}
public function hasInvoicePrefix()
{
if ( ! $this->invoice_number_prefix && ! $this->quote_number_prefix) {
return false;
}
return $this->invoice_number_prefix != $this->quote_number_prefix;
}
public function getDisplayName()
{
if ($this->name) {

16
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -348,19 +348,19 @@ class InvoiceRepository extends BaseRepository
$clone = Invoice::createNew($invoice);
$clone->balance = $invoice->amount;
// if the invoice prefix is diff than quote prefix, use the same number for the invoice
if (($account->invoice_number_prefix || $account->quote_number_prefix)
&& $account->invoice_number_prefix != $account->quote_number_prefix
&& $account->share_counter) {
// if the invoice prefix is diff than quote prefix, use the same number for the invoice (if it's available)
$invoiceNumber = false;
if ($account->hasInvoicePrefix() && $account->share_counter) {
$invoiceNumber = $invoice->invoice_number;
if ($account->quote_number_prefix && strpos($invoiceNumber, $account->quote_number_prefix) === 0) {
$invoiceNumber = substr($invoiceNumber, strlen($account->quote_number_prefix));
}
$clone->invoice_number = $account->invoice_number_prefix.$invoiceNumber;
} else {
$clone->invoice_number = $account->getNextInvoiceNumber($invoice);
$invoiceNumber = $account->invoice_number_prefix . $invoiceNumber;
if (Invoice::scope()->withTrashed()->whereInvoiceNumber($invoiceNumber)->first()) {
$invoiceNumber = false;
}
}
$clone->invoice_number = $invoiceNumber ?: $account->getNextInvoiceNumber($clone);
foreach ([
'client_id',