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

Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js

Browse Source 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
This commit is contained in:
Hillel Coren 2016-07-20 10:49:08 +03:00
commit 7bb8f0ca4a
12 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.codeclimate.yml Normal file
View File

@ -0,0 +1,36 @@
engines:
csslint:
enabled: true
duplication:
enabled: true
config:
languages:
- ruby
- javascript
- python
- php
eslint:
enabled: false
fixme:
enabled: true
phpmd:
enabled: true
ratings:
paths:
- "**.css"
- "**.inc"
- "**.js"
- "**.jsx"
- "**.module"
- "**.php"
- "**.py"
- "**.rb"
exclude_paths:
- "bootstrap/cache"
- "resources/"
- "storage/"
- "tests/"
- "**.md"
- "**.min.js"
- "**.min.php"
- "**.min.css"

2
README.md
View File

@ -4,7 +4,7 @@
# Invoice Ninja # Invoice Ninja
[![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=develop)](https://travis-ci.org/invoiceninja/invoiceninja) [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
[![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://invoiceninja.org) ## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://invoiceninja.org)

1
app/Http/Controllers/AccountController.php
View File

@ -1461,7 +1461,6 @@ class AccountController extends BaseController
return trans('texts.create_invoice_for_sample'); return trans('texts.create_invoice_for_sample');
} }
/** @var \App\Models\Account $account */
$account = Auth::user()->account; $account = Auth::user()->account;
$invitation = $invoice->invitations->first(); $invitation = $invoice->invitations->first();

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

@ -95,6 +95,10 @@ class DocumentController extends BaseController
public function postUpload(CreateDocumentRequest $request) public function postUpload(CreateDocumentRequest $request)
{ {
if (!Utils::hasFeature(FEATURE_DOCUMENTS)) {
return;
}
$result = $this->documentRepo->upload($request->all(), $doc_array); $result = $this->documentRepo->upload($request->all(), $doc_array);
if(is_string($result)){ if(is_string($result)){

1
resources/lang/en/texts.php
View File

@ -2028,6 +2028,7 @@ $LANG = array(
'apply_taxes' => 'Apply taxes', 'apply_taxes' => 'Apply taxes',
'min_to_max_users' => ':min to :max users', 'min_to_max_users' => ':min to :max users',
'max_users_reached' => 'The maximum number of users has been reached.', 'max_users_reached' => 'The maximum number of users has been reached.',
'dwolla' => 'Dwolla',
'buy_now_buttons' => 'Buy Now Buttons', 'buy_now_buttons' => 'Buy Now Buttons',
'landing_page' => 'Landing Page', 'landing_page' => 'Landing Page',
'payment_type' => 'Payment Type', 'payment_type' => 'Payment Type',