From 1df242e685aae632b0d05c0483fc2f0180316db9 Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Fri, 24 Feb 2023 17:13:16 +0500
Subject: [PATCH] sarga payment

---
 packages/Sarga/Payment/Methods/Rysgal.php | 41 +++++++++--------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/packages/Sarga/Payment/Methods/Rysgal.php b/packages/Sarga/Payment/Methods/Rysgal.php
index 1804522f9..21f0dabc2 100644
--- a/packages/Sarga/Payment/Methods/Rysgal.php
+++ b/packages/Sarga/Payment/Methods/Rysgal.php
@@ -61,28 +61,22 @@ class Rysgal extends Payment
         ];
         try {
             $result = json_decode($client->post('register.do',$params)->getBody(),true);
-            return [
-                'data'    => [
-                    'url' => $result['formUrl'],
-                    'status' => true
-                ],
-                'message' => 'Redirect to payment gateway',
-            ];
-            //            Log::info($result);
 
-//            if($result['errorCode'] == 0){
-//                return [
-//                    "success" =>  $this->registerOrderId($result['orderId']),
-//                    "url" => $result['formUrl'],
-//                    "message" => "unable to save order id"
-//                ];
-//            }
-//            else{//if already registered or otkazana w dostupe
-//                return [
-//                    "success" => false,
-//                    "message" => $result['errorMessage']
-//                ];
-//            }
+            if((isset($result['errorCode']) && $result['errorCode'] == 0)||(!isset($result['errorCode']) && isset($result['formUrl']))){
+                return [
+                    'data'    => [
+                        "status" =>  $this->registerOrderId($result['orderId']),
+                        "url" => $result['formUrl'] ?? '',
+                        "message" => "redirect to url"
+                    ]
+                ];
+            }
+            else{//if already registered or otkazana w dostupe
+                return [
+                    "data" => ["success" => false],
+                    "message" => $result['errorMessage'] ?? "unable to save order id"
+                ];
+            }
 
         }catch(\Exception $e){
 //            Log::info($result);
@@ -111,12 +105,9 @@ class Rysgal extends Payment
 
             $payment = $this->getCart()->payment;
 
-
             $orderId = request()->get('orderId');
-            Log::info($payment);
-            Log::info($orderId);
 
-            if($payment && $payment->order_id === $orderId){
+            if($payment && $orderId){
                 $params = [
                     'form_params' => [
                         'userName' => $this->getConfigData('business_account'),