Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add migration for mailgun

Browse Source
This commit is contained in:
David Bomba 2023-03-24 13:04:26 +11:00
parent 85577c6a10
commit a3fde9f1fc
5 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.98
5.5.99

3
app/DataMapper/CompanySettings.php
View File

@ -473,13 +473,10 @@ class CompanySettings extends BaseSettings
public $client_initiated_payments_minimum = 0;
// public $client_initiated_payments_recurring = false;
public $sync_invoice_quote_columns = true;
public static $casts = [
'mailgun_endpoint' => 'string',
// 'client_initiated_payments_recurring'=> 'bool',
'client_initiated_payments' => 'bool',
'client_initiated_payments_minimum' => 'float',
'sync_invoice_quote_columns' => 'bool',

1
app/Http/Controllers/ClientPortal/PrePaymentController.php
View File

@ -44,7 +44,6 @@ class PrePaymentController extends Controller
$data = [
'title' => ctrans('texts.amount'). " " .$client->currency()->code." (".auth()->guard('contact')->user()->client->currency()->symbol . ")",
// 'allows_recurring' => auth()->guard('contact')->user()->client->getSetting('client_initiated_payments_recurring'),
'allows_recurring' => true,
'minimum' => $minimum,
'minimum_amount' => $minimum_amount,

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.98',
'app_tag' => '5.5.98',
'app_version' => '5.5.99',
'app_tag' => '5.5.99',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

67
database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
View File

@ -1,5 +1,6 @@
<?php
use App\Models\Company;
use App\Libraries\MultiDB;
use App\Models\CompanyUser;
use Illuminate\Support\Facades\Schema;
@ -40,60 +41,36 @@ return new class extends Migration
Schema::table('schedulers', function (Blueprint $table) {
$table->string('name', 191)->nullable()->change();
});
CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
$permissions = $cu->permissions;
if (!$permissions || strlen($permissions) == 0) {
$permissions = 'view_reports';
$cu->permissions = $permissions;
$cu->save();
} else {
$permissions_array = explode(',', $permissions);
if (config('ninja.db.multi_db_enabled')) {
foreach (MultiDB::$dbs as $db) {
CompanyUser::on($db)->where('is_admin',0)->cursor()->each(function ($cu){
$permissions_array[] = 'view_reports';
$permissions = $cu->permissions;
$modified_permissions_string = implode(",", $permissions_array);
if (!$permissions || strlen($permissions) == 0) {
$permissions = 'view_reports';
$cu->permissions = $permissions;
$cu->save();
} else {
$permissions_array = explode(',', $permissions);
$permissions_array[] = 'view_reports';
$modified_permissions_string = implode(",", $permissions_array);
$cu->permissions = $modified_permissions_string;
$cu->save();
}
});
$cu->permissions = $modified_permissions_string;
$cu->save();
}
} else {
CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
$permissions = $cu->permissions;
});
if (!$permissions || strlen($permissions) == 0) {
$permissions = 'view_reports';
$cu->permissions = $permissions;
$cu->save();
} else {
$permissions_array = explode(',', $permissions);
Company::query()
->cursor()
->each(function (Company $company) {
$settings = $company->settings;
$permissions_array[] = 'view_reports';
$modified_permissions_string = implode(",", $permissions_array);
$cu->permissions = $modified_permissions_string;
$cu->save();
if (!property_exists($settings, 'mailgun_endpoint')) {
$company->saveSettings((array)$company->settings, $company);
}
});
}
}
/**