Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Hillel Coren 2019-12-03 11:27:30 +02:00
parent 9284d76481
commit 6bbcad249d
8 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -11,7 +11,7 @@
### We're on Slack, join us at [slack.invoiceninja.com](http://slack.invoiceninja.com) ### We're on Slack, join us at [slack.invoiceninja.com](http://slack.invoiceninja.com)
All Pro and Enterprise features from the hosted app are included in the open-source code. We offer a $20 per year white-label license to remove our branding for personal use. All Pro and Enterprise features from the hosted app are included in the open-source code. We offer a $30 per year white-label license to remove our branding for personal use.
The self-host zip includes all third party libraries whereas downloading the code from GitHub requires using Composer to install the dependencies. The self-host zip includes all third party libraries whereas downloading the code from GitHub requires using Composer to install the dependencies.

2
app/Constants.php
View File

@ -439,7 +439,7 @@ if (! defined('APP_NAME')) {
define('PLAN_PRICE_ENTERPRISE_MONTHLY_5', env('PLAN_PRICE_ENTERPRISE_MONTHLY_5', 18)); define('PLAN_PRICE_ENTERPRISE_MONTHLY_5', env('PLAN_PRICE_ENTERPRISE_MONTHLY_5', 18));
define('PLAN_PRICE_ENTERPRISE_MONTHLY_10', env('PLAN_PRICE_ENTERPRISE_MONTHLY_10', 24)); define('PLAN_PRICE_ENTERPRISE_MONTHLY_10', env('PLAN_PRICE_ENTERPRISE_MONTHLY_10', 24));
define('PLAN_PRICE_ENTERPRISE_MONTHLY_20', env('PLAN_PRICE_ENTERPRISE_MONTHLY_20', 36)); define('PLAN_PRICE_ENTERPRISE_MONTHLY_20', env('PLAN_PRICE_ENTERPRISE_MONTHLY_20', 36));
define('WHITE_LABEL_PRICE', env('WHITE_LABEL_PRICE', 20)); define('WHITE_LABEL_PRICE', env('WHITE_LABEL_PRICE', 30));
define('INVOICE_DESIGNS_PRICE', env('INVOICE_DESIGNS_PRICE', 10)); define('INVOICE_DESIGNS_PRICE', env('INVOICE_DESIGNS_PRICE', 10));
define('USER_TYPE_SELF_HOST', 'SELF_HOST'); define('USER_TYPE_SELF_HOST', 'SELF_HOST');

2
app/Http/Middleware/StartupCheck.php
View File

@ -94,7 +94,7 @@ class StartupCheck
Session::put(SESSION_COUNTER, ++$count); Session::put(SESSION_COUNTER, ++$count);
if (Utils::isNinja()) { if (Utils::isNinja()) {
if ($coupon = request()->coupon && ! $company->hasActivePlan()) { if (($coupon = request()->coupon) && ! $company->hasActivePlan()) {
if ($code = config('ninja.coupon_50_off')) { if ($code = config('ninja.coupon_50_off')) {
if (hash_equals($coupon, $code)) { if (hash_equals($coupon, $code)) {
$company->applyDiscount(.5); $company->applyDiscount(.5);

2
app/Models/Company.php
View File

@ -103,7 +103,7 @@ class Company extends Eloquent
public function hasActivePlan() public function hasActivePlan()
{ {
return Carbon::parse($this->plan_expires) >= Carbon::today(); return $this->plan_expires && Carbon::parse($this->plan_expires) >= Carbon::today();
} }
public function hasExpiredPlan($plan) public function hasExpiredPlan($plan)

4
app/Ninja/PaymentDrivers/BasePaymentDriver.php
View File

@ -920,6 +920,10 @@ class BasePaymentDriver
$amount = $payment->getCompletedAmount(); $amount = $payment->getCompletedAmount();
} }
if ($payment->is_deleted) {
return false;
}
if (! $amount) { if (! $amount) {
return false; return false;
} }

11
app/Ninja/Repositories/AccountRepository.php
View File

@ -148,15 +148,8 @@ class AccountRepository
$query->whereRegistered(true); $query->whereRegistered(true);
})->count(); })->count();
if ($count > 10 && $errorEmail = env('ERROR_EMAIL')) { if ($count >= 15) {
\Mail::raw($ip, function ($message) use ($ip, $errorEmail) { abort();
$message->to($errorEmail)
->from(CONTACT_EMAIL)
->subject('Duplicate company for IP: ' . $ip);
});
if ($count >= 15) {
abort();
}
} }
} }

2
app/Services/PaymentService.php
View File

@ -193,7 +193,7 @@ class PaymentService extends BaseService
$successful = 0; $successful = 0;
foreach ($payments as $payment) { foreach ($payments as $payment) {
if (Auth::user()->can('edit', $payment)) { if (Auth::user()->can('edit', $payment) && !$payment->is_deleted) {
$amount = ! empty($params['refund_amount']) ? floatval($params['refund_amount']) : null; $amount = ! empty($params['refund_amount']) ? floatval($params['refund_amount']) : null;
$sendEmail = ! empty($params['refund_email']) ? boolval($params['refund_email']) : false; $sendEmail = ! empty($params['refund_email']) ? boolval($params['refund_email']) : false;
$paymentDriver = false; $paymentDriver = false;

2
docs/install.rst
View File

@ -42,7 +42,7 @@ You can either download the zip file below or checkout the code from our GitHub
https://download.invoiceninja.com https://download.invoiceninja.com
.. Note:: All Pro and Enterprise features from our hosted app are included in both the zip file and the GitHub repository. We offer a $20 per year white-label license to remove our branding. .. Note:: All Pro and Enterprise features from our hosted app are included in both the zip file and the GitHub repository. We offer a $30 per year white-label license to remove our branding.
- Release Notes: `github.com/invoiceninja/invoiceninja/releases <https://github.com/invoiceninja/invoiceninja/releases>`_ - Release Notes: `github.com/invoiceninja/invoiceninja/releases <https://github.com/invoiceninja/invoiceninja/releases>`_