Prevent product without product key

This commit is contained in:
Hillel Coren 2016-02-19 10:56:48 +02:00
parent e870849289
commit b4c03e5cf8
3 changed files with 18 additions and 22 deletions

View File

@ -63,19 +63,20 @@ before_script:
- curl -L http://ninja.dev:8000/update - curl -L http://ninja.dev:8000/update
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 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--debug acceptance GoProCest.php
after_script: after_script:
- cat storage/logs/laravel.log - cat storage/logs/laravel.log

View File

@ -418,8 +418,7 @@ class InvoiceRepository extends BaseRepository
$expense->save(); $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)) { if (\Auth::user()->account->update_products && ! strtotime($productKey)) {
$product = Product::findProductByKey($productKey); $product = Product::findProductByKey($productKey);
if (!$product) { if (!$product) {

View File

@ -8,13 +8,9 @@
[![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=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) [![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 ### Installation Options
* [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free * [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free