diff --git a/app/Http/Controllers/HelperController.php b/app/Http/Controllers/HelperController.php index 1605d71..e0b372d 100755 --- a/app/Http/Controllers/HelperController.php +++ b/app/Http/Controllers/HelperController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Exports\RefundAmountExport; -use App\Imports\RefundAmountImport; use App\Jobs\TestJob; use App\Models\AgentPlus; use App\Models\ConfigWallet; @@ -18,9 +17,7 @@ use App\Traits\ApiResponser; use App\Traits\Helper; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Facades\Excel; -use Throwable; class HelperController extends Controller { @@ -193,32 +190,32 @@ class HelperController extends Controller return Excel::download($export, 'refund.xlsx'); } - public function fixTransactionAmount() - { - $data = Excel::toArray(new RefundAmountImport, storage_path('refund.xlsx')); - $result = []; - foreach ($data[0] as $key => $row) { - if ($key > 0) { - array_push($result, $row); - } - } - - try { - DB::beginTransaction(); - // Fix amount - foreach ($result as $r) { - if (isset($r[6])) { - $wallet = Wallet::find($r[0]); - $wallet->balance_com -= $r[6]; - $wallet->save(); - } - } - DB::commit(); - return $this->successResponse(trans('messages.success_treated_demand')); - } catch (Throwable $exception) { - DB::rollBack(); - Log::error($exception->getMessage()); - return $this->errorResponse(trans('errors.unexpected_error')); - } - } +// public function fixTransactionAmount() +// { +// $data = Excel::toArray(new RefundAmountImport, storage_path('refund.xlsx')); +// $result = []; +// foreach ($data[0] as $key => $row) { +// if ($key > 0) { +// array_push($result, $row); +// } +// } +// +// try { +// DB::beginTransaction(); +// // Fix amount +// foreach ($result as $r) { +// if (isset($r[6])) { +// $wallet = Wallet::find($r[0]); +// $wallet->balance_com -= $r[6]; +// $wallet->save(); +// } +// } +// DB::commit(); +// return $this->successResponse(trans('messages.success_treated_demand')); +// } catch (Throwable $exception) { +// DB::rollBack(); +// Log::error($exception->getMessage()); +// return $this->errorResponse(trans('errors.unexpected_error')); +// } +// } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 9b3ced8..bb257cc 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -247,8 +247,8 @@ class UserController extends Controller $this->validate($request, [ 'phone' => 'required', 'type' => 'required|in:user,agent', - 'oldPassword' => 'required', - 'newPassword' => 'required' +// 'oldPassword' => 'required', + 'newPassword' => 'required', ]); if ($request->type == 'user') { @@ -258,7 +258,7 @@ class UserController extends Controller $user = Agent::findOrFail($agent_plus->id); } - if (!$this->checkPassword($request->oldPassword, $user->encrypted_password, $user->salt)) + if ($request->has('oldPassword') && !$this->checkPassword($request->oldPassword, $user->encrypted_password, $user->salt)) return $this->errorResponse(trans('messages.incorrect_user_password')); $hash = $this->hashSSHA($request->newPassword); diff --git a/routes/web.php b/routes/web.php index 2e4c113..589f103 100755 --- a/routes/web.php +++ b/routes/web.php @@ -10,7 +10,6 @@ | and give it the Closure to call when that URI is requested. | */ -$router->get('fix-transactions-amount', 'HelperController@fixTransactionAmount'); //$router->get('/', function () use ($router) { // return $router->app->version(); //});