load project

sportakal · May 28, 2022 · 055f6a7 · 055f6a7
1 parent e0723f3
commit 055f6a7
Show file tree

Hide file tree

Showing 30 changed files with 748 additions and 290 deletions.
diff --git a/README.md b/README.md
@@ -142,7 +142,7 @@ $error_message = $result->getErrorMessage()); //string
 3D Secure işlemlerde mdStatusCode ve mdErrorMessage değerleri de döner.
 
 3D Secure işlemi sonucunda veriler, **successUrl** veya **errorUrl** olarak belirlediğiniz adrese post edilir. Bu
-adreste aşağıdaki methodla bu verileri yakalayabilirsiniz. Ve mdStatus değerlerini kontrol edebilirsiniz.
+adreste aşağıdaki methodla bu verileri yakalayabilirsiniz ve mdStatus değerlerini kontrol edebilirsiniz.
 
 ```php
 $result = new \Sportakal\Garantipos\Results\ThreeDSecurePayResult($options);
@@ -152,6 +152,13 @@ $md_response_message = $result->getResponseMessage();
 $md_error_message = $result->getErrorMessage()
 ```
 
+İşlemlerin sonucunda **Order** ve **Transaction** nesneleri de döner.
+
+```php
+$order = $result->getOrder();
+$transaction = $result->getTransaction();
+```
+
 ***/samples*** klasöründe daha fazla örnek bulabilirsiniz.
 
 ## Development

diff --git a/samples/pay.php b/samples/pay.php
@@ -4,7 +4,8 @@
 use Sportakal\Garantipos\Models\Address;
 use Sportakal\Garantipos\Models\Card;
 use Sportakal\Garantipos\Models\Customer;
-use Sportakal\Garantipos\Models\RequestModel;
+use Sportakal\Garantipos\Models\GVPSRequestModel;
+use Sportakal\Garantipos\Models\Item;
 use Sportakal\Garantipos\Models\Options;
 use Sportakal\Garantipos\Models\Order;
 use Sportakal\Garantipos\Models\Terminal;
@@ -30,21 +31,28 @@
 $customer->setIpAddress('159.146.45.34');
 $customer->setEmailAddress('portakalsinan@gmail.com');
 
+$order = new Order();
+$order->setOrderID('sportakal_garantipos_' . time());
 
 $address= new Address();
 $address->setType('B'); // B for 'billing' or S for 'shipping'
 $address->setName('Sinan');
 $address->setLastName('Portakal');
-$address->setPhoneNumber('+90(532)876-23-23');
+$address->setPhoneNumber('+90 532 876 23 23');
 $address->setText('Kınıklı Mah.');
 $address->setDistrict('Pamukkale');
 $address->setCity('Denizli');
 $address->setCountry('Turkey');
-
-$order = new Order();
-$order->setOrderID('sportakal_garantipos_' . time());
 $order->addAddress($address);
 
+$item = new Item();
+$item->setProductCode('123456789');
+$item->setProductID('234234');
+$item->setQuantity('1');
+$item->setPrice('1');
+$item->setTotalAmount('1');
+$order->addItem($item);
+
 $transaction = new Transaction();
 $transaction->setInstallmentCnt("");
 $transaction->setAmount(1000);
@@ -53,7 +61,7 @@
 $transaction->setMotoInd('N');
 $transaction->setDescription('test payment');
 
-$request = new RequestModel();
+$request = new GVPSRequestModel();
 $request->setOptions($options);
 $request->setCard($card);
 $request->setCustomer($customer);

diff --git a/samples/refund.php b/samples/refund.php
@@ -4,7 +4,7 @@
 use Sportakal\Garantipos\Models\Address;
 use Sportakal\Garantipos\Models\Card;
 use Sportakal\Garantipos\Models\Customer;
-use Sportakal\Garantipos\Models\RequestModel;
+use Sportakal\Garantipos\Models\GVPSRequestModel;
 use Sportakal\Garantipos\Models\Options;
 use Sportakal\Garantipos\Models\Order;
 use Sportakal\Garantipos\Models\Terminal;
@@ -34,7 +34,7 @@
 $transaction->setCurrencyCode('TRY');
 $transaction->setOriginalRetrefNum('214707386684');
 
-$request = new RequestModel();
+$request = new GVPSRequestModel();
 $request->setOptions($options);
 $request->setCustomer($customer);
 $request->setOrder($order);

diff --git a/samples/threeDModelPay.php b/samples/threeDModelPay.php
@@ -4,9 +4,11 @@
 use Sportakal\Garantipos\Models\Address;
 use Sportakal\Garantipos\Models\Card;
 use Sportakal\Garantipos\Models\Customer;
