Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from turbo124/develop

Browse Source 
Bug fixes
This commit is contained in:
David Bomba 2016-03-02 12:19:00 +11:00
commit 2d5a30490e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AccountApiController.php
View File

@ -152,7 +152,7 @@ class AccountApiController extends BaseAPIController
$account->devices = json_encode($devices);
$account->save();
return $this->response($account);
return $this->response($newDevice);
}
@ -185,7 +185,7 @@ class AccountApiController extends BaseAPIController
$account->devices = json_encode($devices);
$account->save();
return $this->response($account);
return $this->response($newDevice);
}
}

3
app/Listeners/NotificationListener.php
View File

@ -10,6 +10,7 @@ use App\Events\QuoteInvitationWasViewed;
use App\Events\QuoteInvitationWasApproved;
use App\Events\PaymentWasCreated;
use App\Ninja\Notifications;
use App\Services\PushService;
class NotificationListener
{
@ -17,7 +18,7 @@ class NotificationListener
protected $contactMailer;
protected $pushService;
public function __construct(UserMailer $userMailer, ContactMailer $contactMailer, Notifications\PushService $pushService)
public function __construct(UserMailer $userMailer, ContactMailer $contactMailer, PushService $pushService)
{
$this->userMailer = $userMailer;
$this->contactMailer = $contactMailer;

1
app/Ninja/Repositories/AccountRepository.php
View File

@ -194,7 +194,6 @@ class AccountRepository
$account = $this->getNinjaAccount();
$lastInvoice = Invoice::withTrashed()->whereAccountId($account->id)->orderBy('public_id', 'DESC')->first();
$publicId = $lastInvoice ? ($lastInvoice->public_id + 1) : 1;
$invoice = new Invoice();
$invoice->account_id = $account->id;
$invoice->user_id = $account->users()->first()->id;

3
readme.md
View File

@ -19,6 +19,7 @@
* [Softaculous](https://www.softaculous.com/apps/ecommerce/Invoice_Ninja) - $30
### Requirements
* PHP >= 5.5.9
* MCrypt PHP Extension
* MySQL
@ -98,4 +99,4 @@ We're using the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-mode
* [ezyang/htmlpurifier](https://github.com/ezyang/htmlpurifier) - Standards compliant HTML filter written in PHP
* [cerdic/css-tidy](https://github.com/Cerdic/CSSTidy) - CSSTidy is a CSS minifier
* [asgrim/ofxparser](https://github.com/asgrim/ofxparser) - OFX File Parser
* [stacktracejs/stacktrace.js](https://github.com/stacktracejs/stacktrace.js) - Framework-agnostic, micro-library for getting stack traces in all web browsers
* [stacktracejs/stacktrace.js](https://github.com/stacktracejs/stacktrace.js) - Framework-agnostic, micro-library for getting stack traces in all web browsers