Muhammad Iqbal Afandi пре 3 година
родитељ
комит
9764260f6c

+ 1
- 1
app/Http/Controllers/CustomerController.php Прегледај датотеку

@@ -21,7 +21,7 @@ class CustomerController extends Controller
21 21
     public function index()
22 22
     {
23 23
         return inertia("Customers/Index", [
24
-            "initialSearch" => request("search"),
24
+            "initialFilters" => request()->only("search"),
25 25
             "customers" => Customer::search(request()->only("search"))
26 26
                 ->latest()
27 27
                 ->paginate(10)

+ 1
- 1
app/Http/Controllers/ProductController.php Прегледај датотеку

@@ -22,7 +22,7 @@ class ProductController extends Controller
22 22
     public function index()
23 23
     {
24 24
         return inertia("Products/Index", [
25
-            "initialSearch" => request("search"),
25
+            "initialFilters" => request()->only("search"),
26 26
             "products" => Product::search(request()->only("search"))
27 27
                 ->latest()
28 28
                 ->paginate(10)

+ 8
- 4
app/Http/Controllers/PurchaseController.php Прегледај датотеку

@@ -34,7 +34,7 @@ class PurchaseController extends Controller
34 34
     public function index()
35 35
     {
36 36
         return inertia("Purchases/Index", [
37
-            "initialSearch" => request("search"),
37
+            "initialFilters" => request()->only("search"),
38 38
             "purchases" => Purchase::search(request()->only("search"))
39 39
                 ->latest()
40 40
                 ->paginate(10)
@@ -359,9 +359,13 @@ class PurchaseController extends Controller
359 359
     public function report()
360 360
     {
361 361
         return inertia("Purchases/Report", [
362
-            "initialFilters" => request()->only("start_date", "end_date"),
362
+            "initialFilters" => request()->only(
363
+                "start_date",
364
+                "end_date",
365
+                "status"
366
+            ),
363 367
             "purchases" => PurchaseDetail::filter(
364
-                request()->only("start_date", "end_date")
368
+                request()->only("start_date", "end_date", "status")
365 369
             )
366 370
                 ->latest()
367 371
                 ->paginate(10)
@@ -383,7 +387,7 @@ class PurchaseController extends Controller
383 387
     {
384 388
         return new PurchaseDetailsExport([
385 389
             "purchases" => PurchaseDetail::filter(
386
-                request()->only("start_date", "end_date")
390
+                request()->only("start_date", "end_date", "status")
387 391
             )
388 392
                 ->latest()
389 393
                 ->get()

+ 1
- 1
app/Http/Controllers/SalesController.php Прегледај датотеку

@@ -33,7 +33,7 @@ class SalesController extends Controller
33 33
     public function index()
34 34
     {
35 35
         return inertia("Sales/Index", [
36
-            "initialSearch" => request("search"),
36
+            "initialFilters" => request()->only("search"),
37 37
             "sales" => Sale::search(request()->only("search"))
38 38
                 ->latest()
39 39
                 ->paginate(10)

+ 1
- 1
app/Http/Controllers/StockProductController.php Прегледај датотеку

@@ -21,7 +21,7 @@ class StockProductController extends Controller
21 21
     public function index()
22 22
     {
23 23
         return inertia("StockProducts/Index", [
24
-            "initialSearch" => request("search"),
24
+            "initialFilters" => request()->only("search"),
25 25
             "stockProducts" => StockProduct::search(request()->only("search"))
26 26
                 ->latest()
27 27
                 ->paginate(10)

+ 1
- 1
app/Http/Controllers/SupplierController.php Прегледај датотеку

@@ -21,7 +21,7 @@ class SupplierController extends Controller
21 21
     public function index()
22 22
     {
23 23
         return inertia("Suppliers/Index", [
24
-            "initialSearch" => request("search"),
24
+            "initialFilters" => request()->only("search"),
25 25
             "suppliers" => Supplier::search(request()->only("search"))
26 26
                 ->latest()
27 27
                 ->paginate(10)

+ 1
- 1
app/Http/Controllers/UserController.php Прегледај датотеку

@@ -25,7 +25,7 @@ class UserController extends Controller
25 25
     public function index()
26 26
     {
27 27
         return inertia("Users/Index", [
28
-            "initialSearch" => request("search"),
28
+            "initialFilters" => request()->only("search"),
29 29
             "users" => User::search(request()->only("search"))
30 30
                 ->latest()
31 31
                 ->paginate(10)

+ 5
- 0
app/Models/PurchaseDetail.php Прегледај датотеку

@@ -70,6 +70,11 @@ class PurchaseDetail extends Model
70 70
             })
71 71
             ->when($filters["end_date"] ?? null, function ($query, $search) {
72 72
                 $query->whereDate("created_at", "<=", $search);
73
+            })
74
+            ->when($filters["status"] ?? null, function ($query, $search) {
75
+                $query->whereHas("purchase", function ($query) use ($search) {
76
+                    $query->where("status", $search);
77
+                });
73 78
             });
74 79
     }
75 80
 }

+ 3
- 2
resources/js/pages/Customers/Index.vue Прегледај датотеку

@@ -8,8 +8,8 @@ import AppPagination from '@/components/AppPagination.vue'
8 8
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
9 9
 
10 10
 defineProps({
11
+  initialFilters: Object,
11 12
   customers: Object,
12
-  initialSearch: String,
13 13
 })
14 14
 
15 15
 const deleteConfirm = useConfirm()
@@ -48,7 +48,8 @@ const onDelete = (data) => {
48 48
               <AppSearchFilter
49 49
                 class="w-full md:w-27rem"
50 50
                 placeholder="nama, no hp, npwp"
51
-                :initial-search="initialSearch"
51
+                name-param="search"
52
+                :initial-search="initialFilters"
52 53
               />
53 54
             </div>
54 55
           </div>

+ 3
- 2
resources/js/pages/Products/Index.vue Прегледај датотеку

@@ -8,8 +8,8 @@ import AppPagination from '@/components/AppPagination.vue'
8 8
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
9 9
 
10 10
 defineProps({
11
+  initialFilters: Object,
11 12
   products: Object,
12
-  initialSearch: String,
13 13
 })
14 14
 
15 15
 const deleteConfirm = useConfirm()
@@ -48,7 +48,8 @@ const onDelete = (data) => {
48 48
               <AppSearchFilter
49 49
                 class="w-full md:w-27rem"
50 50
                 placeholder="nomor, nama"
51
-                :initial-search="initialSearch"
51
+                name-param="search"
52
+                :initial-search="initialFilters"
52 53
               />
53 54
             </div>
54 55
           </div>

+ 3
- 2
resources/js/pages/Purchases/Index.vue Прегледај датотеку

@@ -6,8 +6,8 @@ import AppPagination from '@/components/AppPagination.vue'
6 6
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
7 7
 
8 8
 defineProps({
9
+  initialFilters: Object,
9 10
   purchases: Object,
10
-  initialSearch: String,
11 11
 })
12 12
 </script>
13 13
 
@@ -28,7 +28,8 @@ defineProps({
28 28
             <AppSearchFilter
29 29
               class="w-full md:w-27rem"
30 30
               placeholder="nama, email, no hp, status"
31
-              :initial-search="initialSearch"
31
+              name-param="search"
32
+              :initial-search="initialFilters"
32 33
             />
33 34
           </div>
34 35
 

+ 3
- 2
resources/js/pages/Sales/Index.vue Прегледај датотеку

@@ -6,8 +6,8 @@ import AppPagination from '@/components/AppPagination.vue'
6 6
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
7 7
 
8 8
 defineProps({
9
+  initialFilters: Object,
9 10
   sales: Object,
10
-  initialSearch: String,
11 11
 })
12 12
 </script>
13 13
 
@@ -29,7 +29,8 @@ defineProps({
29 29
               <AppSearchFilter
30 30
                 class="w-full md:w-27rem"
31 31
                 placeholder="nama, no hp, status"
32
-                :initial-search="initialSearch"
32
+                name-param="search"
33
+                :initial-search="initialFilters"
33 34
               />
34 35
             </div>
35 36
           </div>

+ 3
- 2
resources/js/pages/StockProducts/Index.vue Прегледај датотеку

@@ -6,7 +6,7 @@ import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
6 6
 
7 7
 defineProps({
8 8
   stockProducts: Object,
9
-  initialSearch: String,
9
+  initialFilters: Object,
10 10
 })
11 11
 </script>
12 12
 
@@ -25,7 +25,8 @@ defineProps({
25 25
         <AppSearchFilter
26 26
           class="w-full md:w-27rem"
27 27
           placeholder="nama"
28
-          :initial-search="initialSearch"
28
+          name-param="search"
29
+          :initial-search="initialFilters"
29 30
         />
30 31
       </template>
31 32
 

+ 3
- 2
resources/js/pages/Suppliers/Index.vue Прегледај датотеку

@@ -8,8 +8,8 @@ import AppPagination from '@/components/AppPagination.vue'
8 8
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
9 9
 
10 10
 defineProps({
11
+  initialFilters: Object,
11 12
   suppliers: Object,
12
-  initialSearch: String,
13 13
 })
14 14
 
15 15
 const deleteConfirm = useConfirm()
@@ -48,7 +48,8 @@ const onDelete = (data) => {
48 48
               <AppSearchFilter
49 49
                 class="w-full md:w-27rem"
50 50
                 placeholder="nama, no hp, npwp"
51
-                :initial-search="initialSearch"
51
+                name-param="search"
52
+                :initial-search="initialFilters"
52 53
               />
53 54
             </div>
54 55
           </div>

+ 3
- 2
resources/js/pages/Users/Index.vue Прегледај датотеку

@@ -8,8 +8,8 @@ import AppPagination from '@/components/AppPagination.vue'
8 8
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
9 9
 
10 10
 defineProps({
11
+  initialFilters: Object,
11 12
   users: Object,
12
-  initialSearch: String,
13 13
 })
14 14
 
15 15
 const resetConfirm = useConfirm()
@@ -65,7 +65,8 @@ const onDelete = (data) => {
65 65
               <AppSearchFilter
66 66
                 class="w-full md:w-27rem"
67 67
                 placeholder="nama, nama pengguna"
68
-                :initialSearch="initialSearch"
68
+                name-param="search"
69
+                :initialSearch="initialFilters"
69 70
               />
70 71
             </div>
71 72
           </div>