Merge pull request #7 from alegraio/dev-fix

refactored
alegraio · Nov 26, 2020 · c0c365b · c0c365b
2 parents e8bfac0 + 303fa51
commit c0c365b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,7 +10,7 @@
          stopOnFailure="false"
          syntaxCheck="false">
     <testsuites>
-        <testsuite name="Omnipay Garanti(Gvp) Test Suite">
+        <testsuite name="Omnipay NestPay Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

diff --git a/src/Gateway.php b/src/Gateway.php
@@ -37,6 +37,17 @@ public function getName(): string
         return 'NestPay';
     }
 
+    public function getDefaultParameters(): array
+    {
+        return [
+            'bank' => '',
+            'clientId' => '',
+            'username' => '',
+            'storeKey' => '',
+            'password' => ''
+        ];
+    }
+
     /**
      * @return string
      */

diff --git a/src/Messages/RequestTrait.php b/src/Messages/RequestTrait.php
@@ -6,24 +6,16 @@ trait RequestTrait
 {
 
     public $baseUrls = [
-        'asseco' => ['baseUrl' => 'https://entegrasyon.asseco-see.com.tr'],
-        'isbank' => ['baseUrl' => 'https://spos.isbank.com.tr'],
-        'akbank' => ['baseUrl' => 'https://www.sanalakpos.com'],
-        'finansbank' => ['baseUrl' => 'https://www.fbwebpos.com'],
-        'denizbank' => ['baseUrl' => 'https://denizbank.est.com.tr'],
-        'kuveytturk' => ['baseUrl' => 'https://kuveytturk.est.com.tr'],
-        'halkbank' => ['baseUrl' => 'https://sanalpos.halkbank.com.tr'],
-        'anadolubank' => ['baseUrl' => 'https://anadolusanalpos.est.com.tr'],
-        'hsbc' => ['baseUrl' => 'https://vpos.advantage.com.tr'],
-        'ziraatbank' => ['baseUrl' => 'https://sanalpos2.ziraatbank.com.tr'],
-        'test' => [
-            'purchase' => [
-                'baseUrl' => 'https://entegrasyon.asseco-see.com.tr'
-            ],
-            '3d' => [
-                'baseUrl' => 'https://entegrasyon.asseco-see.com.tr'
-            ]
-        ]
+        'isbank' => 'https://spos.isbank.com.tr',
+        'akbank' => 'https://www.sanalakpos.com',
+        'finansbank' => 'https://www.fbwebpos.com',
+        'denizbank' => 'https://denizbank.est.com.tr',
+        'kuveytturk' => 'https://kuveytturk.est.com.tr',
+        'halkbank' => 'https://sanalpos.halkbank.com.tr',
+        'anadolubank' => 'https://anadolusanalpos.est.com.tr',
+        'hsbc' => 'https://vpos.advantage.com.tr',
+        'ziraatbank' => 'https://sanalpos2.ziraatbank.com.tr',
+        'test' => 'https://entegrasyon.asseco-see.com.tr'
     ];
 
     protected $allowedCardBrands = [
@@ -59,11 +51,10 @@ public function getEndpoint(): string
     public function getBaseUrl(): string
     {
         $bank = $this->getBank();
-        $action = $this->getAction();
         if ($this->getTestMode()) {
-            return $this->baseUrls['test'][$action]['baseUrl'] ?? $this->baseUrls['test']['purchase']['baseUrl'];
+            return $this->baseUrls['test'];
         }
-        return $this->baseUrls[$bank]['baseUrl'];
+        return $this->baseUrls[$bank];
     }
 
     public function getRnd(): string

diff --git a/tests/GatewayTest.php b/tests/GatewayTest.php
@@ -33,9 +33,9 @@ public function setUp(): void
         /** @var Gateway gateway */
         $this->gateway = new Gateway($this->getHttpClient(), $this->getHttpRequest());
         /*$this->gateway->setBank('akbank');
-        $this->gateway->setUserName('akalegra');
+        $this->gateway->setUserName('xxxxx');
         $this->gateway->setClientId('100100000');
-        $this->gateway->setPassword('ALG*3466');
+        $this->gateway->setPassword('xxxxxx');
         $this->gateway->setStoreKey('123456');
         $this->gateway->setTestMode(true);*/
     }