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

Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php

.codeclimate.yml

@@ -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"

CONTRIBUTING.md

@@ -11,7 +11,7 @@ Thanks for your contributions!
  * Make your changes and commit
  * Check if your branch is still in sync with the repositorys **`develop`** branch
    * _Read:_ [Syncing a fork](https://help.github.com/articles/syncing-a-fork/)
-   * _Also read:_ [How to rebase a pull request](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request) 
+   * _Also read:_ [How to rebase a pull request](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request)
  * Push your branch and create a PR against the Invoice Ninja **`develop`** branch
  * Update the [Changelog](CHANGELOG.md)
 
@@ -21,7 +21,7 @@ To make the contribution process nice and easy for anyone, please follow some ru
 to give a more detailed explanation.
  * Only one feature/bugfix per issue. If you want to submit more, create multiple issues.
  * Only one feature/bugfix per PR(pull request). Split more changes into multiple PRs.
- 
+
 #### Coding Style
 Try to follow the [PSR-2 guidlines](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
 
@@ -29,7 +29,7 @@ _Example styling:_
 ```php
 /**
  * Gets a preview of the email
- * 
+ *
  * @param TemplateService $templateService
  *
  * @return \Illuminate\Http\Response

README.md

@@ -4,7 +4,7 @@
 
 # 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)
 
 ## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://invoiceninja.org)
@@ -74,4 +74,4 @@ For information on how contribute to Invoice Ninja, please see our [contributing
 
 ## License
 Invoice Ninja is released under the Attribution Assurance License.  
-See [LICENSE](LICENSE) for details.
+See [LICENSE](LICENSE) for details.

app/Http/Controllers/AccountController.php

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

app/Http/Controllers/CreditController.php

@@ -62,7 +62,7 @@ class CreditController extends BaseController
             'method' => 'POST',
             'url' => 'credits',
             'title' => trans('texts.new_credit'),
-            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), 
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
         ];
 
         return View::make('credits.edit', $data);

app/Http/Controllers/DocumentController.php

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

app/Listeners/AnalyticsListener.php

@@ -56,4 +56,4 @@ class AnalyticsListener
         curl_setopt_array($curl, $opts);
         curl_close($curl);
     }
-}
+}

app/Ninja/Transformers/UserTransformer.php

@@ -29,4 +29,4 @@ class UserTransformer extends EntityTransformer
             'permissions' => (int) $user->getOriginal('permissions'),
         ];
     }
-}
+}

app/Services/PushService.php

@@ -154,4 +154,4 @@ class PushService
         else
             return trans('texts.notification_invoice_viewed_subject', ['invoice' => $invoice->invoice_number, 'client' => $invoice->client->name]);
     }
-}
+}

composer.json

@@ -19,7 +19,7 @@
         "omnipay/gocardless": "dev-master",
         "omnipay/stripe": "dev-master",
         "doctrine/dbal": "2.5.x",
-        "laravelcollective/bus": "5.2.*",        
+        "laravelcollective/bus": "5.2.*",
         "laravel/framework": "5.2.*",
         "laravelcollective/html": "5.2.*",
         "symfony/css-selector": "~3.0",

resources/lang/en/texts.php

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

tests/acceptance/CheckBalanceCest.php

@@ -17,7 +17,7 @@ class CheckBalanceCest
     public function checkBalance(AcceptanceTester $I)
     {
         $I->wantTo('ensure the balance is correct');
-        
+
         $clientEmail = $this->faker->safeEmail;
         $productKey = $this->faker->text(10);
         $productPrice = $this->faker->numberBetween(1, 20);
@@ -30,7 +30,7 @@ class CheckBalanceCest
         $I->see($clientEmail);
 
         $clientId = $I->grabFromCurrentUrl('~clients/(\d+)~');
-        
+
         // create product
         $I->amOnPage('/products/create');
         $I->fillField(['name' => 'product_key'], $productKey);
@@ -39,7 +39,7 @@ class CheckBalanceCest
         $I->click('Save');
         $I->wait(1);
         $I->see($productKey);
-        
+
         // create invoice
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
@@ -51,7 +51,7 @@ class CheckBalanceCest
         $invoiceId = $I->grabFromCurrentUrl('~invoices/(\d+)~');
         $I->amOnPage("/clients/{$clientId}");
         $I->see('Balance $' . $productPrice);
-        
+
         // update the invoice
         $I->amOnPage('/invoices/' . $invoiceId);
         $I->fillField(['name' => 'invoice_items[0][qty]'], 2);
@@ -91,4 +91,4 @@ class CheckBalanceCest
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
     }
-}
+}