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

Fix for dates

Browse Source
This commit is contained in:
Hillel Coren 2017-01-30 10:17:32 +02:00
parent 261fc98c22
commit 80b582a059
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Constants.php
View File

@ -292,7 +292,7 @@ if (!defined('APP_NAME'))
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '3.0.2' . env('NINJA_VERSION_SUFFIX')); define('NINJA_VERSION', '3.0.3' . env('NINJA_VERSION_SUFFIX'));
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja')); define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));

2
app/Http/Controllers/InvoiceApiController.php
View File

@ -231,7 +231,7 @@ class InvoiceApiController extends BaseAPIController
} }
if (!isset($data['invoice_date'])) { if (!isset($data['invoice_date'])) {
$fields['invoice_date_sql'] = Utils::today(); $fields['invoice_date_sql'] = Utils::today(false)->format('Y-m-d');
} }
if (!isset($data['due_date'])) { if (!isset($data['due_date'])) {
$fields['due_date_sql'] = false; $fields['due_date_sql'] = false;

2
app/Http/Controllers/InvoiceController.php
View File

@ -101,7 +101,7 @@ class InvoiceController extends BaseController
$invoice->invoice_number = $account->getNextNumber($invoice); $invoice->invoice_number = $account->getNextNumber($invoice);
$invoice->balance = $invoice->amount; $invoice->balance = $invoice->amount;
$invoice->invoice_status_id = 0; $invoice->invoice_status_id = 0;
$invoice->invoice_date = Utils::today(); $invoice->invoice_date = Utils::today(false)->format('Y-m-d');
$method = 'POST'; $method = 'POST';
$url = "{$entityType}s"; $url = "{$entityType}s";
} else { } else {

2
app/Ninja/PaymentDrivers/BasePaymentDriver.php
View File

@ -612,7 +612,7 @@ class BasePaymentDriver
$payment->client_id = $invoice->client_id; $payment->client_id = $invoice->client_id;
$payment->contact_id = $invitation->contact_id; $payment->contact_id = $invitation->contact_id;
$payment->transaction_reference = $ref; $payment->transaction_reference = $ref;
$payment->payment_date = Utils::today(); $payment->payment_date = Utils::today(false)->format('Y-m-d');
$payment->ip = Request::ip(); $payment->ip = Request::ip();
$payment = $this->creatingPayment($payment, $paymentMethod); $payment = $this->creatingPayment($payment, $paymentMethod);

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

@ -301,7 +301,7 @@ class InvoiceRepository extends BaseRepository
$entityType = ENTITY_QUOTE; $entityType = ENTITY_QUOTE;
} }
$invoice = $account->createInvoice($entityType, $data['client_id']); $invoice = $account->createInvoice($entityType, $data['client_id']);
$invoice->invoice_date = Utils::today(); $invoice->invoice_date = Utils::today(false)->format('Y-m-d');
if (isset($data['has_tasks']) && filter_var($data['has_tasks'], FILTER_VALIDATE_BOOLEAN)) { if (isset($data['has_tasks']) && filter_var($data['has_tasks'], FILTER_VALIDATE_BOOLEAN)) {
$invoice->has_tasks = true; $invoice->has_tasks = true;
} }
@ -666,7 +666,7 @@ class InvoiceRepository extends BaseRepository
} }
} }
$clone->invoice_number = $invoiceNumber ?: $account->getNextNumber($clone); $clone->invoice_number = $invoiceNumber ?: $account->getNextNumber($clone);
$clone->invoice_date = Utils::today(); $clone->invoice_date = Utils::today(false)->format('Y-m-d');
foreach ([ foreach ([
'client_id', 'client_id',
@ -869,7 +869,7 @@ class InvoiceRepository extends BaseRepository
$invoice->invoice_number = $recurInvoice->account->getNextNumber($invoice); $invoice->invoice_number = $recurInvoice->account->getNextNumber($invoice);
$invoice->amount = $recurInvoice->amount; $invoice->amount = $recurInvoice->amount;
$invoice->balance = $recurInvoice->amount; $invoice->balance = $recurInvoice->amount;
$invoice->invoice_date = Utils::today(); $invoice->invoice_date = Utils::today(false)->format('Y-m-d');
$invoice->discount = $recurInvoice->discount; $invoice->discount = $recurInvoice->discount;
$invoice->po_number = $recurInvoice->po_number; $invoice->po_number = $recurInvoice->po_number;
$invoice->public_notes = Utils::processVariables($recurInvoice->public_notes); $invoice->public_notes = Utils::processVariables($recurInvoice->public_notes);