-use Sportakal\Garantipos\Models\RequestModel;
+use Sportakal\Garantipos\Models\GVPSRequestModel;
+use Sportakal\Garantipos\Models\Item;
 use Sportakal\Garantipos\Models\Options;
 use Sportakal\Garantipos\Models\Order;
+use Sportakal\Garantipos\Models\PostRequestModel;
 use Sportakal\Garantipos\Models\Terminal;
 use Sportakal\Garantipos\Models\Transaction;
 use Sportakal\Garantipos\Requests\InitializeThreeDSecure;
@@ -36,7 +38,25 @@
 
 $order = new Order();
 $order->setOrderID('sportakal_garantipos_' . time());
-$order->addAddress(new Address());
+
+$address= new Address();
+$address->setType('B'); // B for 'billing' or S for 'shipping'
+$address->setName('Sinan');
+$address->setLastName('Portakal');
+$address->setPhoneNumber('+90 532 876 23 23');
+$address->setText('Kınıklı Mah.');
+$address->setDistrict('Pamukkale');
+$address->setCity('Denizli');
+$address->setCountry('Turkey');
+$order->addAddress($address);
+
+$item = new Item();
+$item->setProductCode('123456789');
+$item->setProductID('234234');
+$item->setQuantity('1');
+$item->setPrice('1');
+$item->setTotalAmount('1');
+$order->addItem($item);
 
 $transaction = new Transaction();
 $transaction->setType('sales');
@@ -47,14 +67,14 @@
 $transaction->setMotoInd('N');
 $transaction->setDescription('test payment');
 
-$request = new RequestModel();
+$request = new PostRequestModel();
 $request->setOptions($options);
 $request->setCard($card);
 $request->setCustomer($customer);
 $request->setOrder($order);
 $request->setTransaction($transaction);
