From 1cb199f491818122d63a598667ff58373460f875 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 08:42:46 +0200 Subject: [PATCH 1/7] Working on taxes test --- .travis.yml | 20 ++++++++++---------- tests/acceptance/TaxRatesCest.php | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94a69dc7696b..9393fa105863 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,16 +64,16 @@ before_script: 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 APICest.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 CreditCest.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 acceptance OnlinePaymentCest.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 AllPagesCept.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 ClientCest.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 InvoiceDesignCest.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 TaskCest.php - php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php index 8abcf444dad3..06ec37575746 100644 --- a/tests/acceptance/TaxRatesCest.php +++ b/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 From c57d32189cf66be8bf6086a404e3dc67ef4ca78e Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 08:43:26 +0200 Subject: [PATCH 2/7] Working on taxes test --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9393fa105863..a13f714b21cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,7 @@ script: #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php after_script: + - cat tests/_output/* - cat storage/logs/laravel.log notifications: From e870849289429f3c5337786c0ff4795c4e773354 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 09:03:19 +0200 Subject: [PATCH 3/7] Working on taxes test --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a13f714b21cf..94a69dc7696b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,21 +64,20 @@ before_script: 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 APICest.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 CreditCest.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 acceptance OnlinePaymentCest.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 AllPagesCept.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 ClientCest.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 InvoiceDesignCest.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 TaskCest.php - php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php after_script: - - cat tests/_output/* - cat storage/logs/laravel.log notifications: From b4c03e5cf87a98fcb87dfb53ed2950593b416e56 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 10:56:48 +0200 Subject: [PATCH 4/7] Prevent product without product key --- .travis.yml | 27 ++++++++++---------- app/Ninja/Repositories/InvoiceRepository.php | 3 +-- readme.md | 10 +++----- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94a69dc7696b..864e94927cf7 100644 --- a/.travis.yml +++ b/.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 APICest.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 CreditCest.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 acceptance OnlinePaymentCest.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 TaxRatesCest.php - #- php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.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 CheckBalanceCest.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 InvoiceCest.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 --debug acceptance PaymentCest.php + #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php + #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php + + - sed -i 's/NINJA_DEV=true/NINJA_PROD=true/g' .env + - php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php after_script: - cat storage/logs/laravel.log diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index 47cbf82bbad0..3c4072122d1f 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -418,8 +418,7 @@ class InvoiceRepository extends BaseRepository $expense->save(); } - if ($item['product_key']) { - $productKey = trim($item['product_key']); + if ($productKey = trim($item['product_key'])) { if (\Auth::user()->account->update_products && ! strtotime($productKey)) { $product = Product::findProductByKey($productKey); if (!$product) { diff --git a/readme.md b/readme.md index 8803e480ec1b..2fb4998ffd5e 100644 --- a/readme.md +++ b/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 -* $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/) - -### Reseller Program -There are two options: -* 10% of revenue -* $1,000 for a site limited to 1,000 users +### Affiliates Programs +* Referral: $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/) +* Reseller: 10% of revenue ### Installation Options * [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free From e5253e34336d2ecc2ab0548a9eed598434df0ba1 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 11:04:41 +0200 Subject: [PATCH 5/7] Prevent product without product key --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 864e94927cf7..e1605ba964f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ script: #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php - sed -i 's/NINJA_DEV=true/NINJA_PROD=true/g' .env - - php ./vendor/codeception/codeception/codecept run--debug acceptance GoProCest.php + - php ./vendor/codeception/codeception/codecept run acceptance GoProCest.php after_script: - cat storage/logs/laravel.log From 1529b5923574bc7f36c7d67360dad62fcfa3a88f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 11:15:35 +0200 Subject: [PATCH 6/7] Prevent product without product key --- app/Libraries/Utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index 340cfdfeba48..027f512a47df 100644 --- a/app/Libraries/Utils.php +++ b/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; } From dd9805e5b43bfa9400741b7d98e5847c1a3243ff Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 11:41:03 +0200 Subject: [PATCH 7/7] Refined search hot key --- resources/views/header.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index e2c6b92c38e4..7cadbb7a6a45 100644 --- a/resources/views/header.blade.php +++ b/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(); } });