diff --git a/VERSION.txt b/VERSION.txt index 34a36e75f9ff..6935e0e042d6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.28 \ No newline at end of file +5.1.29 \ No newline at end of file diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php index 03ef21bb33d8..afba9ba52f23 100644 --- a/app/PaymentDrivers/BaseDriver.php +++ b/app/PaymentDrivers/BaseDriver.php @@ -241,7 +241,7 @@ class BaseDriver extends AbstractPaymentDriver event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); - (new BillingSubscriptionService)->completePurchase($this->payment_hash); + //(new BillingSubscriptionService)->completePurchase($this->payment_hash); return $payment->service()->applyNumber()->save(); } diff --git a/app/Policies/CreditPolicy.php b/app/Policies/CreditPolicy.php index 74a24483d3c8..217018440d6b 100644 --- a/app/Policies/CreditPolicy.php +++ b/app/Policies/CreditPolicy.php @@ -11,6 +11,6 @@ class CreditPolicy extends EntityPolicy public function create(User $user) : bool { - return $user->isAdmin() || $user->hasPermission('create_quote') || $user->hasPermission('create_all'); + return $user->isAdmin() || $user->hasPermission('create_credit') || $user->hasPermission('create_all'); } } diff --git a/app/Policies/TaskPolicy.php b/app/Policies/TaskPolicy.php index 73ef91e47ff4..66605f623df0 100644 --- a/app/Policies/TaskPolicy.php +++ b/app/Policies/TaskPolicy.php @@ -20,6 +20,6 @@ class TaskPolicy extends EntityPolicy { public function create(User $user) : bool { - return $user->isAdmin(); + return $user->isAdmin() || $user->hasPermission('create_task') || $user->hasPermission('create_all'); } } diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php index 4620c29cdaf4..91455c16ea5c 100644 --- a/app/Utils/Traits/Notifications/UserNotifies.php +++ b/app/Utils/Traits/Notifications/UserNotifies.php @@ -34,7 +34,7 @@ trait UserNotifies array_push($required_permissions, 'all_user_notifications'); } - if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect($required_permissions, ['all_user_notifications'])) >= 1 || count(array_intersect($required_permissions, 'all_notifications')) >= 1) { + if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect($required_permissions, ['all_user_notifications'])) >= 1 || count(array_intersect($required_permissions, ['all_notifications'])) >= 1) { array_push($notifiable_methods, 'mail'); } diff --git a/config/ninja.php b/config/ninja.php index b8955bfe31f0..a5109ce77401 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -13,7 +13,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.28', + 'app_version' => '5.1.29', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php b/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php index 18e1e7241a42..1bf3e9c397cd 100644 --- a/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php +++ b/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php @@ -15,7 +15,7 @@ class AddInvoiceIdToClientSubscriptionsTable extends Migration { Schema::table('client_subscriptions', function (Blueprint $table) { $table->unsignedInteger('invoice_id')->nullable(); - + $table->unsignedInteger('quantity')->default(1); $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade')->onUpdate('cascade'); }); }