mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 05:02:36 +01:00
Fixes for white label
This commit is contained in:
David Bomba
parent
e7707a919b
commit
c16b2c193a
@ -1 +1 @@
|
||||
5.1.42
|
||||
5.1.43
|
||||
@ -14,6 +14,7 @@ namespace App\Models;
|
||||
use App\Models\Presenters\AccountPresenter;
|
||||
use App\Utils\Ninja;
|
||||
use App\Utils\Traits\MakesHash;
|
||||
use Carbon\Carbon;
|
||||
use DateTime;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Laracasts\Presenter\PresentableTrait;
|
||||
@ -257,8 +258,8 @@ class Account extends BaseModel
|
||||
$plan_active = true;
|
||||
$plan_expires = false;
|
||||
} else {
|
||||
$plan_expires = DateTime::createFromFormat('Y-m-d', $this->plan_expires);
|
||||
if ($plan_expires >= date_create()) {
|
||||
$plan_expires = Carbon::parse($this->plan_expires);
|
||||
if ($plan_expires->greaterThan(now())) {
|
||||
$plan_active = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,11 +36,11 @@
|
||||
"checkout/checkout-sdk-php": "^1.0",
|
||||
"cleverit/ubl_invoice": "^1.3",
|
||||
"coconutcraig/laravel-postmark": "^2.10",
|
||||
"codedge/laravel-selfupdater": "^3.2",
|
||||
"composer/composer": "^2",
|
||||
"turbo124/laravel-gmail": "^5",
|
||||
"doctrine/dbal": "^2.10",
|
||||
"fideloper/proxy": "^4.2",
|
||||
"fakerphp/faker": "^1.14",
|
||||
"fideloper/proxy": "^4.2",
|
||||
"google/apiclient": "^2.7",
|
||||
"guzzlehttp/guzzle": "^7.0.1",
|
||||
"hashids/hashids": "^4.0",
|
||||
@ -66,6 +66,7 @@
|
||||
"stripe/stripe-php": "^7.50",
|
||||
"symfony/http-client": "^5.2",
|
||||
"turbo124/beacon": "^1.0",
|
||||
"turbo124/laravel-gmail": "^5",
|
||||
"webpatser/laravel-countries": "dev-master#75992ad",
|
||||
"wildbit/swiftmailer-postmark": "^3.3"
|
||||
},
|
||||
|
||||
84
composer.lock
generated
84
composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "714b182e273c45676a21d1e4c6a08055",
|
||||
"content-hash": "56b8467dfddd19762a9124d0624a5003",
|
||||
"packages": [
|
||||
{
|
||||
"name": "authorizenet/authorizenet",
|
||||
@ -563,6 +563,88 @@
|
||||
],
|
||||
"time": "2021-02-24T13:45:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "codedge/laravel-selfupdater",
|
||||
"version": "3.2.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/codedge/laravel-selfupdater.git",
|
||||
"reference": "60bca20f30d36259ef5eff65bc84d0dcb61267f7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/60bca20f30d36259ef5eff65bc84d0dcb61267f7",
|
||||
"reference": "60bca20f30d36259ef5eff65bc84d0dcb61267f7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"ext-zip": "*",
|
||||
"guzzlehttp/guzzle": "6.* || 7.*",
|
||||
"laravel/framework": "^8.36.2",
|
||||
"php": "^7.3 || ^7.4 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"dg/bypass-finals": "^1.3",
|
||||
"mikey179/vfsstream": "^1.6",
|
||||
"mockery/mockery": "^1.4",
|
||||
"orchestra/testbench": "^6.17.0",
|
||||
"phpunit/phpunit": "^9.5.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"aliases": {
|
||||
"Updater": "Codedge\\Updater\\UpdaterFacade"
|
||||
},
|
||||
"providers": [
|
||||
"Codedge\\Updater\\UpdaterServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Codedge\\Updater\\": "src/"
|
||||
},
|
||||
"files": [
|
||||
"src/helpers.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Holger Lösken",
|
||||
"email": "holger.loesken@codedge.de",
|
||||
"homepage": "http://codedge.de",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "Providing an auto-updating functionality for your self-hosted Laravel application.",
|
||||
"keywords": [
|
||||
"auto update",
|
||||
"auto-update",
|
||||
"laravel",
|
||||
"laravel application",
|
||||
"self update",
|
||||
"self-hosted laravel application",
|
||||
"self-update",
|
||||
"update"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/codedge/laravel-selfupdater/issues",
|
||||
"source": "https://github.com/codedge/laravel-selfupdater"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/codedge",
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-04-09T08:47:03+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
"version": "1.2.9",
|
||||
|
||||
@ -14,8 +14,8 @@ return [
|
||||
'require_https' => env('REQUIRE_HTTPS', true),
|
||||
'app_url' => rtrim(env('APP_URL', ''), '/'),
|
||||
'app_domain' => env('APP_DOMAIN', ''),
|
||||
'app_version' => '5.1.42',
|
||||
'app_tag' => '5.1.42-release',
|
||||
'app_version' => '5.1.43',
|
||||
'app_tag' => '5.1.43-release',
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', false),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user