From 33ff54f3a48ff22c77a5f2e56d91cd872d018fcc Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Fri, 22 May 2020 17:59:02 +0100 Subject: [PATCH] =?UTF-8?q?+=20Procedure=20de=20retrait=20bloqu=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 0 .env.example | 0 .gitignore | 0 .styleci.yml | 0 README.md | 0 app/Console/Commands/.gitkeep | 0 app/Console/Kernel.php | 0 app/Events/Event.php | 0 app/Events/ExampleEvent.php | 0 app/Exceptions/Handler.php | 0 app/Http/Controllers/CommissionController.php | 0 app/Http/Controllers/Controller.php | 0 app/Http/Controllers/CreditController.php | 0 app/Http/Controllers/ExampleController.php | 0 .../Controllers/TransactionController.php | 71 ++++++++++--------- app/Http/Controllers/WalletController.php | 0 app/Http/Middleware/Authenticate.php | 0 app/Http/Middleware/AuthenticateAccess.php | 0 app/Http/Middleware/ExampleMiddleware.php | 0 app/Http/Middleware/Localization.php | 0 app/Jobs/ExampleJob.php | 0 app/Jobs/Job.php | 0 app/Listeners/ExampleListener.php | 0 app/Models/AgentPlus.php | 0 app/Models/CodeGenerer.php | 0 app/Models/ConfigWallet.php | 0 app/Models/DemandeCredit.php | 0 app/Models/NetworksAgent.php | 0 app/Models/Wallet.php | 0 app/Models/WalletAgent.php | 0 app/Models/WalletTransaction.php | 2 +- app/Providers/AppServiceProvider.php | 0 app/Providers/AuthServiceProvider.php | 0 app/Providers/EventServiceProvider.php | 0 app/Traits/ApiResponser.php | 0 app/Twilio.php | 0 bootstrap/app.php | 0 composer.json | 0 composer.lock | 0 database/factories/ModelFactory.php | 0 database/migrations/.gitkeep | 0 database/seeds/DatabaseSeeder.php | 0 phpunit.xml | 0 public/.htaccess | 0 public/index.php | 0 resources/lang/en/errors.php | 3 +- resources/lang/en/messages.php | 0 resources/lang/fr/errors.php | 3 +- resources/lang/fr/messages.php | 0 resources/views/.gitkeep | 0 routes/web.php | 0 storage/app/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 tests/ExampleTest.php | 0 tests/TestCase.php | 0 58 files changed, 41 insertions(+), 38 deletions(-) mode change 100644 => 100755 .editorconfig mode change 100644 => 100755 .env.example mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .styleci.yml mode change 100644 => 100755 README.md mode change 100644 => 100755 app/Console/Commands/.gitkeep mode change 100644 => 100755 app/Console/Kernel.php mode change 100644 => 100755 app/Events/Event.php mode change 100644 => 100755 app/Events/ExampleEvent.php mode change 100644 => 100755 app/Exceptions/Handler.php mode change 100644 => 100755 app/Http/Controllers/CommissionController.php mode change 100644 => 100755 app/Http/Controllers/Controller.php mode change 100644 => 100755 app/Http/Controllers/CreditController.php mode change 100644 => 100755 app/Http/Controllers/ExampleController.php mode change 100644 => 100755 app/Http/Controllers/TransactionController.php mode change 100644 => 100755 app/Http/Controllers/WalletController.php mode change 100644 => 100755 app/Http/Middleware/Authenticate.php mode change 100644 => 100755 app/Http/Middleware/AuthenticateAccess.php mode change 100644 => 100755 app/Http/Middleware/ExampleMiddleware.php mode change 100644 => 100755 app/Http/Middleware/Localization.php mode change 100644 => 100755 app/Jobs/ExampleJob.php mode change 100644 => 100755 app/Jobs/Job.php mode change 100644 => 100755 app/Listeners/ExampleListener.php mode change 100644 => 100755 app/Models/AgentPlus.php mode change 100644 => 100755 app/Models/CodeGenerer.php mode change 100644 => 100755 app/Models/ConfigWallet.php mode change 100644 => 100755 app/Models/DemandeCredit.php mode change 100644 => 100755 app/Models/NetworksAgent.php mode change 100644 => 100755 app/Models/Wallet.php mode change 100644 => 100755 app/Models/WalletAgent.php mode change 100644 => 100755 app/Models/WalletTransaction.php mode change 100644 => 100755 app/Providers/AppServiceProvider.php mode change 100644 => 100755 app/Providers/AuthServiceProvider.php mode change 100644 => 100755 app/Providers/EventServiceProvider.php mode change 100644 => 100755 app/Traits/ApiResponser.php mode change 100644 => 100755 app/Twilio.php mode change 100644 => 100755 bootstrap/app.php mode change 100644 => 100755 composer.json mode change 100644 => 100755 composer.lock mode change 100644 => 100755 database/factories/ModelFactory.php mode change 100644 => 100755 database/migrations/.gitkeep mode change 100644 => 100755 database/seeds/DatabaseSeeder.php mode change 100644 => 100755 phpunit.xml mode change 100644 => 100755 public/.htaccess mode change 100644 => 100755 public/index.php mode change 100644 => 100755 resources/lang/en/errors.php mode change 100644 => 100755 resources/lang/en/messages.php mode change 100644 => 100755 resources/lang/fr/errors.php mode change 100644 => 100755 resources/lang/fr/messages.php mode change 100644 => 100755 resources/views/.gitkeep mode change 100644 => 100755 routes/web.php mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore mode change 100644 => 100755 tests/ExampleTest.php mode change 100644 => 100755 tests/TestCase.php diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.env.example b/.env.example old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.styleci.yml b/.styleci.yml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/app/Console/Commands/.gitkeep b/app/Console/Commands/.gitkeep old mode 100644 new mode 100755 diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php old mode 100644 new mode 100755 diff --git a/app/Events/Event.php b/app/Events/Event.php old mode 100644 new mode 100755 diff --git a/app/Events/ExampleEvent.php b/app/Events/ExampleEvent.php old mode 100644 new mode 100755 diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/CommissionController.php b/app/Http/Controllers/CommissionController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ExampleController.php b/app/Http/Controllers/ExampleController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php old mode 100644 new mode 100755 index b4453d3..ff299b4 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -103,41 +103,42 @@ class TransactionController extends Controller { // 12-05-20: Modif de Mr Manga : Le montant de la transaction c'est le montant de retrait sans les frais - $frais = $transaction->montant * $config->taux_com_client_retrait / 100; - - $response = $client->post('https://ilink-app.com/mobilebackendtest/interacted/MembersAction.php'); - $code = $response->getStatusCode(); - if($code == 200) { - //Requete vers la banque - // 1 ---> Emmètre via API sécurisé SSL une requête de retrait du - //(montant de la transaction + frais de transaction) pour débiter - //sa carte et créditer notre compte marchand - $montantRetrait = $transaction->montant + $frais; - - $banqueCommission = floatval($transaction->montant * $config->part_banque_retrait / 100); - $transaction->commission_banque = $banqueCommission; - // 2---> Emmètre via API sécurisé SSL une requête de débit de notre - //compte marchand du (montant de la transaction multiplié - //par la Part de la banque partenaire en % ) et créditer le - //compte des opérations défini avec notre banque partenaire - - $walletAgent->balance_princ += $transaction->montant; - - $agentCommission=floatval($transaction->montant*$config->taux_com_ag_retrait / 100); - $superviseurCommission=floatval($transaction->montant*$config->taux_com_sup_retrait / 100); - $hyperviseurCommission = $frais - $superviseurCommission - $agentCommission - $banqueCommission; - -// dd(array($hyperviseurCommission ,$superviseurCommission)); - $walletAgent->balance_com += $agentCommission; - $walletSuperviseur->balance_com += $superviseurCommission; - $walletHyperviseur->balance_com += $hyperviseurCommission; - - $transaction->id_wallet_sup = $walletSuperviseur->id; - $transaction->commission_sup = $superviseurCommission; - $transaction->id_wallet_hyp = $walletHyperviseur->id; - $transaction->commission_hyp = $hyperviseurCommission; - $transaction->commission_ag = $agentCommission; - } + return $this->errorMessage(trans('errors.service_unavailable'),Response::HTTP_SERVICE_UNAVAILABLE); +// $frais = $transaction->montant * $config->taux_com_client_retrait / 100; +// +// $response = $client->post('https://ilink-app.com/mobilebackendtest/interacted/MembersAction.php'); +// $code = $response->getStatusCode(); +// if($code == 200) { +// //Requete vers la banque +// // 1 ---> Emmètre via API sécurisé SSL une requête de retrait du +// //(montant de la transaction + frais de transaction) pour débiter +// //sa carte et créditer notre compte marchand +// $montantRetrait = $transaction->montant + $frais; +// +// $banqueCommission = floatval($transaction->montant * $config->part_banque_retrait / 100); +// $transaction->commission_banque = $banqueCommission; +// // 2---> Emmètre via API sécurisé SSL une requête de débit de notre +// //compte marchand du (montant de la transaction multiplié +// //par la Part de la banque partenaire en % ) et créditer le +// //compte des opérations défini avec notre banque partenaire +// +// $walletAgent->balance_princ += $transaction->montant; +// +// $agentCommission=floatval($transaction->montant*$config->taux_com_ag_retrait / 100); +// $superviseurCommission=floatval($transaction->montant*$config->taux_com_sup_retrait / 100); +// $hyperviseurCommission = $frais - $superviseurCommission - $agentCommission - $banqueCommission; +// +//// dd(array($hyperviseurCommission ,$superviseurCommission)); +// $walletAgent->balance_com += $agentCommission; +// $walletSuperviseur->balance_com += $superviseurCommission; +// $walletHyperviseur->balance_com += $hyperviseurCommission; +// +// $transaction->id_wallet_sup = $walletSuperviseur->id; +// $transaction->commission_sup = $superviseurCommission; +// $transaction->id_wallet_hyp = $walletHyperviseur->id; +// $transaction->commission_hyp = $hyperviseurCommission; +// $transaction->commission_ag = $agentCommission; +// } } diff --git a/app/Http/Controllers/WalletController.php b/app/Http/Controllers/WalletController.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/AuthenticateAccess.php b/app/Http/Middleware/AuthenticateAccess.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/ExampleMiddleware.php b/app/Http/Middleware/ExampleMiddleware.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php old mode 100644 new mode 100755 diff --git a/app/Jobs/ExampleJob.php b/app/Jobs/ExampleJob.php old mode 100644 new mode 100755 diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php old mode 100644 new mode 100755 diff --git a/app/Listeners/ExampleListener.php b/app/Listeners/ExampleListener.php old mode 100644 new mode 100755 diff --git a/app/Models/AgentPlus.php b/app/Models/AgentPlus.php old mode 100644 new mode 100755 diff --git a/app/Models/CodeGenerer.php b/app/Models/CodeGenerer.php old mode 100644 new mode 100755 diff --git a/app/Models/ConfigWallet.php b/app/Models/ConfigWallet.php old mode 100644 new mode 100755 diff --git a/app/Models/DemandeCredit.php b/app/Models/DemandeCredit.php old mode 100644 new mode 100755 diff --git a/app/Models/NetworksAgent.php b/app/Models/NetworksAgent.php old mode 100644 new mode 100755 diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php old mode 100644 new mode 100755 diff --git a/app/Models/WalletAgent.php b/app/Models/WalletAgent.php old mode 100644 new mode 100755 diff --git a/app/Models/WalletTransaction.php b/app/Models/WalletTransaction.php old mode 100644 new mode 100755 index 4f45d06..04b8905 --- a/app/Models/WalletTransaction.php +++ b/app/Models/WalletTransaction.php @@ -102,7 +102,7 @@ class WalletTransaction extends Model { return [ 'montant'=> 'required|numeric|min:0|not_in:0', - 'numCarte'=>'required|integer', + 'numCarte'=>'required', 'cvv'=>'required|integer|min:100|max:9999', 'expiration_date'=>'required|date_format:m/y|after_or_equal:today', 'type' =>'required|in:credit,debit', diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php old mode 100644 new mode 100755 diff --git a/app/Traits/ApiResponser.php b/app/Traits/ApiResponser.php old mode 100644 new mode 100755 diff --git a/app/Twilio.php b/app/Twilio.php old mode 100644 new mode 100755 diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php old mode 100644 new mode 100755 diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep old mode 100644 new mode 100755 diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php old mode 100644 new mode 100755 diff --git a/phpunit.xml b/phpunit.xml old mode 100644 new mode 100755 diff --git a/public/.htaccess b/public/.htaccess old mode 100644 new mode 100755 diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php old mode 100644 new mode 100755 index c7e2131..ffd971e --- a/resources/lang/en/errors.php +++ b/resources/lang/en/errors.php @@ -1,5 +1,6 @@ 'Does not exist any instance of :model with given id', - 'unexpected_error'=> 'Unexpected error. Try later' + 'unexpected_error'=> 'Unexpected error. Try later', + 'service_unavailable' => 'Service unavailable' ]; diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php old mode 100644 new mode 100755 diff --git a/resources/lang/fr/errors.php b/resources/lang/fr/errors.php old mode 100644 new mode 100755 index 52e681c..1928462 --- a/resources/lang/fr/errors.php +++ b/resources/lang/fr/errors.php @@ -1,5 +1,6 @@ 'Il n\'existe aucune instance de :model avec l\'id donné', - 'unexpected_error'=> 'Erreur inattendue. Essayer plus tard' + 'unexpected_error'=> 'Erreur inattendue. Essayer plus tard', + 'service_unavailable' => 'Service not disponible' ]; diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php old mode 100644 new mode 100755 diff --git a/resources/views/.gitkeep b/resources/views/.gitkeep old mode 100644 new mode 100755 diff --git a/routes/web.php b/routes/web.php old mode 100644 new mode 100755 diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php old mode 100644 new mode 100755 diff --git a/tests/TestCase.php b/tests/TestCase.php old mode 100644 new mode 100755