From 1cabf28bb3a2e9db0cdaa39deba50eb6baa6944e Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 24 Feb 2023 16:08:19 +0500 Subject: [PATCH] sarga payment --- packages/Sarga/Payment/Config/paymentmethods.php | 2 +- .../{AltynAsyrController.php => RysgalController.php} | 6 +++--- packages/Sarga/Payment/Http/routes.php | 8 ++++---- .../Sarga/Payment/Methods/{AltynAsyr.php => Rysgal.php} | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename packages/Sarga/Payment/Http/Controllers/{AltynAsyrController.php => RysgalController.php} (92%) rename packages/Sarga/Payment/Methods/{AltynAsyr.php => Rysgal.php} (97%) diff --git a/packages/Sarga/Payment/Config/paymentmethods.php b/packages/Sarga/Payment/Config/paymentmethods.php index c6fec1dd4..8bb48846d 100644 --- a/packages/Sarga/Payment/Config/paymentmethods.php +++ b/packages/Sarga/Payment/Config/paymentmethods.php @@ -37,7 +37,7 @@ return [ 'title' => "I\\'ll pay by Altyn Asyr card", 'description' => 'Altyn Asyr Kartly Töleg', 'api_url' => 'https://epg2.rysgalbank.tm/epg/rest/', - 'class' => 'Sarga\Payment\Methods\AltynAsyr', + 'class' => 'Sarga\Payment\Methods\Rysgal', 'active' => false, 'sort' => 4 ], diff --git a/packages/Sarga/Payment/Http/Controllers/AltynAsyrController.php b/packages/Sarga/Payment/Http/Controllers/RysgalController.php similarity index 92% rename from packages/Sarga/Payment/Http/Controllers/AltynAsyrController.php rename to packages/Sarga/Payment/Http/Controllers/RysgalController.php index cff0b7972..51332c5d7 100644 --- a/packages/Sarga/Payment/Http/Controllers/AltynAsyrController.php +++ b/packages/Sarga/Payment/Http/Controllers/RysgalController.php @@ -3,15 +3,15 @@ namespace Sarga\Payment\Http\Controllers; use GuzzleHttp\Exception\ConnectException; -use Sarga\Payment\Methods\AltynAsyr; +use Sarga\Payment\Methods\Rysgal; use Webkul\Checkout\Facades\Cart; use Webkul\Checkout\Repositories\CartRepository; use Webkul\Sales\Repositories\OrderRepository; -class AltynAsyrController extends Controller +class RysgalController extends Controller { - public function __construct(protected OrderRepository $orderRepository, protected AltynAsyr $altynAsyr) + public function __construct(protected OrderRepository $orderRepository, protected Rysgal $altynAsyr) { } diff --git a/packages/Sarga/Payment/Http/routes.php b/packages/Sarga/Payment/Http/routes.php index a3f466b40..bc8f4dff4 100644 --- a/packages/Sarga/Payment/Http/routes.php +++ b/packages/Sarga/Payment/Http/routes.php @@ -1,6 +1,6 @@ 'payment','middleware' => ['web', 'locale', 'theme', 'currency']], function () { - Route::get('altynasyr/redirect', [AltynAsyrController::class,'redirect']) + Route::get('altynasyr/redirect', [RysgalController::class,'redirect']) ->name('paymentmethod.altynasyr.redirect'); - Route::get('altynasyr/complete/{cart_id}', [AltynAsyrController::class,'success']) + Route::get('altynasyr/complete/{cart_id}', [RysgalController::class,'success']) ->name('paymentmethod.altynasyr.success'); - Route::get('altynasyr/cancel', [AltynAsyrController::class,'cancel']) + Route::get('altynasyr/cancel', [RysgalController::class,'cancel']) ->name('paymentmethod.altynasyr.cancel'); Route::get('tfeb/redirect',[TFEBController::class,'redirect']) diff --git a/packages/Sarga/Payment/Methods/AltynAsyr.php b/packages/Sarga/Payment/Methods/Rysgal.php similarity index 97% rename from packages/Sarga/Payment/Methods/AltynAsyr.php rename to packages/Sarga/Payment/Methods/Rysgal.php index 2c0a27201..9a96d58ff 100644 --- a/packages/Sarga/Payment/Methods/AltynAsyr.php +++ b/packages/Sarga/Payment/Methods/Rysgal.php @@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Log; use Webkul\Payment\Payment\Payment; -class AltynAsyr extends Payment +class Rysgal extends Payment { protected $code = 'altynasyr'; @@ -124,7 +124,7 @@ class AltynAsyr extends Payment $result = json_decode($client->post('getOrderStatus.do',$params)->getBody(),true); - if($result['ErrorCode'] == 0 && $result['OrderStatus'] == 2){ + if($result['errorCode'] == 0 && $result['orderStatus'] == 2){ return [ "success" => true, "message" => "Payment successful"