market code standart

Author: dimoncheg12

Block/Widget/Redirect.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Fondy\Fondy\Block\Widget;
 
 /**

Controller/Url/FondySuccess.php

@@ -1,22 +1,33 @@
 <?php
-
 namespace Fondy\Fondy\Controller\Url;
 
 use Magento\Framework\App\Action\Action;
 use Magento\Sales\Model\Order;
+use Symfony\Component\Config\Definition\Exception\Exception;
 
 class FondySuccess extends Action
 {
     /** @var \Magento\Framework\View\Result\PageFactory */
     protected $resultPageFactory;
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory
+     */
+    protected $jsonResultFactory;
 
-
+    /**
+     * FondySuccess constructor.
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $jsonResultFactory
+     *
+     */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
-    )
-    {
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $jsonResultFactory
+    ) {
         $this->resultPageFactory = $resultPageFactory;
+        $this->jsonResultFactory = $jsonResultFactory;
         parent::__construct($context);
     }
 
@@ -32,8 +43,8 @@ public function execute()
         $data = $this->getRequest()->getPostValue();
         if (empty($data)) {
             $callback = json_decode(file_get_contents("php://input"));
-            if(empty($callback))
-                die();
+            if (empty($callback))
+                throw new Exception(__('Request Parameter is not matched.'));
             $data = array();
             foreach ($callback as $key => $val) {
                 $data[$key] = $val;
@@ -44,7 +55,10 @@ public function execute()
          */
         $model = 'Fondy\Fondy\Model\Fondy';
         $paymentMethod = $this->_objectManager->create($model);
-        $paymentMethod->processResponse($data);
+        $response = $paymentMethod->processResponse($data);
+        $result = $this->jsonResultFactory->create();
+        $result->setData(['Result' => $response]);
+        return $result;
     }
 
 }

Controller/Url/Submit.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Fondy\Fondy\Controller\Url;
 
 use Magento\Framework\App\Action\Action;
@@ -9,16 +8,17 @@
 class Submit extends Action
 {
     /** @var \Magento\Framework\View\Result\PageFactory */
-    protected $resultPageFactory;
-
-    protected $fondy;
+    public $resultPageFactory;
+    /**
+     * @var \Fondy\Fondy\Block\Widget\Redirect
+     */
+    public $fondy;
 
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Fondy\Fondy\Block\Widget\Redirect $fondy_form
-    )
-    {
+    ) {
         $this->resultPageFactory = $resultPageFactory;
         $this->fondy = $fondy_form;
         parent::__construct($context);
@@ -29,10 +29,9 @@ public function execute()
         $page = $this->resultPageFactory->create();
         $post_data = $this->fondy->getPostData();
         $request = $this->doRequest($post_data);
-        $url = json_decode($request, TRUE);
+        $url = json_decode($request, true);
         if (isset($url['response']['checkout_url'])) {
-            header("Location: " . $url['response']['checkout_url']);
-            exit();
+            $this->_redirect->redirect($this->_response, $url['response']['checkout_url']);
         }
 
         return $page;

Model/Fondy.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Fondy\Fondy\Model;
 
 use Magento\Quote\Api\Data\CartInterface;
@@ -68,8 +67,8 @@ public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = [])
-    {
+        array $data = []
+    ) {
         $this->orderFactory = $orderFactory;
         $this->urlBuilder = $urlBuilder;
         $this->_transactionBuilder = $builderInterface;
@@ -261,13 +260,9 @@ public function getPostData($orderId)
     private function checkFondyResponse($response)
     {
         $this->_logger->debug("checking parameters");
-        foreach (
-            [
-                "order_id",
-                "order_status",
-                "signature"
-            ]
-            as $param) {
+        foreach (["order_id",
+                     "order_status",
+                     "signature"] as $param) {
             if (!isset($response[$param])) {
                 $this->_logger->debug("Pay URL: required field \"{$param}\" is missing");
                 return false;
@@ -289,20 +284,19 @@ private function checkFondyResponse($response)
     }
 
     /**
-     * Вызывается при запросе callback URL со стороны Fondy
-     *
      * @param $responseData
+     * @return string
      */
     public function processResponse($responseData)
     {
         if (empty($responseData))
-            die('No Data');
+            return 'No Data';
         if ($responseData['product_id'] == 'FondyDirect') {
             $this->_code = 'fondy_direct';
         } elseif ($responseData['product_id'] == 'Fondy') {
             $this->_code = 'fondy';
         } else {
-            die(__("FAIL"));
+            return 'FAIL';
         }
         $debugData = ['response' => $responseData];
         $this->_logger->debug("processResponse", $debugData);
@@ -312,12 +306,12 @@ public function processResponse($responseData)
             $order = $this->getOrder($orderId);
             $state = $order->getStatus();
             if (!empty($state) && $order && ($this->_processOrder($order, $responseData) === true)) {
-                die(__("Ok"));
-            }else{
-                die(__("FAIL NO ORDER DEBIT METHOD"));
+                return 'OK';
+            } else {
+                return 'FAIL';
             }
         }
-        die(__("FAIL"));
+        return 'FAIL';
     }
 
     /**

view/frontend/templates/html/fondy_form.phtml

@@ -10,7 +10,7 @@
 <script type="text/javascript">
     require(["jquery"], function ($) {
         $(document).ready(function () {
-			setTimeout(function() {$('#FONDY_payment_form').submit(); }, 1500);
+            setTimeout(function() {$('#FONDY_payment_form').submit(); }, 1500);
         });
     });
 </script>