diff --git a/VERSION.txt b/VERSION.txt index 2d6c4a57a9..e18fa77e6d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.11.81 \ No newline at end of file +5.11.82 \ No newline at end of file diff --git a/app/Import/Providers/Wave.php b/app/Import/Providers/Wave.php index 7ad1ae6c03..aac49d2a7a 100644 --- a/app/Import/Providers/Wave.php +++ b/app/Import/Providers/Wave.php @@ -210,7 +210,7 @@ class Wave extends BaseImport implements ImportInterface $key = 'Transaction ID'; foreach ($csvData as $expense) { - if ($expense['Account Group'] == 'Expense') { + if (isset($expense['Account Group']) &&$expense['Account Group'] == 'Expense') { $grouped[$expense[$key]][] = $expense; } } diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 530d7bf80b..3999c7d506 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -714,7 +714,7 @@ class CompanyExport implements ShouldQueue try { $content = $backup->getFile(); - if ($content === false) { + if ($content === false || is_null($content)) { continue; } diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php index 5421621037..c82d7ec44e 100644 --- a/app/Utils/Statics.php +++ b/app/Utils/Statics.php @@ -34,7 +34,7 @@ class Statics ['format' => 'Y-m-d', 'picker_format' => 'yyyy-mm-dd', 'format_moment' => 'YYYY-MM-DD', 'format_dart' => 'yyyy-MM-dd'], ['format' => 'd-m-Y', 'picker_format' => 'dd-mm-yyyy', 'format_moment' => 'DD-MM-YYYY', 'format_dart' => 'dd-MM-yyyy'], ['format' => 'm/d/Y', 'picker_format' => 'mm/dd/yyyy', 'format_moment' => 'MM/DD/YYYY', 'format_dart' => 'MM/dd/yyyy'], - ['format' => 'd.m.Y', 'picker_format' => 'dd.mm.yyyy', 'format_moment' => 'D.MM.YYYY', 'format_dart' => 'dd.MM.yyyy'], + ['format' => 'd.m.Y', 'picker_format' => 'dd.mm.yyyy', 'format_moment' => 'DD.MM.YYYY', 'format_dart' => 'dd.MM.yyyy'], ['format' => 'j. M. Y', 'picker_format' => 'd. M. yyyy', 'format_moment' => 'DD. MMM. YYYY', 'format_dart' => 'd. MMM. yyyy'], ['format' => 'j. F Y', 'picker_format' => 'd. MM yyyy', 'format_moment' => 'DD. MMMM YYYY', 'format_dart' => 'd. MMMM yyyy'], ]; @@ -54,7 +54,7 @@ class Statics ['format' => 'Y-m-d g:i a', 'format_moment' => 'YYYY-MM-DD h:mm:ss a', 'format_dart' => 'yyyy-MM-dd h:mm a'], ['format' => 'd-m-Y g:i a', 'format_moment' => 'DD-MM-YYYY h:mm:ss a', 'format_dart' => 'dd-MM-yyyy h:mm a'], ['format' => 'm/d/Y g:i a', 'format_moment' => 'MM/DD/YYYY h:mm:ss a', 'format_dart' => 'MM/dd/yyyy h:mm a'], - ['format' => 'd.m.Y g:i a', 'format_moment' => 'D.MM.YYYY h:mm:ss a', 'format_dart' => 'dd.MM.yyyy h:mm a'], + ['format' => 'd.m.Y g:i a', 'format_moment' => 'DD.MM.YYYY h:mm:ss a', 'format_dart' => 'dd.MM.yyyy h:mm a'], ['format' => 'j. M. Y g:i a', 'format_moment' => 'DD. MMM. YYYY h:mm:ss a', 'format_dart' => 'd. MMM. yyyy h:mm a'], ['format' => 'j. F Y g:i a', 'format_moment' => 'DD. MMMM YYYY h:mm:ss a', 'format_dart' => 'd. MMMM yyyy h:mm a'], ]; diff --git a/config/ninja.php b/config/ninja.php index 58bd1b184b..73c35dce7e 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.11.81'), - 'app_tag' => env('APP_TAG', '5.11.81'), + 'app_version' => env('APP_VERSION', '5.11.82'), + 'app_tag' => env('APP_TAG', '5.11.82'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/config/queue.php b/config/queue.php index b33b172232..af31b50528 100644 --- a/config/queue.php +++ b/config/queue.php @@ -89,7 +89,7 @@ return [ */ 'failed' => [ - 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), + 'driver' => env('QUEUE_FAILED_DRIVER', null), 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], diff --git a/database/migrations/2025_06_02_233158_update_date_format_for_d_m_y.php b/database/migrations/2025_06_02_233158_update_date_format_for_d_m_y.php new file mode 100644 index 0000000000..a0446bf680 --- /dev/null +++ b/database/migrations/2025_06_02_233158_update_date_format_for_d_m_y.php @@ -0,0 +1,37 @@ +first()){ + $date_format->format_moment = 'DD.MM.YYYY'; + $date_format->save(); + } + + + if ($date_format = DatetimeFormat::find(11)) { + $date_format->format_moment = 'DD.MM.YYYY h:mm:ss a'; + $date_format->save(); + } + + + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/database/seeders/DateFormatsSeeder.php b/database/seeders/DateFormatsSeeder.php index 2dd48c8849..bffcf1a381 100644 --- a/database/seeders/DateFormatsSeeder.php +++ b/database/seeders/DateFormatsSeeder.php @@ -34,7 +34,7 @@ class DateFormatsSeeder extends Seeder ['id' => 8, 'format' => 'Y-m-d', 'format_moment' => 'YYYY-MM-DD', 'format_dart' => 'yyyy-MM-dd'], ['id' => 9, 'format' => 'd-m-Y', 'format_moment' => 'DD-MM-YYYY', 'format_dart' => 'dd-MM-yyyy'], ['id' => 10, 'format' => 'm/d/Y', 'format_moment' => 'MM/DD/YYYY', 'format_dart' => 'MM/dd/yyyy'], - ['id' => 11, 'format' => 'd.m.Y', 'format_moment' => 'D.MM.YYYY', 'format_dart' => 'dd.MM.yyyy'], + ['id' => 11, 'format' => 'd.m.Y', 'format_moment' => 'DD.MM.YYYY', 'format_dart' => 'dd.MM.yyyy'], ['id' => 12, 'format' => 'j. M. Y', 'format_moment' => 'DD. MMM. YYYY', 'format_dart' => 'd. MMM. yyyy'], ['id' => 13, 'format' => 'j. F Y', 'format_moment' => 'DD. MMMM YYYY', 'format_dart' => 'd. MMMM yyyy'], ['id' => 14, 'format' => 'd/m/Y', 'format_moment' => 'DD/MM/YYYY', 'format_dart' => 'dd/MM/yyyy'], @@ -66,7 +66,7 @@ class DateFormatsSeeder extends Seeder ['id' => 8, 'format' => 'Y-m-d g:i a', 'format_moment' => 'YYYY-MM-DD h:mm:ss a', 'format_dart' => 'yyyy-MM-dd h:mm a'], ['id' => 9, 'format' => 'd-m-Y g:i a', 'format_moment' => 'DD-MM-YYYY h:mm:ss a', 'format_dart' => 'dd-MM-yyyy h:mm a'], ['id' => 10, 'format' => 'm/d/Y g:i a', 'format_moment' => 'MM/DD/YYYY h:mm:ss a', 'format_dart' => 'MM/dd/yyyy h:mm a'], - ['id' => 11, 'format' => 'd.m.Y g:i a', 'format_moment' => 'D.MM.YYYY h:mm:ss a', 'format_dart' => 'dd.MM.yyyy h:mm a'], + ['id' => 11, 'format' => 'd.m.Y g:i a', 'format_moment' => 'DD.MM.YYYY h:mm:ss a', 'format_dart' => 'dd.MM.yyyy h:mm a'], ['id' => 12, 'format' => 'j. M. Y g:i a', 'format_moment' => 'DD. MMM. YYYY h:mm:ss a', 'format_dart' => 'd. MMM. yyyy h:mm a'], ['id' => 13, 'format' => 'j. F Y g:i a', 'format_moment' => 'DD. MMMM YYYY h:mm:ss a', 'format_dart' => 'd. MMMM yyyy h:mm a'], ['id' => 14, 'format' => 'd/m/Y g:i a', 'format_moment' => 'DD/MM/YYYY h:mm:ss a', 'format_dart' => 'dd/MM/yyyy h:mm a'],