+Update version

iyzico · Feb 1, 2023 · bb470a0 · bb470a0
1 parent 57d1721
commit bb470a0
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Controller/IyzicoBase/IyzicoFormObjectGenerator.php b/Controller/IyzicoBase/IyzicoFormObjectGenerator.php
@@ -46,7 +46,7 @@ public function generateOption($checkoutSession,$locale,$currency,$cardId,$callB
 		$iyzico->basketId                     = $cardId;
 		$iyzico->paymentGroup                 = 'PRODUCT';
 		$iyzico->callbackUrl                  = $callBack."Iyzico_PayWithIyzico/response/paywithiyzico";
-        $iyzico->cancelUrl 					  = $callBack;
+    $iyzico->cancelUrl 					          = $callBack;
 		$iyzico->paymentSource                = "MAGENTO2|".$magentoVersion."|SPACE-1.0|PWI";
 
 		return $iyzico;
@@ -151,7 +151,7 @@ public function generateBasketItems($checkoutSession) {
             $basketItems[$keyNumber]->id                = $item->getProductId();
             $basketItems[$keyNumber]->price             = $this->helper->priceParser(round($item->getPrice(),2));
             $basketItems[$keyNumber]->name              = $this->helper->dataCheck($item->getName());
-            $basketItems[$keyNumber]->category1         = "MAGENTO-ECOMMERCE";
+            $basketItems[$keyNumber]->category1         = $this->helper->dataCheck($item->getName());
             $basketItems[$keyNumber]->itemType          = "PHYSICAL";
 
             $keyNumber++;

diff --git a/Controller/Response/PayWithIyzico.php b/Controller/Response/PayWithIyzico.php
@@ -179,14 +179,34 @@ public function execute()
         $requestResponse->paidPrice = isset($requestResponse->paidPrice) ? (float) $requestResponse->paidPrice : '';
         $requestResponse->basketId =  isset($requestResponse->basketId) ? (int) $requestResponse->basketId : '';
 
+
+        if($requestResponse->paymentStatus == 'PENDING_CREDIT' && $requestResponse->status == 'success'){
+
+            $status = 'PENDING_CREDIT';
+          }
+          else {
+            $status = $requestResponse->status;
+          }
+
         /* Insert Order Log */
         $iyziOrderModel = $this->_iyziOrderFactory->create();
         $iyziOrderModel->setData('payment_id',$requestResponse->paymentId);
         $iyziOrderModel->setData('total_amount',$requestResponse->paidPrice);
         $iyziOrderModel->setData('order_id',$requestResponse->basketId);
-        $iyziOrderModel->setData('status',$requestResponse->status);
+        $iyziOrderModel->setData('status',$status);
         $iyziOrderModel->save($iyziOrderModel);
 
+
+
+        if($requestResponse->paymentStatus == 'PENDING_CREDIT' && $requestResponse->status == 'success'){
+          $this->_quote->setCheckoutMethod($this->_cartManagement::METHOD_GUEST);
+          $this->_quote->setIyzicoPaymentId($requestResponse->paymentId);
+          $this->_quote->setPayWithIyzicoPaymentStatus('PENDING_CREDIT');
+          $this->_cartManagement->placeOrder($this->_quote->getId());
+          $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
+          return $resultRedirect;
+          }
+
         /* Error Redirect Start */
         if(($requestResponse->paymentStatus != 'SUCCESS' && $requestResponse->paymentStatus != 'INIT_BANK_TRANSFER') || $requestResponse->status != 'success') {
 
@@ -270,6 +290,9 @@ public function execute()
 
         }
 
+        if($requestResponse->paymentStatus == 'PENDING_CREDIT' && $requestResponse->status == 'success'){
+        $this->_quote->setIyzicoPaymentId($requestResponse->paymentId);
+          }
         /* Set Payment Id */
         $this->_quote->setIyzicoPaymentId($requestResponse->paymentId);
 

diff --git a/Model/Payment/PayWithIyzico.php b/Model/Payment/PayWithIyzico.php
@@ -23,7 +23,7 @@
 
 class PayWithIyzico extends \Magento\Payment\Model\Method\AbstractMethod
 {
-    const PLUGIN_VERSION = '1.0.1';
+    const PLUGIN_VERSION = '1.1.0';
     protected $_code = "paywithiyzico";
     protected $_isOffline = true;
 

diff --git a/Observer/PayWithIyzicoDataAssignObserver.php b/Observer/PayWithIyzicoDataAssignObserver.php
@@ -61,6 +61,18 @@ public function execute(Observer $observer)
 
             $order = $observer->getEvent()->getOrder();
 
+            if($PayWithIyzicoPaymentStatus == 'PENDING_CREDIT')
+          {
+            $order->setState('pending');
+            $order->setStatus('pending');
+
+            $historyComment = __('Payment Success').$paymentId;
+            $order->addStatusHistoryComment($historyComment);
+
+            $historyComment = 'Alışveriş kredisi işlemi başlatıldı.';
+            $order->addStatusHistoryComment($historyComment);
+          }
+
             if($PayWithIyzicoPaymentStatus == 'pending') {
                 $order->setState('pending');
                 $order->setStatus('pending');

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "iyzico/paywithiyzico",
     "description": "pay with iyzico Payment Gateway For Magento 2",
     "type": "magento2-module",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "license": "GPL-3.0",
     "authors": [
         {

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Iyzico_PayWithIyzico" setup_version="1.0.1"/>
+	<module name="Iyzico_PayWithIyzico" setup_version="1.1.0"/>
 	<sequence>
         <module name="Magento_Sales"/>
         <module name="Magento_Checkout"/>