adminnistrateur
/
walletservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update reset password

This commit is contained in:
Djery-Tom 2021-10-07 15:32:01 +01:00
parent 02db72067d
commit 5522d81073
3 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/Http/Controllers/HelperController.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Exports\RefundAmountExport; use App\Exports\RefundAmountExport;
use App\Imports\RefundAmountImport;
use App\Jobs\TestJob; use App\Jobs\TestJob;
use App\Models\AgentPlus; use App\Models\AgentPlus;
use App\Models\ConfigWallet; use App\Models\ConfigWallet;
@ -18,9 +17,7 @@ use App\Traits\ApiResponser;
use App\Traits\Helper; use App\Traits\Helper;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use Throwable;
class HelperController extends Controller class HelperController extends Controller
{ {
@ -193,32 +190,32 @@ class HelperController extends Controller
return Excel::download($export, 'refund.xlsx'); return Excel::download($export, 'refund.xlsx');
} }
public function fixTransactionAmount() // public function fixTransactionAmount()
{ // {
$data = Excel::toArray(new RefundAmountImport, storage_path('refund.xlsx')); // $data = Excel::toArray(new RefundAmountImport, storage_path('refund.xlsx'));
$result = []; // $result = [];
foreach ($data[0] as $key => $row) { // foreach ($data[0] as $key => $row) {
if ($key > 0) { // if ($key > 0) {
array_push($result, $row); // array_push($result, $row);
} // }
} // }
//
try { // try {
DB::beginTransaction(); // DB::beginTransaction();
// Fix amount // // Fix amount
foreach ($result as $r) { // foreach ($result as $r) {
if (isset($r[6])) { // if (isset($r[6])) {
$wallet = Wallet::find($r[0]); // $wallet = Wallet::find($r[0]);
$wallet->balance_com -= $r[6]; // $wallet->balance_com -= $r[6];
$wallet->save(); // $wallet->save();
} // }
} // }
DB::commit(); // DB::commit();
return $this->successResponse(trans('messages.success_treated_demand')); // return $this->successResponse(trans('messages.success_treated_demand'));
} catch (Throwable $exception) { // } catch (Throwable $exception) {
DB::rollBack(); // DB::rollBack();
Log::error($exception->getMessage()); // Log::error($exception->getMessage());
return $this->errorResponse(trans('errors.unexpected_error')); // return $this->errorResponse(trans('errors.unexpected_error'));
} // }
} // }
} }

6
app/Http/Controllers/UserController.php
View File

@ -247,8 +247,8 @@ class UserController extends Controller
$this->validate($request, [ $this->validate($request, [
'phone' => 'required', 'phone' => 'required',
'type' => 'required|in:user,agent', 'type' => 'required|in:user,agent',
'oldPassword' => 'required', // 'oldPassword' => 'required',
'newPassword' => 'required' 'newPassword' => 'required',
]); ]);
if ($request->type == 'user') { if ($request->type == 'user') {
@ -258,7 +258,7 @@ class UserController extends Controller
$user = Agent::findOrFail($agent_plus->id); $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')); return $this->errorResponse(trans('messages.incorrect_user_password'));
$hash = $this->hashSSHA($request->newPassword); $hash = $this->hashSSHA($request->newPassword);

1
routes/web.php
View File

@ -10,7 +10,6 @@
| and give it the Closure to call when that URI is requested. | and give it the Closure to call when that URI is requested.
| |
*/ */
$router->get('fix-transactions-amount', 'HelperController@fixTransactionAmount');
//$router->get('/', function () use ($router) { //$router->get('/', function () use ($router) {
// return $router->app->version(); // return $router->app->version();
//}); //});