mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #6510 from turbo124/v5-develop
FIxes for CompanyImport
This commit is contained in:
commit
0f9ce55899
@ -1 +1 @@
|
||||
5.3.0
|
||||
5.3.1
|
@ -768,7 +768,9 @@ class BaseController extends Controller
|
||||
case 'last':
|
||||
return 'main.last.dart.js';
|
||||
case 'next':
|
||||
return 'main.next.dart.js';
|
||||
return 'main.next.dart.js';
|
||||
case 'profile':
|
||||
return 'main.profile.dart.js';
|
||||
default:
|
||||
return 'main.dart.js';
|
||||
}
|
||||
|
@ -984,6 +984,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
$cu_array = (array)$cu;
|
||||
unset($cu_array['id']);
|
||||
unset($cu_array['company_id']);
|
||||
unset($cu_array['user_id']);
|
||||
|
||||
$new_cu = CompanyUser::firstOrNew(
|
||||
['user_id' => $user_id, 'company_id' => $this->company->id],
|
||||
@ -1102,6 +1104,18 @@ class CompanyImport implements ShouldQueue
|
||||
unset($obj_array[$un]);
|
||||
}
|
||||
|
||||
if($class instanceof CompanyGateway){
|
||||
|
||||
if(Ninja::isHosted() && $obj_array['gateway_key'] == 'd14dd26a37cecc30fdd65700bfb55b23'){
|
||||
$obj_array['gateway_key'] = 'd14dd26a47cecc30fdd65700bfb67b34';
|
||||
}
|
||||
|
||||
if(Ninja::isSelfHost() && $obj_array['gateway_key'] == 'd14dd26a47cecc30fdd65700bfb67b34'){
|
||||
$obj_array['gateway_key'] = 'd14dd26a37cecc30fdd65700bfb55b23';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$activity_invitation_key = false;
|
||||
|
||||
if($class == 'App\Models\Activity'){
|
||||
|
@ -95,6 +95,7 @@ class Company extends BaseModel
|
||||
'default_password_timeout',
|
||||
'show_task_end_date',
|
||||
'use_comma_as_decimal_place',
|
||||
'report_include_drafts',
|
||||
];
|
||||
|
||||
protected $hidden = [
|
||||
|
@ -161,6 +161,7 @@ class CompanyTransformer extends EntityTransformer
|
||||
'show_task_end_date' => (bool) $company->show_task_end_date,
|
||||
'markdown_enabled' => (bool) $company->markdown_enabled,
|
||||
'use_comma_as_decimal_place' => (bool) $company->use_comma_as_decimal_place,
|
||||
'report_include_drafts' => (bool) $company->report_include_drafts,
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -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.3.0',
|
||||
'app_tag' => '5.3.0',
|
||||
'app_version' => '5.3.1',
|
||||
'app_tag' => '5.3.1',
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', ''),
|
||||
|
@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class ReportIncludeDraftsInCompaniesTable extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('companies', function (Blueprint $table) {
|
||||
$table->boolean('report_include_drafts')->default(0);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user