fixed eCoin to work, it sends on notify only return

hiqdev · Mar 25, 2016 · e2bc574 · e2bc574
1 parent 04f8df2
commit e2bc574
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -53,6 +53,7 @@ public function items()
                 ],
                 'merchant' => [
                     'class'           => 'hiqdev\yii2\merchant\Module',
+                    'returnPage'      => '/finance/pay/return',
                     'notifyPage'      => '/finance/pay/notify',
                     'finishPage'      => '/finance/bill',
                     'depositClass'    => 'hipanel\modules\finance\merchant\Deposit',

diff --git a/src/controllers/PayController.php b/src/controllers/PayController.php
@@ -19,46 +19,37 @@
 /**
  * Class PayController.
  */
-class PayController extends \yii\web\Controller
+class PayController extends \hiqdev\yii2\merchant\controllers\PayController
 {
-    /**
-     * {@inheritdoc}
-     * @var \hipanel\modules\finance\Module
-     */
-    public $module;
+    public function getMerchantModule()
+    {
+        return $this->module->getMerchant();
+    }
 
-    /**
-     * {@inheritdoc}
-     */
-    public $enableCsrfValidation = false;
+    public function render($view, $params = [])
+    {
+        return $this->getMerchantModule()->getPayController()->render($view, $params);
+    }
 
-    /**
-     * Action is designed to get the system notification from payment system,
-     * process it and report success or error for the payment system.
-     *
-     * @throws \yii\base\InvalidConfigException
-     * @return mixed
-     */
-    public function actionNotify($transactionId = null)
+    public function checkNotify()
     {
-        if (!$transactionId) {
-            $transactionId = Yii::$app->request->post('transactionId');
-        }
-        $history = $this->module->getMerchant()->readHistory($transactionId);
+        $transactionId = Yii::$app->request->get('transactionId') ?: Yii::$app->request->post('transactionId');
+        $history = $this->getMerchantModule()->readHistory($transactionId);
         $data = array_merge([
             'username'      => $history['username'],
             'merchant'      => $history['merchant'],
             'transactionId' => $transactionId,
         ], $_REQUEST);
         #$data = array_merge($history, $_REQUEST);
         Yii::info(http_build_query($data), 'merchant');
-        Yii::$app->get('hiresource')->setAuth([]);
+        Yii::$app->get('hiresource')->disableAuth();
         try {
             $result = Merchant::perform('Pay', $data);
         } catch (HiArtException $e) {
             $result = Err::set($data, $e->getMessage());
         }
+        Yii::$app->get('hiresource')->enableAuth();
 
-        return $this->module->getMerchant()->renderNotify($result);
+        return $this->getMerchantModule()->completeHistory($result);
     }
 }