Merge pull request #309 from webreinvent/2.x-hotfix/v2.3.4-v2

themodernpk · web-flow · commit 7149b584990d · 2025-11-04T15:50:47.000+05:30
2.x hotfix -&gt; 2.x | v2.3.4 v2
diff --git a/Config/vaahcms.php b/Config/vaahcms.php
@@ -8,7 +8,7 @@
 $settings =  [
     'app_name' => 'VaahCMS',
     'app_slug' => 'vaahcms',
-    'version' => '2.3.3',
+    'version' => '2.3.4',
     'php_version_required' => '8.1',
     'get_config_version' => false,
     'website' => 'https://vaah.dev/cms',
diff --git a/Models/BatchBase.php b/Models/BatchBase.php
@@ -37,7 +37,7 @@ class BatchBase extends Model
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
     }
diff --git a/Models/FailedJob.php b/Models/FailedJob.php
@@ -17,7 +17,7 @@ class FailedJob extends FailedJobBase
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
         return $date->format($date_time_format);
     }
 
diff --git a/Models/JobBase.php b/Models/JobBase.php
@@ -34,7 +34,7 @@ class JobBase extends Model
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/Language.php b/Models/Language.php
@@ -48,7 +48,7 @@ class Language extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/LanguageCategory.php b/Models/LanguageCategory.php
@@ -47,7 +47,7 @@ class LanguageCategory extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/LanguageString.php b/Models/LanguageString.php
@@ -50,7 +50,7 @@ class LanguageString extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/MediaBase.php b/Models/MediaBase.php
@@ -71,7 +71,7 @@ class MediaBase extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/Mediable.php b/Models/Mediable.php
@@ -49,7 +49,7 @@ class Mediable extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/Migration.php b/Models/Migration.php
@@ -33,7 +33,7 @@ class Migration extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ModuleBase.php b/Models/ModuleBase.php
@@ -51,7 +51,7 @@ class ModuleBase extends VaahModel
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
         return $date->format($date_time_format);
     }
 
diff --git a/Models/Notification.php b/Models/Notification.php
@@ -58,7 +58,7 @@ class Notification extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/NotificationContent.php b/Models/NotificationContent.php
@@ -44,7 +44,7 @@ class NotificationContent extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/Notified.php b/Models/Notified.php
@@ -50,7 +50,7 @@ class Notified extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/PermissionBase.php b/Models/PermissionBase.php
@@ -57,7 +57,7 @@ class PermissionBase extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/RegistrationBase.php b/Models/RegistrationBase.php
@@ -70,7 +70,7 @@ public function routeNotificationForMail($notification)
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/RoleBase.php b/Models/RoleBase.php
@@ -53,7 +53,7 @@ class RoleBase extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/Setting.php b/Models/Setting.php
@@ -38,7 +38,7 @@ class Setting extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/TaxonomyBase.php b/Models/TaxonomyBase.php
@@ -43,7 +43,7 @@ class TaxonomyBase extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/TaxonomyType.php b/Models/TaxonomyType.php
@@ -43,7 +43,7 @@ class TaxonomyType extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ThemeBase.php b/Models/ThemeBase.php
@@ -53,7 +53,7 @@ class ThemeBase extends VaahModel {
 
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ThemeBlock.php b/Models/ThemeBlock.php
@@ -34,7 +34,7 @@ class ThemeBlock extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ThemeLocation.php b/Models/ThemeLocation.php
@@ -44,7 +44,7 @@ class ThemeLocation extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ThemeTemplate.php b/Models/ThemeTemplate.php
@@ -44,7 +44,7 @@ class ThemeTemplate extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/ThemeTemplateField.php b/Models/ThemeTemplateField.php
@@ -42,7 +42,7 @@ class ThemeTemplateField extends VaahModel {
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/Models/UserBase.php b/Models/UserBase.php
@@ -81,7 +81,7 @@ class UserBase extends Authenticatable
     //-------------------------------------------------
     protected function serializeDate(DateTimeInterface $date)
     {
-        $date_time_format = config('settings.global.datetime_format');
+        $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');
 
         return $date->format($date_time_format);
 
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "webreinvent/vaahcms",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "description": "VaahCMS is a laravel based open-source web application development platform shipped with headless content management system.",
     "keywords": ["vaahcms", "headless", "hmvc", "laravel", "cms", "vue", "pinia"],
     "homepage": "https://webreinvent.com",

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class BatchBase extends Model`
`37`	`37`	`//-------------------------------------------------`
`38`	`38`	`protected function serializeDate(DateTimeInterface $date)`
`39`	`39`	`{`
`40`		`- $date_time_format = config('settings.global.datetime_format');`
	`40`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`41`	`41`
`42`	`42`	`return $date->format($date_time_format);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class FailedJob extends FailedJobBase`
`17`	`17`	`//-------------------------------------------------`
`18`	`18`	`protected function serializeDate(DateTimeInterface $date)`
`19`	`19`	`{`
`20`		`- $date_time_format = config('settings.global.datetime_format');`
	`20`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`21`	`21`	`return $date->format($date_time_format);`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class JobBase extends Model`
`34`	`34`	`//-------------------------------------------------`
`35`	`35`	`protected function serializeDate(DateTimeInterface $date)`
`36`	`36`	`{`
`37`		`- $date_time_format = config('settings.global.datetime_format');`
	`37`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`38`	`38`
`39`	`39`	`return $date->format($date_time_format);`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class Language extends VaahModel {`
`48`	`48`	`//-------------------------------------------------`
`49`	`49`	`protected function serializeDate(DateTimeInterface $date)`
`50`	`50`	`{`
`51`		`- $date_time_format = config('settings.global.datetime_format');`
	`51`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`52`	`52`
`53`	`53`	`return $date->format($date_time_format);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class LanguageCategory extends VaahModel {`
`47`	`47`	`//-------------------------------------------------`
`48`	`48`	`protected function serializeDate(DateTimeInterface $date)`
`49`	`49`	`{`
`50`		`- $date_time_format = config('settings.global.datetime_format');`
	`50`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`51`	`51`
`52`	`52`	`return $date->format($date_time_format);`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class LanguageString extends VaahModel {`
`50`	`50`	`//-------------------------------------------------`
`51`	`51`	`protected function serializeDate(DateTimeInterface $date)`
`52`	`52`	`{`
`53`		`- $date_time_format = config('settings.global.datetime_format');`
	`53`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`54`	`54`
`55`	`55`	`return $date->format($date_time_format);`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class MediaBase extends VaahModel {`
`71`	`71`	`//-------------------------------------------------`
`72`	`72`	`protected function serializeDate(DateTimeInterface $date)`
`73`	`73`	`{`
`74`		`- $date_time_format = config('settings.global.datetime_format');`
	`74`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`75`	`75`
`76`	`76`	`return $date->format($date_time_format);`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class Mediable extends VaahModel {`
`49`	`49`	`//-------------------------------------------------`
`50`	`50`	`protected function serializeDate(DateTimeInterface $date)`
`51`	`51`	`{`
`52`		`- $date_time_format = config('settings.global.datetime_format');`
	`52`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`53`	`53`
`54`	`54`	`return $date->format($date_time_format);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class Migration extends VaahModel {`
`33`	`33`	`//-------------------------------------------------`
`34`	`34`	`protected function serializeDate(DateTimeInterface $date)`
`35`	`35`	`{`
`36`		`- $date_time_format = config('settings.global.datetime_format');`
	`36`	`+ $date_time_format = config('settings.global.datetime_format','Y-m-d H:i:s');`
`37`	`37`
`38`	`38`	`return $date->format($date_time_format);`
`39`	`39`