From 0be5144254c10fd0bd080a1519aee028385c22bd Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Sat, 8 Oct 2022 12:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E6=89=A3=E8=B4=B9=E3=80=82=20ToDo:=20=E6=9C=88=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E8=87=AA=E5=8A=A8=E6=89=A3=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Remote/Host/HostController.php            |  5 +-
 .../Controllers/User/BalanceController.php    | 15 +++-
 app/Http/Controllers/User/HostController.php  | 81 -------------------
 3 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/app/Http/Controllers/Remote/Host/HostController.php b/app/Http/Controllers/Remote/Host/HostController.php
index 969ded3..cc89a52 100644
--- a/app/Http/Controllers/Remote/Host/HostController.php
+++ b/app/Http/Controllers/Remote/Host/HostController.php
@@ -102,10 +102,7 @@ public function update(Request $request, Host $host)
         }
 
 
-        $update = $request->all();
-        // module_id 不能被更新
-        unset($update['module_id']);
-        unset($update['user_id']);
+        $update = $request->except(['module_id', 'user_id']);
 
         $host->update($update);
 
diff --git a/app/Http/Controllers/User/BalanceController.php b/app/Http/Controllers/User/BalanceController.php
index 319d76a..08c81ba 100644
--- a/app/Http/Controllers/User/BalanceController.php
+++ b/app/Http/Controllers/User/BalanceController.php
@@ -184,9 +184,20 @@ public function checkAndCharge(Balance $balance)
     // }
 
 
-    public function transactions()
+    public function transactions(Request $request)
     {
-        $transactions = Transaction::thisUser()->latest()->simplePaginate(30);
+        $transactions = Transaction::thisUser();
+
+
+        if ($request->has('type')) {
+            $transactions = $transactions->where('type', $request->type);
+        }
+
+        if ($request->has('payment')) {
+            $transactions = $transactions->where('payment', $request->payment);
+        }
+
+        $transactions = $transactions->latest()->simplePaginate(30);
 
         return $this->success($transactions);
     }
diff --git a/app/Http/Controllers/User/HostController.php b/app/Http/Controllers/User/HostController.php
index da16cb8..6f8acba 100644
--- a/app/Http/Controllers/User/HostController.php
+++ b/app/Http/Controllers/User/HostController.php
@@ -70,85 +70,4 @@ public function usages()
 
         return $this->success($hosts_drops);
     }
-
-    // /**
-    //  * Store a newly created resource in storage.
-    //  *
-    //  * @param  \Illuminate\Http\Request  $request
-    //  * @return \Illuminate\Http\Response
-    //  */
-    // public function store(Request $request, Module $module)
-    // {
-    //     // User create host
-    //     $this->validate($request, [
-    //         'name' => 'required|max:255',
-    //         'configuration' => 'required|json',
-    //     ]);
-
-    //     $data = [
-    //         'name' => $request->name,
-    //         'module_id' => $module->id,
-    //         'configuration' => $request->configuration ?? [],
-    //     ];
-
-
-    //     // if (!$data['confirm']) {
-    //     //     $data['confirm'] = false;
-
-    //     // }
-
-    //     // $calc = $module->remotePost('/hosts', ['data' => $data]);
-    //     // $data['price'] = $calc[0]['data']['price'];
-
-    //     $host = Host::create($data);
-    //     return $this->created($host);
-
-    //     // if ($request->confirm) {
-    //     //     $host = Host::create($data);
-    //     //     return $this->created($host);
-    //     // } else {
-    //     //     // return $this->apiResponse($calc[0]['data'], $calc[1]);
-    //     // }
-
-
-
-    //     // // post to module
-    //     // $host = $module->hosts()->create([
-    //     //     'name' => $request->name,
-    //     //     'configuration' => $request->configuration,
-    //     // ]);
-    // }
-
-    // /**
-    //  * Display the specified resource.
-    //  *
-    //  * @param  int  $id
-    //  * @return \Illuminate\Http\Response
-    //  */
-    // public function show()
-    // {
-    // }
-
-    // /**
-    //  * Update the specified resource in storage.
-    //  *
-    //  * @param  \Illuminate\Http\Request  $request
-    //  * @param  int  $id
-    //  * @return \Illuminate\Http\Response
-    //  */
-    // public function update(Request $request, $id)
-    // {
-    //     //
-    // }
-
-    // /**
-    //  * Remove the specified resource from storage.
-    //  *
-    //  * @param  int  $id
-    //  * @return \Illuminate\Http\Response
-    //  */
-    // public function destroy($id)
-    // {
-    //     //
-    // }
 }