From b70c4ed6b59b4ed9104625f018aff354b1d48f23 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Wed, 20 Oct 2021 17:09:29 +0100 Subject: [PATCH] Remove FS services endpoint --- app/Http/Controllers/HelperController.php | 63 +++++++++++------------ app/Traits/Helper.php | 19 +++---- routes/web.php | 4 +- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/app/Http/Controllers/HelperController.php b/app/Http/Controllers/HelperController.php index 2ddff57..5c348fc 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,34 +190,34 @@ class HelperController extends Controller return Excel::download($export, 'refund.xlsx'); } - public function fixFSServicesAmounts() - { - $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])) { - if ($r[3] == 'hyper') continue; - $refund = $r[3] == 'geolocated' ? 50 * $r[5] : 25 * $r[5]; - $wallet = Wallet::find($r[0]); - $wallet->balance_com += $refund; - $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 fixFSServicesAmounts() +// { +// $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])) { +// if ($r[3] == 'hyper') continue; +// $refund = $r[3] == 'geolocated' ? 50 * $r[5] : 25 * $r[5]; +// $wallet = Wallet::find($r[0]); +// $wallet->balance_com += $refund; +// $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/Traits/Helper.php b/app/Traits/Helper.php index 0805280..bab1d64 100644 --- a/app/Traits/Helper.php +++ b/app/Traits/Helper.php @@ -34,6 +34,7 @@ use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; use PDO; +use Throwable; trait Helper { @@ -45,7 +46,7 @@ trait Helper $message->subject($title); $message->to($recipients); }); - } catch (\Throwable $t) { + } catch (Throwable $t) { Log::error('-------- Mail not sent -----------'); Log::error($t->getMessage()); } @@ -68,7 +69,7 @@ trait Helper $body->data = $data; try { $body->date = ($date instanceof \DateTime) ? $date->format('Y-m-d H:i:s') : $date; - } catch (\Throwable $t) { + } catch (Throwable $t) { Log::error($t->getMessage()); $body->date = $date; } @@ -83,7 +84,7 @@ trait Helper // ); $promise->wait(); // return $response->getBody()->getContents(); - } catch (\Throwable $t) { + } catch (Throwable $t) { Log::error('-------- User notification not sent-----------'); Log::error($t->getMessage()); } @@ -105,13 +106,13 @@ trait Helper $body->data = $data; try { $body->date = ($date instanceof \DateTime) ? $date->format('Y-m-d H:i:s') : $date; - } catch (\Throwable $t) { + } catch (Throwable $t) { Log::error($t->getMessage()); $body->date = $date; } $promise = $client->requestAsync('POST', '/onesignal/pushToAgent', ['json' => $body, 'headers' => $headers])->then(); $promise->wait(); - } catch (\Throwable $t) { + } catch (Throwable $t) { Log::error('-------- Agent notification not sent-----------'); Log::error($t->getMessage()); } @@ -148,20 +149,20 @@ trait Helper WHERE n.id = :id', ['id' => $id_network]))->first(); $money = Money::of(round($amount, 2), $currency ? $currency->code : 'XAF', new AutoContext()); - return $money->formatTo('fr_FR'); + return $money->formatTo(app()->getLocale()); } public function toMoney($amount, $id_country) { $country = Country::findOrFail($id_country); $money = Money::of(round($amount, 2), $country->currency->code, new AutoContext()); - return $money->formatTo('fr_FR'); + return $money->formatTo(app()->getLocale()); } public function toMoneyWithCurrencyCode($amount, $currency_code) { $money = Money::of(round($amount, 2), $currency_code, new AutoContext()); - return $money->formatTo('fr_FR'); + return $money->formatTo(app()->getLocale()); } private function convertMoney($amount, $init_country, $final_country) @@ -195,7 +196,7 @@ trait Helper public function toMoneyWithCurrency($amount, $init_country, $final_country) { - return $this->convertMoney($amount, $init_country, $final_country)->formatTo('fr_FR'); + return $this->convertMoney($amount, $init_country, $final_country)->formatTo(app()->getLocale()); } public function toMoneyAmount($amount, $init_country, $final_country) diff --git a/routes/web.php b/routes/web.php index 248e00f..dd91cbf 100755 --- a/routes/web.php +++ b/routes/web.php @@ -15,7 +15,7 @@ //}); $router->group(['prefix' => '', 'middleware' => 'auth'], function () use ($router) { // Helper routes - $router->get('fixFSServicesAmounts', 'HelperController@fixFSServicesAmounts'); +// $router->get('fixFSServicesAmounts', 'HelperController@fixFSServicesAmounts'); $router->post('update_password', 'UserController@updatePassword'); $router->get('agent_codes/{agent_code}', 'HelperController@agentCodes'); $router->get('countries', 'HelperController@countries'); @@ -35,7 +35,7 @@ $router->group(['prefix' => '', 'middleware' => 'auth'], function () use ($route $router->group(['prefix' => '/ilink'], function () use ($router) { $router->post('', 'iLinkTransactionController@add'); $router->post('commission', 'iLinkTransactionController@calculateCommission'); - $router->get('user/{id_wallet_user}', 'iLinkTransactionController@lastUserTransactions'); + $router->get('user/{id_user}', 'iLinkTransactionController@lastUserTransactions'); $router->get('agent/{id_wallet_agent}', 'iLinkTransactionController@lastAgentTransactions'); $router->post('check_retraits', 'iLinkTransactionController@getTransactionRetrait'); $router->delete('{id_transaction}', 'iLinkTransactionController@cancel');