lip пре 1 недеља
родитељ
комит
6eae0290dd
2 измењених фајлова са 4 додато и 0 уклоњено
  1. 1 0
      app/Http/Controllers/admin/User.php
  2. 3 0
      app/Services/UserService.php

+ 1 - 0
app/Http/Controllers/admin/User.php

@@ -109,6 +109,7 @@ class User extends Controller
                 'user_code' => ['nullable'],
                 'user_code' => ['nullable'],
                 'agent_user_code' => ['nullable'],
                 'agent_user_code' => ['nullable'],
                 'level' => ['nullable'],
                 'level' => ['nullable'],
+                'from' => ['nullable'],
                 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
                 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
                 'recharge_channel_group_id' => ['nullable'],
                 'recharge_channel_group_id' => ['nullable'],

+ 3 - 0
app/Services/UserService.php

@@ -75,6 +75,9 @@ class UserService extends BaseService
         if (isset($search['level']) && !empty($search['level'])) {
         if (isset($search['level']) && !empty($search['level'])) {
             $where[] = ['users.level', '=', $search['level']];
             $where[] = ['users.level', '=', $search['level']];
         }
         }
+        if (isset($search['from']) && !empty($search['from'])) {
+            $where[] = ['users.from', '=', $search['from']];
+        }
         if (!empty($search['start_time'])) {
         if (!empty($search['start_time'])) {
             $startTime = $search['start_time'] . " 00:00:00";
             $startTime = $search['start_time'] . " 00:00:00";
             $where[] = ['users.created_at', '>=', $startTime];
             $where[] = ['users.created_at', '>=', $startTime];