diff --git a/catalog/controller/extension/payment/razorpay.php b/catalog/controller/extension/payment/razorpay.php
index 3b3cad2..057ef3a 100644
--- a/catalog/controller/extension/payment/razorpay.php
+++ b/catalog/controller/extension/payment/razorpay.php
@@ -1,15 +1,24 @@
language->get('button_confirm');
-
+
$this->load->model('checkout/order');
$order_info = $this->model_checkout_order->getOrder($this->session->data['order_id']);
+ // Orders API with payment autocapture
+ $api = new Api($this->config->get('razorpay_key_id'), $this->config->get('razorpay_key_secret'));
+ $order_data = $this->get_order_creation_data($this->session->data['order_id']);
+ $razorpay_order = $api->order->create($order_data);
+ $this->session->data['razorpay_order_id'] = $razorpay_order['id'];
+
$data['key_id'] = $this->config->get('razorpay_key_id');
$data['currency_code'] = $order_info['currency_code'];
$data['total'] = $this->currency->format($order_info['total'], $order_info['currency_code'], $order_info['currency_value'], false) * 100;
@@ -19,7 +28,8 @@ public function index()
$data['phone'] = $order_info['telephone'];
$data['name'] = $this->config->get('config_name');
$data['lang'] = $this->session->data['language'];
- $data['return_url'] = $this->url->link('payment/razorpay/callback', '', true);
+ $data['return_url'] = $this->url->link('payment/razorpay/callback', '', 'true');
+ $data['razorpay_order_id'] = $razorpay_order['id'];
if (file_exists(DIR_TEMPLATE.$this->config->get('config_template').'/template/payment/razorpay.tpl')) {
return $this->load->view($this->config->get('config_template').'/template/payment/razorpay.tpl', $data);
@@ -28,80 +38,98 @@ public function index()
}
}
- private function get_curl_handle($payment_id, $amount)
+ function get_order_creation_data($order_id)
{
- $url = 'https://api.razorpay.com/v1/payments/'.$payment_id.'/capture';
- $key_id = $this->config->get('razorpay_key_id');
- $key_secret = $this->config->get('razorpay_key_secret');
- $fields_string = "amount=$amount";
-
- //cURL Request
- $ch = curl_init();
-
- //set the url, number of POST vars, POST data
- curl_setopt($ch, CURLOPT_URL, $url);
- curl_setopt($ch, CURLOPT_USERPWD, $key_id.':'.$key_secret);
- curl_setopt($ch, CURLOPT_TIMEOUT, 60);
- curl_setopt($ch, CURLOPT_POST, 1);
- curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
- curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__).'/ca-bundle.crt');
-
- return $ch;
+ $order = $this->model_checkout_order->getOrder($this->session->data['order_id']);
+
+ switch($this->payment_action)
+ {
+ case 'authorize':
+ $data = array(
+ 'receipt' => $order_id,
+ 'amount' => $this->currency->format($order['total'], $order['currency_code'], $order['currency_value'], false) * 100,
+ 'currency' => $order['currency_code'],
+ 'payment_capture' => 0
+ );
+ break;
+
+ default:
+ $data = array(
+ 'receipt' => $order_id,
+ 'amount' => $this->currency->format($order['total'], $order['currency_code'], $order['currency_value'], false) * 100,
+ 'currency' => $order['currency_code'],
+ 'payment_capture' => 1
+ );
+ break;
+ }
+
+ return $data;
}
+
public function callback()
{
$this->load->model('checkout/order');
- if (isset($this->request->request['razorpay_payment_id'])) {
+
+ if ($this->request->request['razorpay_payment_id']) {
+
$razorpay_payment_id = $this->request->request['razorpay_payment_id'];
- $merchant_order_id = $this->session->data['order_id'];
+ $merchant_order_id = $this->request->request['merchant_order_id'];
+ $razorpay_order_id = $this->session->data['razorpay_order_id'];
+ $razorpay_signature = $this->request->request['razorpay_signature'];
$order_info = $this->model_checkout_order->getOrder($merchant_order_id);
$amount = $this->currency->format($order_info['total'], $order_info['currency_code'], $order_info['currency_value'], false) * 100;
- $success = false;
- $error = '';
+ $key_id = $this->config->get('razorpay_key_id');
+ $key_secret = $this->config->get('razorpay_key_secret');
- try {
- $ch = $this->get_curl_handle($razorpay_payment_id, $amount);
+ $api = new Api($key_id, $key_secret);
+
+ $success = false;
+ $error = "";
+ $captured = false;
+
+ try
+ {
+ if ($this->payment_action === 'authorize')
+ {
+ $payment = $api->payment->fetch($razorpay_payment_id);
+ }
+ else
+ {
+ $signature = hash_hmac('sha256', $razorpay_order_id . '|' . $razorpay_payment_id, $key_secret);
+
+ if (hash_equals($signature , $razorpay_signature))
+ {
+ $captured = true;;
+ }
+ }
- //execute post
- $result = curl_exec($ch);
- $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ //Check success response
+ if ($captured)
+ {
+ $success = true;
+ }
- if ($result === false) {
+ else{
$success = false;
- $error = 'Curl error: '.curl_error($ch);
- } else {
- $response_array = json_decode($result, true);
- //Check success response
- if ($http_status === 200 and isset($response_array['error']) === false) {
- $success = true;
- } else {
- $success = false;
-
- if (!empty($response_array['error']['code'])) {
- $error = $response_array['error']['code'].':'.$response_array['error']['description'];
- } else {
- $error = 'RAZORPAY_ERROR:Invalid Response
'.$result;
- }
- }
+
+ $error = "PAYMENT_ERROR = Payment failed";
}
+ }
- //close connection
- curl_close($ch);
- } catch (Exception $e) {
+ catch (Exception $e)
+ {
$success = false;
$error = 'OPENCART_ERROR:Request to Razorpay Failed';
}
if ($success === true) {
if (!$order_info['order_status_id']) {
- $this->model_checkout_order->addOrderHistory($merchant_order_id, $this->config->get('razorpay_order_status_id'), 'Payment Successful. Razorpay Payment Id:'.$razorpay_payment_id);
+ $this->model_checkout_order->confirm($merchant_order_id, $this->config->get('razorpay_order_status_id'), 'Payment Successful. Razorpay Payment Id:'.$razorpay_payment_id, true);
} else {
- $this->model_checkout_order->addOrderHistory($merchant_order_id, $this->config->get('razorpay_order_status_id'), 'Payment Successful. Razorpay Payment Id:'.$razorpay_payment_id);
+ $this->model_checkout_order->update($merchant_order_id, $this->config->get('razorpay_order_status_id'), 'Payment Successful. Razorpay Payment Id:'.$razorpay_payment_id, true);
}
echo ''."\n";
@@ -109,18 +137,22 @@ public function callback()
echo ' '."\n";
echo ''."\n";
echo ''."\n";
- echo ' Please follow link!
'."\n";
+ echo 'Payment Successful. Please click here to continue!
'."\n";
echo ''."\n";
echo '