mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 10:04:35 -04:00
Fixes for purging company data
This commit is contained in:
parent
852fe26cc1
commit
c1352e700d
@ -179,6 +179,7 @@ class MigrationController extends BaseController
|
|||||||
$company->tasks()->forceDelete();
|
$company->tasks()->forceDelete();
|
||||||
$company->vendors()->forceDelete();
|
$company->vendors()->forceDelete();
|
||||||
$company->expenses()->forceDelete();
|
$company->expenses()->forceDelete();
|
||||||
|
$company->purchase_orders()->forceDelete();
|
||||||
|
|
||||||
$settings = $company->settings;
|
$settings = $company->settings;
|
||||||
|
|
||||||
@ -196,6 +197,7 @@ class MigrationController extends BaseController
|
|||||||
$settings->ticket_number_counter = 1;
|
$settings->ticket_number_counter = 1;
|
||||||
$settings->payment_number_counter = 1;
|
$settings->payment_number_counter = 1;
|
||||||
$settings->project_number_counter = 1;
|
$settings->project_number_counter = 1;
|
||||||
|
$settings->purchase_order_number_counter = 1;
|
||||||
|
|
||||||
$company->settings = $settings;
|
$company->settings = $settings;
|
||||||
|
|
||||||
|
@ -63,10 +63,6 @@ class StoreCompanyRequest extends Request
|
|||||||
{
|
{
|
||||||
$input = $this->all();
|
$input = $this->all();
|
||||||
|
|
||||||
//https not sure i should be forcing this.
|
|
||||||
// if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1)
|
|
||||||
// $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']);
|
|
||||||
|
|
||||||
if (array_key_exists('google_analytics_url', $input)) {
|
if (array_key_exists('google_analytics_url', $input)) {
|
||||||
$input['google_analytics_key'] = $input['google_analytics_url'];
|
$input['google_analytics_key'] = $input['google_analytics_url'];
|
||||||
}
|
}
|
||||||
|
@ -458,7 +458,7 @@ class CompanyImport implements ShouldQueue
|
|||||||
$settings->ticket_number_counter = 1;
|
$settings->ticket_number_counter = 1;
|
||||||
$settings->payment_number_counter = 1;
|
$settings->payment_number_counter = 1;
|
||||||
$settings->project_number_counter = 1;
|
$settings->project_number_counter = 1;
|
||||||
$settings->purchase_order_counter = 1;
|
$settings->purchase_order_number_counter = 1;
|
||||||
$this->company->settings = $co->settings;
|
$this->company->settings = $co->settings;
|
||||||
// $this->company->settings = $this->backup_file->company->settings;
|
// $this->company->settings = $this->backup_file->company->settings;
|
||||||
$this->company->save();
|
$this->company->save();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user