diff --git a/app/Console/Commands/SubdomainFill.php b/app/Console/Commands/SubdomainFill.php index fa4e7110f3b0..afa2624ae0e3 100644 --- a/app/Console/Commands/SubdomainFill.php +++ b/app/Console/Commands/SubdomainFill.php @@ -60,36 +60,36 @@ class SubdomainFill extends Command }); - $db1 = Company::on('db-ninja-01')->get(); + // $db1 = Company::on('db-ninja-01')->get(); - $db1->each(function ($company){ + // $db1->each(function ($company){ - $db2 = Company::on('db-ninja-02a')->find($company->id); + // $db2 = Company::on('db-ninja-02a')->find($company->id); - if($db2) - { - $db2->subdomain = $company->subdomain; - $db2->save(); - } + // if($db2) + // { + // $db2->subdomain = $company->subdomain; + // $db2->save(); + // } - }); + // }); - $db1 = null; - $db2 = null; + // $db1 = null; + // $db2 = null; - $db2 = Company::on('db-ninja-02')->get(); + // $db2 = Company::on('db-ninja-02')->get(); - $db2->each(function ($company){ + // $db2->each(function ($company){ - $db1 = Company::on('db-ninja-01a')->find($company->id); + // $db1 = Company::on('db-ninja-01a')->find($company->id); - if($db1) - { - $db1->subdomain = $company->subdomain; - $db1->save(); - } - }); + // if($db1) + // { + // $db1->subdomain = $company->subdomain; + // $db1->save(); + // } + // }); } } diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index e9a57d854d35..0350b61749ec 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -76,7 +76,7 @@ class RecurringInvoicesCron nlog(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db); $recurring_invoices->each(function ($recurring_invoice, $key) { - nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); + nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date ." Recurring #id = ". $recurring_invoice->id); if (!$recurring_invoice->company->is_disabled) { SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 4f45ba9a5959..e4bf9466ee8c 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -337,6 +337,10 @@ class Import implements ShouldQueue if(!MultiDB::checkDomainAvailable($data['subdomain'])) $data['subdomain'] = MultiDB::randomSubdomainGenerator(); + + if(strlen($data['subdomain']) == 0) + $data['subdomain'] = MultiDB::randomSubdomainGenerator(); + } $rules = (new UpdateCompanyRequest())->rules(); diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index 9bc48a63407d..7097b7f87375 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -56,6 +56,7 @@ class ReminderJob implements ShouldQueue nlog("Sending invoice reminders " . now()->format('Y-m-d h:i:s')); Invoice::where('next_send_date', '<=', now()->toDateTimeString()) + ->whereNull('deleted_at') ->where('is_deleted', 0) ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]) ->where('balance', '>', 0) diff --git a/app/Repositories/GroupSettingRepository.php b/app/Repositories/GroupSettingRepository.php index 2f6376908641..fdd5bb5e0d33 100644 --- a/app/Repositories/GroupSettingRepository.php +++ b/app/Repositories/GroupSettingRepository.php @@ -11,12 +11,14 @@ namespace App\Repositories; +use App\Models\Client; use App\Models\GroupSetting; class GroupSettingRepository extends BaseRepository { public function save($data, GroupSetting $group_setting) :?GroupSetting { + $group_setting->fill($data); $group_setting->save(); @@ -27,6 +29,15 @@ class GroupSettingRepository extends BaseRepository $group_setting->save(); } + nlog($data['settings']); + + if(count((array)$data['settings']) == 0){ + $settings = new \stdClass; + $settings->entity = Client::class; + $group_setting->settings = $settings; + $group_setting->save(); + } + return $group_setting; } }