Merge remote-tracking branch 'upstream/develop' into develop

.travis.yml

@@ -63,19 +63,20 @@ before_script:
   - curl -L http://ninja.dev:8000/update
 
 script:
-  #- php ./vendor/codeception/codeception/codecept run --html --debug
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
+  #- php ./vendor/codeception/codeception/codecept run acceptance OnlinePaymentCest.php
-  - php ./vendor/codeception/codeception/codecept run acceptance OnlinePaymentCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
+
-  #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php
+  - sed -i 's/NINJA_DEV=true/NINJA_PROD=true/g' .env
+  - php ./vendor/codeception/codeception/codecept run acceptance GoProCest.php
 
 after_script:
   - cat storage/logs/laravel.log

app/Libraries/Utils.php

@@ -72,7 +72,7 @@ class Utils
 
     public static function requireHTTPS()
     {
-        if (Request::root() === 'http://ninja.dev') {
+        if (Request::root() === 'http://ninja.dev:8000') {
             return false;
         }
 

app/Ninja/Repositories/InvoiceRepository.php

@@ -418,8 +418,7 @@ class InvoiceRepository extends BaseRepository
                 $expense->save();
             }
 
-            if ($item['product_key']) {
+            if ($productKey = trim($item['product_key'])) {
-                $productKey = trim($item['product_key']);
                 if (\Auth::user()->account->update_products && ! strtotime($productKey)) {
                     $product = Product::findProductByKey($productKey);
                     if (!$product) {

readme.md

@@ -8,13 +8,9 @@
 [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=develop)](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)
 
-### Referral Program
+### Affiliates Programs
-* $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)
+* Referral: $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)
-
+* Reseller: 10% of revenue
-### Reseller Program
-There are two options:
-* 10% of revenue
-* $1,000 for a site limited to 1,000 users
 
 ### Installation Options
 * [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free

resources/views/header.blade.php

@@ -260,8 +260,9 @@
 
   function showSearch() {
     $('#search').typeahead('setQuery', '');
-    $('#search-form').show();
     $('#navbar-options').hide();
+    $('#search-form').show();
+
     if (window.hasOwnProperty('searchData')) {
         $('#search').focus();
     } else {
@@ -299,7 +300,7 @@
         $(".alert-hide").fadeOut();
     }, 3000);
 
-    $('#search').blur(function(){
+    $('#search').blur(function(event){
         hideSearch();
     });
 
@@ -354,6 +355,7 @@
     // Focus the search input if the user clicks forward slash
     $('body').keypress(function(event) {
         if (event.which == 47) {
+            event.preventDefault();
             showSearch();
         }
     });

tests/acceptance/TaxRatesCest.php

@@ -74,6 +74,7 @@ class TaxRatesCest
         // check total is right before saving
         $I->see("\${$total}");
         $I->click('Save');
+        $I->wait(1);
         $I->see($clientEmail);
 
         // check total is right after saving