-$request->setSuccessURL((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]/garantipos/samples/threeDModelResult.php");
-$request->setErrorURL((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]/garantipos/samples/threeDModelResult.php");
+$request->setSuccessurl((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]/garantipos/samples/threeDModelResult.php");
+$request->setErrorurl((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]/garantipos/samples/threeDModelResult.php");
 
 $response = new InitializeThreeDSecure($request);
 $response = $response->getResult();

diff --git a/samples/threeDModelResult.php b/samples/threeDModelResult.php
@@ -27,9 +27,13 @@
     ddd($md_result->getMdStatus(), $md_result->getResponseMessage(), $md_result->getMdErrorMessage());
 }
 
-$response = new \Sportakal\Garantipos\Requests\CompleteThreeDSecure($_ENV['TERMINAL_PROV_USER_PASSWORD']);
+$request = $md_result->getGVPSRequest();
+
+$response = new \Sportakal\Garantipos\Requests\CompleteThreeDSecure($request);
 try {
     $result = $response->getResult();
+//    ddd($result->getOrder(), $result->getTransaction());
+
     ddd($result->getStatus(), $result->getStatusMessage(), $result->getErrorMessage());
 } catch (Exception $e) {
     ddd($e->getMessage());

diff --git a/samples/threeDPay.php → samples/threeDSecurePay.php b/samples/threeDPay.php → samples/threeDSecurePay.php
@@ -4,9 +4,11 @@
 use Sportakal\Garantipos\Models\Address;
 use Sportakal\Garantipos\Models\Card;
 use Sportakal\Garantipos\Models\Customer;
-use Sportakal\Garantipos\Models\RequestModel;
+use Sportakal\Garantipos\Models\GVPSRequestModel;
+use Sportakal\Garantipos\Models\Item;
 use Sportakal\Garantipos\Models\Options;
 use Sportakal\Garantipos\Models\Order;
+use Sportakal\Garantipos\Models\PostRequestModel;
 use Sportakal\Garantipos\Models\Transaction;
 use Sportakal\Garantipos\Requests\ThreeDSecurePay;
 
@@ -25,6 +27,7 @@
 if ($_POST) {
     try {
         $result = new \Sportakal\Garantipos\Results\ThreeDSecurePayResult($options);
+//        ddd($result->getOrder(), $result->getTransaction());
         ddd($result->getMdStatus(), $result->getResponseMessage(), $result->getErrorMessage());
     } catch (Exception $e) {
         ddd($e->getMessage());
@@ -43,8 +46,23 @@
 
 
 $order = new Order();
-$order->setOrderID(time() . "DENEME" . date("ymd"));
-$order->addAddress(new Address());
+$order->setOrderID('sportakal_garantipos_' . time());
+
+$address = new Address();
+$address->setCity('İstanbul');
+$address->setCompany('Garanti');
+$address->setCountry('Türkiye');
+$address->setDistrict('Kadıköy');
+$address->setFaxNumber('123456789');
+$order->addAddress($address);
+
+$item = new Item();
+$item->setProductCode('123456789');
+$item->setProductID('234234');
+$item->setQuantity('1');
+$item->setPrice('1');
+$item->setTotalAmount('1');
+$order->addItem($item);
 
 $transaction = new Transaction();
 $transaction->setType('sales');
@@ -55,14 +73,14 @@
 $transaction->setMotoInd('N');
 $transaction->setDescription('test payment');
 
-$request = new RequestModel();
+$request = new PostRequestModel();
 $request->setOptions($options);
 $request->setCard($card);
 $request->setCustomer($customer);
 $request->setOrder($order);
 $request->setTransaction($transaction);
-$request->setSuccessURL((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-$request->setErrorURL((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+$request->setSuccessurl((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+$request->setErrorurl((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
 
 $response = new ThreeDSecurePay($request);
 $response = $response->getResult();

diff --git a/src/Models/Address.php b/src/Models/Address.php
@@ -6,24 +6,24 @@ class Address extends BaseModel
 {
     protected string $_parent_key = 'Address';
     protected string $Type = 'B'; // B for 'billing' or S for 'shipping'
-    protected string $Name='';
-    protected string $LastName='';
-    protected string $Company='';
-    protected string $Text='';
-    protected string $District='';
-    protected string $City='';
-    protected string $Country='';
-    protected string $PostalCode='';
-    protected string $PhoneNumber='';
-    protected string $GsmNumber='';
-    protected string $FaxNumber='';
+    protected string $Name = '';
+    protected string $LastName = '';
+    protected string $Company = '';
+    protected string $Text = '';
+    protected string $District = '';
+    protected string $City = '';
+    protected string $Country = '';
+    protected string $PostalCode = '';
+    protected string $PhoneNumber = '';
+    protected string $GsmNumber = '';
+    protected string $FaxNumber = '';
 
     /**
      * @return string
      */
     public function getType(): string
     {
-        return $this->Type;
+        return $this->Type ?? '';
     }
 
     /**
@@ -39,7 +39,7 @@ public function setType(string $Type): void
      */
     public function getName(): string
     {
-        return $this->Name;
+        return $this->Name ?? '';
     }
 
     /**
@@ -55,7 +55,7 @@ public function setName(string $Name): void
      */
     public function getLastName(): string
     {
-        return $this->LastName;
+        return $this->LastName ?? '';
     }
 
     /**
@@ -71,7 +71,7 @@ public function setLastName(string $LastName): void
      */
     public function getCompany(): string
     {
-        return $this->Company;
+        return $this->Company ?? '';
     }
 
     /**
@@ -87,7 +87,7 @@ public function setCompany(string $Company): void
      */
     public function getText(): string
     {
-        return $this->Text;
+        return $this->Text ?? '';
     }
 
     /**
@@ -103,7 +103,7 @@ public function setText(string $Text): void
      */
     public function getDistrict(): string
     {
-        return $this->District;
+        return $this->District ?? '';
     }
 
     /**
@@ -119,7 +119,7 @@ public function setDistrict(string $District): void
      */
     public function getCity(): string
     {
-        return $this->City;
+        return $this->City ?? '';
     }
 
     /**
@@ -135,7 +135,7 @@ public function setCity(string $City): void
      */
     public function getCountry(): string
     {
-        return $this->Country;
+        return $this->Country ?? '';
     }
 
     /**
@@ -151,7 +151,7 @@ public function setCountry(string $Country): void
      */
     public function getPostalCode(): string
     {
-        return $this->PostalCode;
+        return $this->PostalCode ?? '';
     }
 
     /**
@@ -167,7 +167,7 @@ public function setPostalCode(string $PostalCode): void
      */
     public function getPhoneNumber(): string
     {
-        return $this->PhoneNumber;
+        return $this->PhoneNumber ?? '';
     }
 
     /**
@@ -183,7 +183,7 @@ public function setPhoneNumber(string $PhoneNumber): void
      */
     public function getGsmNumber(): string
     {
-        return $this->GsmNumber;
+        return $this->GsmNumber ?? '';
     }
 
     /**
@@ -199,7 +199,7 @@ public function setGsmNumber(string $GsmNumber): void
      */
     public function getFaxNumber(): string
     {
-        return $this->FaxNumber;
+        return $this->FaxNumber ?? '';
     }
 
     /**