From b4c03e5cf87a98fcb87dfb53ed2950593b416e56 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Feb 2016 10:56:48 +0200 Subject: [PATCH] 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