Merge branch 'master' into huangfamily

app/common/repositories/finance/FinanceRepository.php

@@ -2081,6 +2081,16 @@ class FinanceRepository extends BaseRepository
                 case 'lately7':
                     $Db = $Db->where($prefix, 'between', [date('Y-m-d', strtotime("-7 day")), date('Y-m-d H:i:s')]);
                     break;
+                case 'thisWeek':
+                    $startOfWeek = strtotime("Monday this week");
+                    $endOfWeek = strtotime("Sunday this week");
+                    $Db = $Db->where($prefix, 'between', [date('Y-m-d', $startOfWeek), date('Y-m-d H:i:s', $endOfWeek)]);
+                    break;
+                case 'lastWeek':
+                    $startOfLastWeek = strtotime("Monday last week");
+                    $endOfLastWeek = strtotime("Sunday last week");
+                    $Db = $Db->where($prefix, 'between', [date('Y-m-d', $startOfLastWeek), date('Y-m-d H:i:s', $endOfLastWeek)]);
+                    break;
                 case 'lately30':
                     $Db = $Db->where($prefix, 'between', [date('Y-m-d', strtotime("-30 day")), date('Y-m-d H:i:s')]);
                     break;
@@ -2126,6 +2136,16 @@ class FinanceRepository extends BaseRepository
                 case 'lately7':
                     $Db = $Db->where($prefix, 'between', [strtotime("-7 day"), time()]);
                     break;
+                case 'thisWeek':
+                    $startOfWeek = strtotime("Monday this week");
+                    $endOfWeek = strtotime("Sunday this week");
+                    $Db = $Db->where($prefix, 'between', [ $startOfWeek, $endOfWeek]);
+                    break;
+                case 'lastWeek':
+                    $startOfLastWeek = strtotime("Monday last week");
+                    $endOfLastWeek = strtotime("Sunday last week");
+                    $Db = $Db->where($prefix, 'between', [ $startOfLastWeek, $endOfLastWeek]);
+                    break;
                 case 'lately30':
                     $Db = $Db->where($prefix, 'between', [strtotime("-30 day"), time()]);
                     break;