From 79ed0abf6bafa9a8ca11cb200d47b0d1bb50df2b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 17 Jul 2024 09:18:08 +1000 Subject: [PATCH] Add dubai timezone --- app/Models/Activity.php | 31 ++++++++++++++++ ...6_231556_2024_07_17_add_dubai_timezone.php | 37 +++++++++++++++++++ database/seeders/ConstantsSeeder.php | 1 + 3 files changed, 69 insertions(+) create mode 100644 database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 13e52f5619ac..23804b0812f4 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -449,10 +449,41 @@ class Activity extends StaticModel $replacements['created_at'] = $this->created_at ?? ''; $replacements['ip'] = $this->ip ?? ''; + if($this->activity_type_id == 141) + $replacements = $this->harvestNoteEntities($replacements); + return $replacements; } + private function harvestNoteEntities(array $replacements): array + { + $entities = [ + ':invoice', + ':quote', + ':credit', + ':payment', + ':task', + ':expense', + ':purchase_order', + ':recurring_invoice', + ':recurring_expense', + ':client', + + ]; + + foreach($entities as $entity) + { + $entity_key = substr($entity, 1); + + if($this?->{$entity_key}) + $replacements = array_merge($replacements, $this->matchVar($entity)); + + } + + return $replacements; + } + private function matchVar(string $variable) { $system = ctrans('texts.system'); diff --git a/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php b/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php new file mode 100644 index 000000000000..6ee5ff904ed0 --- /dev/null +++ b/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php @@ -0,0 +1,37 @@ +id = 115; + $t->name = 'Asia/Dubai'; + $t->location = '(GMT+04:00) Dubai'; + $t->utc_offset = 14400; + $t->save(); + + } + + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/database/seeders/ConstantsSeeder.php b/database/seeders/ConstantsSeeder.php index a1e4410367f0..eb5e99cc573b 100644 --- a/database/seeders/ConstantsSeeder.php +++ b/database/seeders/ConstantsSeeder.php @@ -151,6 +151,7 @@ class ConstantsSeeder extends Seeder $timezones[] = ['name'=>'Asia/Magadan', 'location' => '(GMT+12:00) Magadan', 'utc_offset' => 43200]; $timezones[] = ['name'=>'Pacific/Auckland', 'location' => '(GMT+12:00) Auckland', 'utc_offset' => 43200]; $timezones[] = ['name'=>'Pacific/Fiji', 'location' => '(GMT+12:00) Fiji', 'utc_offset' => 43200]; + $timezones[] = ['name' => 'Asia/Dubai', 'location' => '(GMT+04:00) Dubai', 'utc_offset' => 14400]; $x = 1; foreach ($timezones as $timezone) {