diff --git a/.gitignore b/.gitignore index 76f31224a734..e3149e9c2c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /app/config/staging /app/config/development +/app/config/production /app/config/fortrabbit /app/config/ubuntu /app/config/packages/anahkiasen/rocketeer/ diff --git a/app/config/app.php b/app/config/app.php index b4e1b1776c27..68bfd7bc24eb 100755 --- a/app/config/app.php +++ b/app/config/app.php @@ -13,7 +13,7 @@ return array( | */ - 'debug' => false, + 'debug' => true, /* |-------------------------------------------------------------------------- diff --git a/app/controllers/AppController.php b/app/controllers/AppController.php index d9ffff476fe5..ecaa5f6d8835 100644 --- a/app/controllers/AppController.php +++ b/app/controllers/AppController.php @@ -38,6 +38,7 @@ class AppController extends BaseController { $app = Input::get('app'); $app['key'] = str_random(RANDOM_KEY_LENGTH); + $app['debug'] = false; $database = Input::get('database'); $dbType = $database['default']; diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php index 4d10f4cb3cc1..ca7883023f12 100644 --- a/app/controllers/DashboardController.php +++ b/app/controllers/DashboardController.php @@ -37,7 +37,7 @@ class DashboardController extends \BaseController { ->where('balance', '>', 0) ->where('is_recurring', '=', false) ->where('is_quote', '=', false) - ->where('is_deleted', '=', false) + ->where('is_deleted', '=', false) ->orderBy('due_date', 'asc')->take(6)->get(); $upcoming = Invoice::scope() diff --git a/app/models/Account.php b/app/models/Account.php index 8c26021012ba..ed3d643f17f4 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -149,15 +149,26 @@ class Account extends Eloquent return $prefix . str_pad($counter, 4, "0", STR_PAD_LEFT); } - public function incrementCounter($isQuote = false) + public function incrementCounter($invoiceNumber, $isQuote = false, $isRecurring) { - if ($isQuote && !$this->share_counter) { - $this->quote_number_counter += 1; - } else { - $this->invoice_number_counter += 1; - } + // check if the user modified the invoice number + if (!$isRecurring && $invoiceNumber != $this->getNextInvoiceNumber($isQuote)) { + $number = intval(preg_replace('/[^0-9]/', '', $invoiceNumber)); + if ($isQuote && !$this->share_counter) { + $this->quote_number_counter = $number + 1; + } else { + $this->invoice_number_counter = $number + 1; + } + // otherwise, just increment the counter + } else { + if ($isQuote && !$this->share_counter) { + $this->quote_number_counter += 1; + } else { + $this->invoice_number_counter += 1; + } + } - $this->save(); + $this->save(); } public function getLocale() diff --git a/app/models/Invitation.php b/app/models/Invitation.php index 883092c05223..885a88334fdc 100755 --- a/app/models/Invitation.php +++ b/app/models/Invitation.php @@ -2,23 +2,23 @@ class Invitation extends EntityModel { - public function invoice() - { - return $this->belongsTo('Invoice'); - } + public function invoice() + { + return $this->belongsTo('Invoice'); + } - public function contact() - { - return $this->belongsTo('Contact'); - } + public function contact() + { + return $this->belongsTo('Contact'); + } - public function user() - { - return $this->belongsTo('User'); - } + public function user() + { + return $this->belongsTo('User'); + } - public function getLink() - { - return SITE_URL . '/view/' . $this->invitation_key; - } -} \ No newline at end of file + public function getLink() + { + return SITE_URL.'/view/'.$this->invitation_key; + } +} diff --git a/app/models/Invoice.php b/app/models/Invoice.php index fdd53dbfb6b1..e9ca8b9aa2d5 100755 --- a/app/models/Invoice.php +++ b/app/models/Invoice.php @@ -222,7 +222,7 @@ class Invoice extends EntityModel Invoice::created(function($invoice) { - $invoice->account->incrementCounter($invoice->is_quote); + $invoice->account->incrementCounter($invoice->invoice_number, $invoice->is_quote, $invoice->recurring_invoice_id); Activity::createInvoice($invoice); }); diff --git a/app/ninja/mailers/ContactMailer.php b/app/ninja/mailers/ContactMailer.php index 7b29d3a46753..b77f37d13ee1 100755 --- a/app/ninja/mailers/ContactMailer.php +++ b/app/ninja/mailers/ContactMailer.php @@ -4,98 +4,96 @@ use Invoice; use Payment; use Contact; use Invitation; -use URL; -use Auth; use Activity; use Utils; -class ContactMailer extends Mailer { +class ContactMailer extends Mailer +{ + public function sendInvoice(Invoice $invoice) + { + $invoice->load('invitations', 'client', 'account'); + $entityType = $invoice->getEntityType(); - public function sendInvoice(Invoice $invoice) - { - $invoice->load('invitations', 'client', 'account'); - $entityType = $invoice->getEntityType(); + $view = 'invoice'; + $subject = trans("texts.{$entityType}_subject", ['invoice' => $invoice->invoice_number, 'account' => $invoice->account->getDisplayName()]); + $accountName = $invoice->account->getDisplayName(); - $view = 'invoice'; - $subject = trans("texts.{$entityType}_subject", ['invoice' => $invoice->invoice_number, 'account' => $invoice->account->getDisplayName()]); - $accountName = $invoice->account->getDisplayName(); + foreach ($invoice->invitations as $invitation) { + if (!$invitation->user || !$invitation->user->email) { + return false; + } + if (!$invitation->contact || $invitation->contact->email) { + return false; + } + + $invitation->sent_date = \Carbon::now()->toDateTimeString(); + $invitation->save(); - foreach ($invoice->invitations as $invitation) - { - if (!$invitation->user->email) - { - return false; - } - - $invitation->sent_date = \Carbon::now()->toDateTimeString(); - $invitation->save(); - - $data = [ - 'entityType' => $entityType, - 'link' => $invitation->getLink(), - 'clientName' => $invoice->client->getDisplayName(), - 'accountName' => $accountName, - 'contactName' => $invitation->contact->getDisplayName(), - 'invoiceAmount' => Utils::formatMoney($invoice->amount, $invoice->client->currency_id), - 'emailFooter' => $invoice->account->email_footer, - 'showNinjaFooter' => !$invoice->account->isPro() - ]; + $data = [ + 'entityType' => $entityType, + 'link' => $invitation->getLink(), + 'clientName' => $invoice->client->getDisplayName(), + 'accountName' => $accountName, + 'contactName' => $invitation->contact->getDisplayName(), + 'invoiceAmount' => Utils::formatMoney($invoice->amount, $invoice->client->currency_id), + 'emailFooter' => $invoice->account->email_footer, + 'showNinjaFooter' => !$invoice->account->isPro(), + ]; - $fromEmail = $invitation->user->email; - $this->sendTo($invitation->contact->email, $fromEmail, $accountName, $subject, $view, $data); + $fromEmail = $invitation->user->email; + $this->sendTo($invitation->contact->email, $fromEmail, $accountName, $subject, $view, $data); - Activity::emailInvoice($invitation); - } - - if (!$invoice->isSent()) - { - $invoice->invoice_status_id = INVOICE_STATUS_SENT; - $invoice->save(); - } + Activity::emailInvoice($invitation); + } - \Event::fire('invoice.sent', $invoice); - } + if (!$invoice->isSent()) { + $invoice->invoice_status_id = INVOICE_STATUS_SENT; + $invoice->save(); + } - public function sendPaymentConfirmation(Payment $payment) - { - $view = 'payment_confirmation'; - $subject = trans('texts.payment_subject', ['invoice' => $payment->invoice->invoice_number]); - $accountName = $payment->account->getDisplayName(); + \Event::fire('invoice.sent', $invoice); + } - $data = [ - 'accountName' => $accountName, - 'clientName' => $payment->client->getDisplayName(), - 'emailFooter' => $payment->account->email_footer, - 'paymentAmount' => Utils::formatMoney($payment->amount, $payment->client->currency_id), - 'showNinjaFooter' => !$payment->account->isPro() - ]; + public function sendPaymentConfirmation(Payment $payment) + { + $view = 'payment_confirmation'; + $subject = trans('texts.payment_subject', ['invoice' => $payment->invoice->invoice_number]); + $accountName = $payment->account->getDisplayName(); - $user = $payment->invitation->user; - $this->sendTo($payment->contact->email, $user->email, $accountName, $subject, $view, $data); - } + $data = [ + 'accountName' => $accountName, + 'clientName' => $payment->client->getDisplayName(), + 'emailFooter' => $payment->account->email_footer, + 'paymentAmount' => Utils::formatMoney($payment->amount, $payment->client->currency_id), + 'showNinjaFooter' => !$payment->account->isPro(), + ]; - public function sendLicensePaymentConfirmation($name, $email, $amount, $license, $productId) - { - $view = 'payment_confirmation'; - $subject = trans('texts.payment_subject'); + $user = $payment->invitation->user; + $this->sendTo($payment->contact->email, $user->email, $accountName, $subject, $view, $data); + } - if ($productId == PRODUCT_ONE_CLICK_INSTALL) { - $message = "Softaculous install license: $license"; - } else if ($productId == PRODUCT_INVOICE_DESIGNS) { - $message = "Invoice designs license: $license"; - } else if ($productId == PRODUCT_WHITE_LABEL) { - $message = "White label license: $license"; - } + public function sendLicensePaymentConfirmation($name, $email, $amount, $license, $productId) + { + $view = 'payment_confirmation'; + $subject = trans('texts.payment_subject'); - $data = [ - 'accountName' => trans('texts.email_from'), - 'clientName' => $name, - 'emailFooter' => false, - 'paymentAmount' => Utils::formatMoney($amount, 1), - 'showNinjaFooter' => false, - 'emailMessage' => $message, - ]; + if ($productId == PRODUCT_ONE_CLICK_INSTALL) { + $message = "Softaculous install license: $license"; + } elseif ($productId == PRODUCT_INVOICE_DESIGNS) { + $message = "Invoice designs license: $license"; + } elseif ($productId == PRODUCT_WHITE_LABEL) { + $message = "White label license: $license"; + } - $this->sendTo($email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); - } -} \ No newline at end of file + $data = [ + 'accountName' => trans('texts.email_from'), + 'clientName' => $name, + 'emailFooter' => false, + 'paymentAmount' => Utils::formatMoney($amount, 1), + 'showNinjaFooter' => false, + 'emailMessage' => $message, + ]; + + $this->sendTo($email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); + } +} diff --git a/app/ninja/repositories/ClientRepository.php b/app/ninja/repositories/ClientRepository.php index 302d42bc0df8..6a0a1561eedb 100755 --- a/app/ninja/repositories/ClientRepository.php +++ b/app/ninja/repositories/ClientRepository.php @@ -11,7 +11,8 @@ class ClientRepository ->join('contacts', 'contacts.client_id', '=', 'clients.id') ->where('clients.account_id', '=', \Auth::user()->account_id) ->where('contacts.is_primary', '=', true) - ->select('clients.public_id','clients.name','contacts.first_name','contacts.last_name','clients.balance','clients.last_login','clients.created_at','clients.work_phone','contacts.email','clients.currency_id', 'clients.deleted_at', 'clients.is_deleted'); + ->where('contacts.deleted_at', '=', null) + ->select('clients.public_id','clients.name','contacts.first_name','contacts.last_name','clients.balance','clients.last_login','clients.created_at','clients.work_phone','contacts.email','clients.currency_id', 'clients.deleted_at', 'clients.is_deleted'); if (!\Session::get('show_trash:client')) { @@ -201,6 +202,9 @@ class ClientRepository if ($action == 'restore') { $client->restore(); + + $client->is_deleted = false; + $client->save(); } else { diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php index 7a8a17520c95..2dbc1359a3a6 100755 --- a/app/ninja/repositories/InvoiceRepository.php +++ b/app/ninja/repositories/InvoiceRepository.php @@ -5,89 +5,81 @@ use InvoiceItem; use Invitation; use Product; use Utils; -use TaxRate; class InvoiceRepository { - public function getInvoices($accountId, $clientPublicId = false, $entityType = ENTITY_INVOICE, $filter = false) - { - $query = \DB::table('invoices') - ->join('clients', 'clients.id', '=','invoices.client_id') - ->join('invoice_statuses', 'invoice_statuses.id', '=', 'invoices.invoice_status_id') - ->join('contacts', 'contacts.client_id', '=', 'clients.id') + public function getInvoices($accountId, $clientPublicId = false, $entityType = ENTITY_INVOICE, $filter = false) + { + $query = \DB::table('invoices') + ->join('clients', 'clients.id', '=', 'invoices.client_id') + ->join('invoice_statuses', 'invoice_statuses.id', '=', 'invoices.invoice_status_id') + ->join('contacts', 'contacts.client_id', '=', 'clients.id') ->where('invoices.account_id', '=', $accountId) ->where('clients.deleted_at', '=', null) ->where('contacts.deleted_at', '=', null) - ->where('invoices.is_recurring', '=', false) - ->where('contacts.is_primary', '=', true) - ->select('clients.public_id as client_public_id', 'invoice_number', 'invoice_status_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'invoices.balance', 'invoice_date', 'due_date', 'invoice_statuses.name as invoice_status_name', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'quote_id', 'quote_invoice_id', 'invoices.deleted_at', 'invoices.is_deleted'); + ->where('invoices.is_recurring', '=', false) + ->where('contacts.is_primary', '=', true) + ->select('clients.public_id as client_public_id', 'invoice_number', 'invoice_status_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'invoices.balance', 'invoice_date', 'due_date', 'invoice_statuses.name as invoice_status_name', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'quote_id', 'quote_invoice_id', 'invoices.deleted_at', 'invoices.is_deleted'); - if (!\Session::get('show_trash:' . $entityType)) - { - $query->where('invoices.deleted_at', '=', null); - } + if (!\Session::get('show_trash:'.$entityType)) { + $query->where('invoices.deleted_at', '=', null); + } - if ($clientPublicId) - { - $query->where('clients.public_id', '=', $clientPublicId); - } + if ($clientPublicId) { + $query->where('clients.public_id', '=', $clientPublicId); + } - if ($filter) - { - $query->where(function($query) use ($filter) - { - $query->where('clients.name', 'like', '%'.$filter.'%') - ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%') - ->orWhere('invoice_statuses.name', 'like', '%'.$filter.'%') + if ($filter) { + $query->where(function ($query) use ($filter) { + $query->where('clients.name', 'like', '%'.$filter.'%') + ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%') + ->orWhere('invoice_statuses.name', 'like', '%'.$filter.'%') ->orWhere('contacts.first_name', 'like', '%'.$filter.'%') ->orWhere('contacts.last_name', 'like', '%'.$filter.'%') ->orWhere('contacts.email', 'like', '%'.$filter.'%'); }); - } + } - return $query; - } + return $query; + } - public function getRecurringInvoices($accountId, $clientPublicId = false, $filter = false) - { - $query = \DB::table('invoices') - ->join('clients', 'clients.id', '=','invoices.client_id') - ->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id') - ->join('contacts', 'contacts.client_id', '=', 'clients.id') - ->where('invoices.account_id', '=', $accountId) - ->where('invoices.is_quote', '=', false) - ->where('clients.deleted_at', '=', null) - ->where('invoices.is_recurring', '=', true) - ->where('contacts.is_primary', '=', true) - ->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'invoices.deleted_at', 'invoices.is_deleted'); + public function getRecurringInvoices($accountId, $clientPublicId = false, $filter = false) + { + $query = \DB::table('invoices') + ->join('clients', 'clients.id', '=', 'invoices.client_id') + ->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id') + ->join('contacts', 'contacts.client_id', '=', 'clients.id') + ->where('invoices.account_id', '=', $accountId) + ->where('invoices.is_quote', '=', false) + ->where('clients.deleted_at', '=', null) + ->where('contacts.deleted_at', '=', null) + ->where('invoices.is_recurring', '=', true) + ->where('contacts.is_primary', '=', true) + ->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'invoices.deleted_at', 'invoices.is_deleted'); - if ($clientPublicId) - { - $query->where('clients.public_id', '=', $clientPublicId); - } - - if (!\Session::get('show_trash:invoice')) - { - $query->where('invoices.deleted_at', '=', null); - } + if ($clientPublicId) { + $query->where('clients.public_id', '=', $clientPublicId); + } - if ($filter) - { - $query->where(function($query) use ($filter) - { - $query->where('clients.name', 'like', '%'.$filter.'%') - ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%'); + if (!\Session::get('show_trash:invoice')) { + $query->where('invoices.deleted_at', '=', null); + } + + if ($filter) { + $query->where(function ($query) use ($filter) { + $query->where('clients.name', 'like', '%'.$filter.'%') + ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%'); }); - } + } - return $query; - } + return $query; + } - public function getClientDatatable($contactId, $entityType, $search) - { - $query = \DB::table('invitations') - ->join('invoices', 'invoices.id', '=','invitations.invoice_id') - ->join('clients', 'clients.id', '=','invoices.client_id') + public function getClientDatatable($contactId, $entityType, $search) + { + $query = \DB::table('invitations') + ->join('invoices', 'invoices.id', '=', 'invitations.invoice_id') + ->join('clients', 'clients.id', '=', 'invoices.client_id') //->join('contacts', 'contacts.client_id', '=', 'clients.id') ->where('invitations.contact_id', '=', $contactId) ->where('invitations.deleted_at', '=', null) @@ -96,451 +88,387 @@ class InvoiceRepository ->where('clients.deleted_at', '=', null) ->where('invoices.is_recurring', '=', false) ->select('invitation_key', 'invoice_number', 'invoice_date', 'invoices.balance as balance', 'due_date', 'clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'start_date', 'end_date', 'clients.currency_id'); - - $table = \Datatable::query($query) - ->addColumn('invoice_number', function($model) use ($entityType) { return link_to('/view/' . $model->invitation_key, $model->invoice_number); }) - ->addColumn('invoice_date', function($model) { return Utils::fromSqlDate($model->invoice_date); }) - ->addColumn('amount', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }); - if ($entityType == ENTITY_INVOICE) - { - $table->addColumn('balance', function($model) { return Utils::formatMoney($model->balance, $model->currency_id); }); + $table = \Datatable::query($query) + ->addColumn('invoice_number', function ($model) use ($entityType) { return link_to('/view/'.$model->invitation_key, $model->invoice_number); }) + ->addColumn('invoice_date', function ($model) { return Utils::fromSqlDate($model->invoice_date); }) + ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id); }); + + if ($entityType == ENTITY_INVOICE) { + $table->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); }); + } + + return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); }) + //->addColumn('invoice_status_name', function($model) { return $model->invoice_status_name; }) + ->make(); } - return $table->addColumn('due_date', function($model) { return Utils::fromSqlDate($model->due_date); }) - //->addColumn('invoice_status_name', function($model) { return $model->invoice_status_name; }) - ->make(); - } - - public function getDatatable($accountId, $clientPublicId = null, $entityType, $search) - { - $query = $this->getInvoices($accountId, $clientPublicId, $entityType, $search) + public function getDatatable($accountId, $clientPublicId = null, $entityType, $search) + { + $query = $this->getInvoices($accountId, $clientPublicId, $entityType, $search) ->where('invoices.is_quote', '=', $entityType == ENTITY_QUOTE ? true : false); - $table = \Datatable::query($query); + $table = \Datatable::query($query); - if (!$clientPublicId) - { - $table->addColumn('checkbox', function($model) { return ''; }); - } - - $table->addColumn("invoice_number", function($model) use ($entityType) { return link_to("{$entityType}s/" . $model->public_id . '/edit', $model->invoice_number, ['class' => Utils::getEntityRowClass($model)]); }); + if (!$clientPublicId) { + $table->addColumn('checkbox', function ($model) { return ''; }); + } - if (!$clientPublicId) - { - $table->addColumn('client_name', function($model) { return link_to('clients/' . $model->client_public_id, Utils::getClientDisplayName($model)); }); - } - - $table->addColumn("invoice_date", function($model) { return Utils::fromSqlDate($model->invoice_date); }) - ->addColumn('amount', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }); + $table->addColumn("invoice_number", function ($model) use ($entityType) { return link_to("{$entityType}s/".$model->public_id.'/edit', $model->invoice_number, ['class' => Utils::getEntityRowClass($model)]); }); - if ($entityType == ENTITY_INVOICE) - { - $table->addColumn('balance', function($model) { return Utils::formatMoney($model->balance, $model->currency_id); }); - } + if (!$clientPublicId) { + $table->addColumn('client_name', function ($model) { return link_to('clients/'.$model->client_public_id, Utils::getClientDisplayName($model)); }); + } - return $table->addColumn('due_date', function($model) { return Utils::fromSqlDate($model->due_date); }) - ->addColumn('invoice_status_name', function($model) { return $model->invoice_status_name; }) - ->addColumn('dropdown', function($model) use ($entityType) - { - if ($model->is_deleted) - { - return '
'; - } + $table->addColumn("invoice_date", function ($model) { return Utils::fromSqlDate($model->invoice_date); }) + ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id); }); - $str = ''; + }) ->make(); - } + } - public function getErrors($input) - { - $contact = (array) $input->client->contacts[0]; - $rules = ['email' => 'required|email']; - $validator = \Validator::make($contact, $rules); - - if ($validator->fails()) - { - return $validator; - } - - $invoice = (array) $input; - $invoiceId = isset($invoice['public_id']) && $invoice['public_id'] ? Invoice::getPrivateId($invoice['public_id']) : null; - $rules = [ - 'invoice_number' => 'required|unique:invoices,invoice_number,' . $invoiceId . ',id,account_id,' . \Auth::user()->account_id, - 'discount' => 'positive' - ]; - - if ($invoice['is_recurring'] && $invoice['start_date'] && $invoice['end_date']) - { - $rules['end_date'] = 'after:' . $invoice['start_date']; - } - - $validator = \Validator::make($invoice, $rules); - - if ($validator->fails()) - { - return $validator; - } - - return false; - } - - public function save($publicId, $data, $entityType) - { - if ($publicId) - { - $invoice = Invoice::scope($publicId)->firstOrFail(); - } - else - { - $invoice = Invoice::createNew(); - - if ($entityType == ENTITY_QUOTE) - { - $invoice->is_quote = true; - } - } - - $invoice->client_id = $data['client_id']; - $invoice->discount = round(Utils::parseFloat($data['discount']), 2); - $invoice->is_amount_discount = $data['is_amount_discount'] ? true : false; - $invoice->invoice_number = trim($data['invoice_number']); - $invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false; - $invoice->invoice_date = Utils::toSqlDate($data['invoice_date']); - - if ($invoice->is_recurring) + public function getErrors($input) { - $invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0; - $invoice->start_date = Utils::toSqlDate($data['start_date']); - $invoice->end_date = Utils::toSqlDate($data['end_date']); - $invoice->due_date = null; - } - else - { - $invoice->due_date = Utils::toSqlDate($data['due_date']); - $invoice->frequency_id = 0; - $invoice->start_date = null; - $invoice->end_date = null; - } + $contact = (array) $input->client->contacts[0]; + $rules = ['email' => 'required|email']; + $validator = \Validator::make($contact, $rules); - $invoice->terms = trim($data['terms']); - $invoice->public_notes = trim($data['public_notes']); - $invoice->po_number = trim($data['po_number']); - $invoice->invoice_design_id = $data['invoice_design_id']; - - if (isset($data['tax_name']) && isset($data['tax_rate']) && Utils::parseFloat($data['tax_rate']) > 0) - { - $invoice->tax_rate = Utils::parseFloat($data['tax_rate']); - $invoice->tax_name = trim($data['tax_name']); - } - else - { - $invoice->tax_rate = 0; - $invoice->tax_name = ''; - } - - $total = 0; - - foreach ($data['invoice_items'] as $item) - { - if (!$item->cost && !$item->product_key && !$item->notes) - { - continue; - } - - $invoiceItemCost = Utils::parseFloat($item->cost); - $invoiceItemQty = Utils::parseFloat($item->qty); - $invoiceItemTaxRate = 0; - - if (isset($item->tax_rate) && Utils::parseFloat($item->tax_rate) > 0) - { - $invoiceItemTaxRate = Utils::parseFloat($item->tax_rate); - } - - $lineTotal = $invoiceItemCost * $invoiceItemQty; - - $total += round($lineTotal + ($lineTotal * $invoiceItemTaxRate / 100), 2); - } - - if ($invoice->discount > 0) - { - if ($invoice->is_amount_discount) - { - $total -= $invoice->discount; - } - else - { - $total *= (100 - $invoice->discount) / 100; - } - } - - $invoice->custom_value1 = round($data['custom_value1'], 2); - $invoice->custom_value2 = round($data['custom_value2'], 2); - $invoice->custom_taxes1 = $data['custom_taxes1'] ? true : false; - $invoice->custom_taxes2 = $data['custom_taxes2'] ? true : false; - - // custom fields charged taxes - if ($invoice->custom_value1 && $invoice->custom_taxes1) { - $total += $invoice->custom_value1; - } - if ($invoice->custom_value2 && $invoice->custom_taxes2) { - $total += $invoice->custom_value2; - } - - $total += $total * $invoice->tax_rate / 100; - $total = round($total, 2); - - // custom fields not charged taxes - if ($invoice->custom_value1 && !$invoice->custom_taxes1) { - $total += $invoice->custom_value1; - } - if ($invoice->custom_value2 && !$invoice->custom_taxes2) { - $total += $invoice->custom_value2; - } - - if ($publicId) - { - $invoice->balance = $total - ($invoice->amount - $invoice->balance); - } - else - { - $invoice->balance = $total; - } - - $invoice->amount = $total; - $invoice->save(); - - $invoice->invoice_items()->forceDelete(); - - foreach ($data['invoice_items'] as $item) - { - if (!$item->cost && !$item->product_key && !$item->notes) - { - continue; - } - - if ($item->product_key) - { - $product = Product::findProductByKey(trim($item->product_key)); - - if (!$product) - { - $product = Product::createNew(); - $product->product_key = trim($item->product_key); + if ($validator->fails()) { + return $validator; } - if (\Auth::user()->account->update_products) - { - $product->notes = $item->notes; - $product->cost = $item->cost; - //$product->qty = $item->qty; + $invoice = (array) $input; + $invoiceId = isset($invoice['public_id']) && $invoice['public_id'] ? Invoice::getPrivateId($invoice['public_id']) : null; + $rules = [ + 'invoice_number' => 'required|unique:invoices,invoice_number,'.$invoiceId.',id,account_id,'.\Auth::user()->account_id, + 'discount' => 'positive', + ]; + + if ($invoice['is_recurring'] && $invoice['start_date'] && $invoice['end_date']) { + $rules['end_date'] = 'after:'.$invoice['start_date']; } - - $product->save(); - } - $invoiceItem = InvoiceItem::createNew(); - $invoiceItem->product_id = isset($product) ? $product->id : null; - $invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item->product_key)); - $invoiceItem->notes = trim($invoice->is_recurring ? $item->notes : Utils::processVariables($item->notes)); - $invoiceItem->cost = Utils::parseFloat($item->cost); - $invoiceItem->qty = Utils::parseFloat($item->qty); - $invoiceItem->tax_rate = 0; + $validator = \Validator::make($invoice, $rules); - if (isset($item->tax_rate) && Utils::parseFloat($item->tax_rate) > 0) - { - $invoiceItem->tax_rate = Utils::parseFloat($item->tax_rate); - $invoiceItem->tax_name = trim($item->tax_name); - } + if ($validator->fails()) { + return $validator; + } - $invoice->invoice_items()->save($invoiceItem); + return false; } - if ($data['set_default_terms']) - { - $account = \Auth::user()->account; - $account->invoice_terms = $invoice->terms; - $account->save(); - } - - return $invoice; - } - - public function cloneInvoice($invoice, $quotePublicId = null) - { - $invoice->load('invitations', 'invoice_items'); - $account = $invoice->account; - - $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) + public function save($publicId, $data, $entityType) { - $invoiceNumber = $invoice->invoice_number; - if (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(); - } + if ($publicId) { + $invoice = Invoice::scope($publicId)->firstOrFail(); + } else { + $invoice = Invoice::createNew(); - foreach ([ - 'client_id', - 'discount', - 'is_amount_discount', - 'invoice_date', - 'po_number', - 'due_date', - 'is_recurring', - 'frequency_id', - 'start_date', - 'end_date', - 'terms', - 'public_notes', - 'invoice_design_id', - 'tax_name', - 'tax_rate', - 'amount', - 'is_quote', - 'custom_value1', - 'custom_value2', - 'custom_taxes1', - 'custom_taxes2'] as $field) - { - $clone->$field = $invoice->$field; - } + if ($entityType == ENTITY_QUOTE) { + $invoice->is_quote = true; + } + } - if ($quotePublicId) - { - $clone->is_quote = false; - $clone->quote_id = $quotePublicId; - } - - $clone->save(); + $invoice->client_id = $data['client_id']; + $invoice->discount = round(Utils::parseFloat($data['discount']), 2); + $invoice->is_amount_discount = $data['is_amount_discount'] ? true : false; + $invoice->invoice_number = trim($data['invoice_number']); + $invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false; + $invoice->invoice_date = Utils::toSqlDate($data['invoice_date']); - if ($quotePublicId) - { - $invoice->quote_invoice_id = $clone->public_id; - $invoice->save(); - } - - foreach ($invoice->invoice_items as $item) - { - $cloneItem = InvoiceItem::createNew($invoice); - - foreach ([ - 'product_id', - 'product_key', - 'notes', - 'cost', - 'qty', - 'tax_name', - 'tax_rate'] as $field) - { - $cloneItem->$field = $item->$field; - } + if ($invoice->is_recurring) { + $invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0; + $invoice->start_date = Utils::toSqlDate($data['start_date']); + $invoice->end_date = Utils::toSqlDate($data['end_date']); + $invoice->due_date = null; + } else { + $invoice->due_date = Utils::toSqlDate($data['due_date']); + $invoice->frequency_id = 0; + $invoice->start_date = null; + $invoice->end_date = null; + } - $clone->invoice_items()->save($cloneItem); - } + $invoice->terms = trim($data['terms']); + $invoice->public_notes = trim($data['public_notes']); + $invoice->po_number = trim($data['po_number']); + $invoice->invoice_design_id = $data['invoice_design_id']; - foreach ($invoice->invitations as $invitation) - { - $cloneInvitation = Invitation::createNew($invoice); - $cloneInvitation->contact_id = $invitation->contact_id; - $cloneInvitation->invitation_key = str_random(RANDOM_KEY_LENGTH); - $clone->invitations()->save($cloneInvitation); - } + if (isset($data['tax_name']) && isset($data['tax_rate']) && Utils::parseFloat($data['tax_rate']) > 0) { + $invoice->tax_rate = Utils::parseFloat($data['tax_rate']); + $invoice->tax_name = trim($data['tax_name']); + } else { + $invoice->tax_rate = 0; + $invoice->tax_name = ''; + } - return $clone; - } + $total = 0; + foreach ($data['invoice_items'] as $item) { + if (!$item->cost && !$item->product_key && !$item->notes) { + continue; + } - public function bulk($ids, $action, $statusId = false) - { - if (!$ids) - { - return 0; - } + $invoiceItemCost = Utils::parseFloat($item->cost); + $invoiceItemQty = Utils::parseFloat($item->qty); + $invoiceItemTaxRate = 0; - $invoices = Invoice::withTrashed()->scope($ids)->get(); + if (isset($item->tax_rate) && Utils::parseFloat($item->tax_rate) > 0) { + $invoiceItemTaxRate = Utils::parseFloat($item->tax_rate); + } - foreach ($invoices as $invoice) - { - if ($action == 'mark') - { - $invoice->invoice_status_id = $statusId; + $lineTotal = $invoiceItemCost * $invoiceItemQty; + + $total += round($lineTotal + ($lineTotal * $invoiceItemTaxRate / 100), 2); + } + + if ($invoice->discount > 0) { + if ($invoice->is_amount_discount) { + $total -= $invoice->discount; + } else { + $total *= (100 - $invoice->discount) / 100; + } + } + + $invoice->custom_value1 = round($data['custom_value1'], 2); + $invoice->custom_value2 = round($data['custom_value2'], 2); + $invoice->custom_taxes1 = $data['custom_taxes1'] ? true : false; + $invoice->custom_taxes2 = $data['custom_taxes2'] ? true : false; + + // custom fields charged taxes + if ($invoice->custom_value1 && $invoice->custom_taxes1) { + $total += $invoice->custom_value1; + } + if ($invoice->custom_value2 && $invoice->custom_taxes2) { + $total += $invoice->custom_value2; + } + + $total += $total * $invoice->tax_rate / 100; + $total = round($total, 2); + + // custom fields not charged taxes + if ($invoice->custom_value1 && !$invoice->custom_taxes1) { + $total += $invoice->custom_value1; + } + if ($invoice->custom_value2 && !$invoice->custom_taxes2) { + $total += $invoice->custom_value2; + } + + if ($publicId) { + $invoice->balance = $total - ($invoice->amount - $invoice->balance); + } else { + $invoice->balance = $total; + } + + $invoice->amount = $total; $invoice->save(); - } - else if ($action == 'restore') - { - $invoice->restore(); - } - else - { - if ($action == 'delete') - { - $invoice->is_deleted = true; - $invoice->save(); - } - $invoice->delete(); - } - } + $invoice->invoice_items()->forceDelete(); - return count($invoices); - } + foreach ($data['invoice_items'] as $item) { + if (!$item->cost && !$item->product_key && !$item->notes) { + continue; + } + + if ($item->product_key) { + $product = Product::findProductByKey(trim($item->product_key)); + + if (!$product) { + $product = Product::createNew(); + $product->product_key = trim($item->product_key); + } + + if (\Auth::user()->account->update_products) { + $product->notes = $item->notes; + $product->cost = $item->cost; + //$product->qty = $item->qty; + } + + $product->save(); + } + + $invoiceItem = InvoiceItem::createNew(); + $invoiceItem->product_id = isset($product) ? $product->id : null; + $invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item->product_key)); + $invoiceItem->notes = trim($invoice->is_recurring ? $item->notes : Utils::processVariables($item->notes)); + $invoiceItem->cost = Utils::parseFloat($item->cost); + $invoiceItem->qty = Utils::parseFloat($item->qty); + $invoiceItem->tax_rate = 0; + + if (isset($item->tax_rate) && Utils::parseFloat($item->tax_rate) > 0) { + $invoiceItem->tax_rate = Utils::parseFloat($item->tax_rate); + $invoiceItem->tax_name = trim($item->tax_name); + } + + $invoice->invoice_items()->save($invoiceItem); + } + + if ($data['set_default_terms']) { + $account = \Auth::user()->account; + $account->invoice_terms = $invoice->terms; + $account->save(); + } + + return $invoice; + } + + public function cloneInvoice($invoice, $quotePublicId = null) + { + $invoice->load('invitations', 'invoice_items'); + $account = $invoice->account; + + $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) { + $invoiceNumber = $invoice->invoice_number; + if (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(); + } + + foreach ([ + 'client_id', + 'discount', + 'is_amount_discount', + 'invoice_date', + 'po_number', + 'due_date', + 'is_recurring', + 'frequency_id', + 'start_date', + 'end_date', + 'terms', + 'public_notes', + 'invoice_design_id', + 'tax_name', + 'tax_rate', + 'amount', + 'is_quote', + 'custom_value1', + 'custom_value2', + 'custom_taxes1', + 'custom_taxes2', ] as $field) { + $clone->$field = $invoice->$field; + } + + if ($quotePublicId) { + $clone->is_quote = false; + $clone->quote_id = $quotePublicId; + } + + $clone->save(); + + if ($quotePublicId) { + $invoice->quote_invoice_id = $clone->public_id; + $invoice->save(); + } + + foreach ($invoice->invoice_items as $item) { + $cloneItem = InvoiceItem::createNew($invoice); + + foreach ([ + 'product_id', + 'product_key', + 'notes', + 'cost', + 'qty', + 'tax_name', + 'tax_rate', ] as $field) { + $cloneItem->$field = $item->$field; + } + + $clone->invoice_items()->save($cloneItem); + } + + foreach ($invoice->invitations as $invitation) { + $cloneInvitation = Invitation::createNew($invoice); + $cloneInvitation->contact_id = $invitation->contact_id; + $cloneInvitation->invitation_key = str_random(RANDOM_KEY_LENGTH); + $clone->invitations()->save($cloneInvitation); + } + + return $clone; + } + + public function bulk($ids, $action, $statusId = false) + { + if (!$ids) { + return 0; + } + + $invoices = Invoice::withTrashed()->scope($ids)->get(); + + foreach ($invoices as $invoice) { + if ($action == 'mark') { + $invoice->invoice_status_id = $statusId; + $invoice->save(); + } elseif ($action == 'restore') { + $invoice->restore(); + } else { + if ($action == 'delete') { + $invoice->is_deleted = true; + $invoice->save(); + } + + $invoice->delete(); + } + } + + return count($invoices); + } } diff --git a/app/routes.php b/app/routes.php index e266cf8ac01a..7e65bddb7bba 100755 --- a/app/routes.php +++ b/app/routes.php @@ -74,86 +74,89 @@ Route::post('user/reset', 'UserController@do_reset_password'); Route::get('logout', 'UserController@logout'); if (Utils::isNinja()) { - Route::post('/signup/register', 'AccountController@doRegister'); - Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed'); - Route::get('/demo', 'AccountController@demo'); + Route::post('/signup/register', 'AccountController@doRegister'); + Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed'); + Route::get('/demo', 'AccountController@demo'); } -Route::group(array('before' => 'auth'), function() -{ - Route::get('dashboard', 'DashboardController@index'); - Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible'); - Route::get('hide_message', 'HomeController@hideMessage'); - Route::get('force_inline_pdf', 'UserController@forcePDFJS'); +Route::group(array('before' => 'auth'), function() { + Route::get('dashboard', 'DashboardController@index'); + Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible'); + Route::get('hide_message', 'HomeController@hideMessage'); + Route::get('force_inline_pdf', 'UserController@forcePDFJS'); - Route::get('api/users', array('as'=>'api.users', 'uses'=>'UserController@getDatatable')); - Route::resource('users', 'UserController'); - Route::post('users/delete', 'UserController@delete'); - - Route::get('api/products', array('as'=>'api.products', 'uses'=>'ProductController@getDatatable')); - Route::resource('products', 'ProductController'); - Route::get('products/{product_id}/archive', 'ProductController@archive'); + Route::get('api/users', array('as'=>'api.users', 'uses'=>'UserController@getDatatable')); + Route::resource('users', 'UserController'); + Route::post('users/delete', 'UserController@delete'); - Route::get('company/advanced_settings/data_visualizations', 'ReportController@d3'); - Route::get('company/advanced_settings/chart_builder', 'ReportController@report'); - Route::post('company/advanced_settings/chart_builder', 'ReportController@report'); + Route::get('api/products', array('as'=>'api.products', 'uses'=>'ProductController@getDatatable')); + Route::resource('products', 'ProductController'); + Route::get('products/{product_id}/archive', 'ProductController@archive'); - Route::post('company/cancel_account', 'AccountController@cancelAccount'); - Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData')); - Route::get('company/{section?}/{sub_section?}', 'AccountController@showSection'); - Route::post('company/{section?}/{sub_section?}', 'AccountController@doSection'); - Route::post('user/setTheme', 'UserController@setTheme'); - Route::post('remove_logo', 'AccountController@removeLogo'); - Route::post('account/go_pro', 'AccountController@enableProPlan'); + Route::get('company/advanced_settings/data_visualizations', 'ReportController@d3'); + Route::get('company/advanced_settings/chart_builder', 'ReportController@report'); + Route::post('company/advanced_settings/chart_builder', 'ReportController@report'); - Route::resource('clients', 'ClientController'); - Route::get('api/clients', array('as'=>'api.clients', 'uses'=>'ClientController@getDatatable')); - Route::get('api/activities/{client_id?}', array('as'=>'api.activities', 'uses'=>'ActivityController@getDatatable')); - Route::post('clients/bulk', 'ClientController@bulk'); + Route::post('company/cancel_account', 'AccountController@cancelAccount'); + Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData')); + Route::get('company/{section?}/{sub_section?}', 'AccountController@showSection'); + Route::post('company/{section?}/{sub_section?}', 'AccountController@doSection'); + Route::post('user/setTheme', 'UserController@setTheme'); + Route::post('remove_logo', 'AccountController@removeLogo'); + Route::post('account/go_pro', 'AccountController@enableProPlan'); - Route::get('recurring_invoices', 'InvoiceController@recurringIndex'); - Route::get('api/recurring_invoices/{client_id?}', array('as'=>'api.recurring_invoices', 'uses'=>'InvoiceController@getRecurringDatatable')); + Route::resource('clients', 'ClientController'); + Route::get('api/clients', array('as'=>'api.clients', 'uses'=>'ClientController@getDatatable')); + Route::get('api/activities/{client_id?}', array('as'=>'api.activities', 'uses'=>'ActivityController@getDatatable')); + Route::post('clients/bulk', 'ClientController@bulk'); - Route::resource('invoices', 'InvoiceController'); - Route::get('api/invoices/{client_id?}', array('as'=>'api.invoices', 'uses'=>'InvoiceController@getDatatable')); - Route::get('invoices/create/{client_id?}', 'InvoiceController@create'); - Route::get('invoices/{public_id}/clone', 'InvoiceController@cloneInvoice'); - Route::post('invoices/bulk', 'InvoiceController@bulk'); + Route::get('recurring_invoices', 'InvoiceController@recurringIndex'); + Route::get('api/recurring_invoices/{client_id?}', array('as'=>'api.recurring_invoices', 'uses'=>'InvoiceController@getRecurringDatatable')); - Route::get('quotes/create/{client_id?}', 'QuoteController@create'); - Route::get('quotes/{public_id}/clone', 'InvoiceController@cloneInvoice'); - Route::get('quotes/{public_id}/edit', 'InvoiceController@edit'); - Route::put('quotes/{public_id}', 'InvoiceController@update'); - Route::get('quotes/{public_id}', 'InvoiceController@edit'); - Route::post('quotes', 'InvoiceController@store'); - Route::get('quotes', 'QuoteController@index'); - Route::get('api/quotes/{client_id?}', array('as'=>'api.quotes', 'uses'=>'QuoteController@getDatatable')); - Route::post('quotes/bulk', 'QuoteController@bulk'); + Route::resource('invoices', 'InvoiceController'); + Route::get('api/invoices/{client_id?}', array('as'=>'api.invoices', 'uses'=>'InvoiceController@getDatatable')); + Route::get('invoices/create/{client_id?}', 'InvoiceController@create'); + Route::get('invoices/{public_id}/clone', 'InvoiceController@cloneInvoice'); + Route::post('invoices/bulk', 'InvoiceController@bulk'); + + Route::get('quotes/create/{client_id?}', 'QuoteController@create'); + Route::get('quotes/{public_id}/clone', 'InvoiceController@cloneInvoice'); + Route::get('quotes/{public_id}/edit', 'InvoiceController@edit'); + Route::put('quotes/{public_id}', 'InvoiceController@update'); + Route::get('quotes/{public_id}', 'InvoiceController@edit'); + Route::post('quotes', 'InvoiceController@store'); + Route::get('quotes', 'QuoteController@index'); + Route::get('api/quotes/{client_id?}', array('as'=>'api.quotes', 'uses'=>'QuoteController@getDatatable')); + Route::post('quotes/bulk', 'QuoteController@bulk'); + + Route::get('payments/{id}/edit', function() { + return View::make('header'); + }); + Route::resource('payments', 'PaymentController'); + Route::get('payments/create/{client_id?}/{invoice_id?}', 'PaymentController@create'); + Route::get('api/payments/{client_id?}', array('as'=>'api.payments', 'uses'=>'PaymentController@getDatatable')); + Route::post('payments/bulk', 'PaymentController@bulk'); + + Route::get('credits/{id}/edit', function() { + return View::make('header'); + }); + Route::resource('credits', 'CreditController'); + Route::get('credits/create/{client_id?}/{invoice_id?}', 'CreditController@create'); + Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable')); + Route::post('credits/bulk', 'CreditController@bulk'); - Route::get('payments/{id}/edit', function() { return View::make('header'); }); - Route::resource('payments', 'PaymentController'); - Route::get('payments/create/{client_id?}/{invoice_id?}', 'PaymentController@create'); - Route::get('api/payments/{client_id?}', array('as'=>'api.payments', 'uses'=>'PaymentController@getDatatable')); - Route::post('payments/bulk', 'PaymentController@bulk'); - - Route::get('credits/{id}/edit', function() { return View::make('header'); }); - Route::resource('credits', 'CreditController'); - Route::get('credits/create/{client_id?}/{invoice_id?}', 'CreditController@create'); - Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable')); - Route::post('credits/bulk', 'CreditController@bulk'); - //Route::resource('timesheets', 'TimesheetController'); }); // Route group for API Route::group(array('prefix' => 'api/v1', 'before' => 'auth.basic'), function() { - Route::resource('ping', 'ClientApiController@ping'); - Route::resource('clients', 'ClientApiController'); - Route::resource('invoices', 'InvoiceApiController'); - Route::resource('quotes', 'QuoteApiController'); - Route::resource('payments', 'PaymentApiController'); - Route::post('api/hooks', 'IntegrationController@subscribe'); + Route::resource('ping', 'ClientApiController@ping'); + Route::resource('clients', 'ClientApiController'); + Route::resource('invoices', 'InvoiceApiController'); + Route::resource('quotes', 'QuoteApiController'); + Route::resource('payments', 'PaymentApiController'); + Route::post('api/hooks', 'IntegrationController@subscribe'); }); define('CONTACT_EMAIL', Config::get('mail.from.address')); @@ -284,10 +287,10 @@ define('GATEWAY_GOOGLE', 33); define('GATEWAY_QUICKBOOKS', 35); */ -/** +/** * TEST VALUES FOR THE CREDIT CARDS - * NUMBER IS FOR THE BINARY COUNT FOR WHICH IMAGES TO DISPLAY - * card IS FOR CARD IMAGE AND text IS FOR CARD NAME (TO ADD TO alt FOR IMAGE) + * NUMBER IS FOR THE BINARY COUNT FOR WHICH IMAGES TO DISPLAY + * card IS FOR CARD IMAGE AND text IS FOR CARD NAME (TO ADD TO alt FOR IMAGE) **/ $creditCards = [ 1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'], @@ -296,7 +299,7 @@ $creditCards = [ 8 => ['card' => 'images/credit_cards/Test-Diners-Icon.png', 'text' => 'Diners'], 16 => ['card' => 'images/credit_cards/Test-Discover-Icon.png', 'text' => 'Discover'] ]; - + define('CREDIT_CARDS', serialize($creditCards)); @@ -312,12 +315,12 @@ HTML::macro('tab_link', function($url, $text, $active = false) { }); HTML::macro('menu_link', function($type) { - $types = $type.'s'; - $Type = ucfirst($type); - $Types = ucfirst($types); - $class = ( Request::is($types) || Request::is('*'.$type.'*')) && !Request::is('*advanced_settings*') ? ' active' : ''; + $types = $type.'s'; + $Type = ucfirst($type); + $Types = ucfirst($types); + $class = ( Request::is($types) || Request::is('*'.$type.'*')) && !Request::is('*advanced_settings*') ? ' active' : ''; - return '
  • + return '
  • '.trans("texts.$types").'