Merge pull request #24 from mageplaza/2.4-develop

2.4 develop
mageplaza · May 31, 2024 · eefb2e0 · eefb2e0
2 parents af98379 + b0d33e5
commit eefb2e0
Show file tree

Hide file tree

Showing 9 changed files with 977 additions and 38 deletions.
diff --git a/Block/Widget/Grid/Column/Renderer/Time.php b/Block/Widget/Grid/Column/Renderer/Time.php
@@ -60,13 +60,15 @@ protected function timeElapsedString($datetime, $full = false)
         $ago  = new DateTime($datetime);
         $diff = $now->diff($ago);
 
-        $diff->w = floor($diff->d / 7);
-        $diff->d -= $diff->w * 7;
+        if ($diff->d >= 7) {
+            $diff->w = floor($diff->d / 7);
+            $diff->d -= $diff->w * 7;
+            $string[] = ['w' => 'week'];
+        }
 
         $string = [
             'y' => 'year',
             'm' => 'month',
-            'w' => 'week',
             'd' => 'day',
             'h' => 'hour',
             'i' => 'minute',