Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catalog controller updated #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Catalog controller updated #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 27 additions & 45 deletions catalog/controller/extension/payment/razorpay.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?php

require_once __DIR__.'/../../../../system/library/razorpay-sdk/Razorpay.php';
require_once DIR_SYSTEM .'library/razorpay-sdk/Razorpay.php';
use Razorpay\Api\Api;
use Razorpay\Api\Errors;

class ControllerExtensionPaymentRazorpay extends Controller
{
class ControllerExtensionPaymentRazorpay extends Controller {
/**
* Event constants
*/
Expand All @@ -16,26 +14,23 @@ class ControllerExtensionPaymentRazorpay extends Controller
// Set RZP plugin version
private $version = '4.0.2';

public function index()
{
public function index() {
$data['button_confirm'] = $this->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
try
{
try {
$api = $this->getApiIntance();

$order_data = $this->get_order_creation_data($this->session->data['order_id']);

if(empty($this->session->data["razorpay_order_id_" . $this->session->data['order_id']]) === true)
{
if(empty($this->session->data["payment_razorpay_order_id_" . $this->session->data['order_id']]) === true) {
$razorpay_order = $api->order->create($order_data);

$this->session->data["razorpay_order_id_" . $this->session->data['order_id']] = $razorpay_order['id'];
$this->session->data["payment_razorpay_order_id_" . $this->session->data['order_id']] = $razorpay_order['id'];

$this->log->write("RZP orderID (:" . $razorpay_order['id'] . ") created for Opencart OrderID (:" . $this->session->data['order_id'] . ")");
}
Expand All @@ -60,7 +55,7 @@ public function index()
$data['name'] = $this->config->get('config_name');
$data['lang'] = $this->session->data['language'];
$data['return_url'] = $this->url->link('extension/payment/razorpay/callback', '', 'true');
$data['razorpay_order_id'] = $this->session->data["razorpay_order_id_" . $this->session->data['order_id']];
$data['razorpay_order_id'] = $this->session->data["payment_razorpay_order_id_" . $this->session->data['order_id']];
$data['version'] = $this->version;
$data['oc_version'] = VERSION;

Expand All @@ -70,53 +65,41 @@ public function index()
$data['api_url'] = $api->getBaseUrl();
$data['cancel_url'] = $this->url->link('checkout/checkout', '', 'true');

if (file_exists(DIR_TEMPLATE.$this->config->get('config_template').'/template/extension/payment/razorpay'))
{
return $this->load->view($this->config->get('config_template').'/template/extension/payment/razorpay', $data);
}
else
{
return $this->load->view('extension/payment/razorpay', $data);
}
return $this->load->view('extension/payment/razorpay', $data);
}

private function get_order_creation_data($order_id)
{
private function get_order_creation_data($order_id) {
$order = $this->model_checkout_order->getOrder($this->session->data['order_id']);

$data = [
'receipt' => $order_id,
'amount' => $this->currency->format($order['total'], $order['currency_code'], $order['currency_value'], false) * 100,
'currency' => $order['currency_code'],
'receipt' => $order_id,
'amount' => $this->currency->format($order['total'], $order['currency_code'], $order['currency_value'], false) * 100,
'currency' => $order['currency_code'],
'payment_capture' => ($this->config->get('payment_razorpay_payment_action') === 'authorize') ? 0 : 1
];

return $data;
}


public function callback()
{
public function callback() {
$this->load->model('checkout/order');

if (isset($this->request->request['razorpay_payment_id']) === true)
{
$razorpay_payment_id = $this->request->request['razorpay_payment_id'];
if (isset($this->request->request['payment_razorpay_payment_id']) === true) {
$razorpay_payment_id = $this->request->request['payment_razorpay_payment_id'];
$merchant_order_id = $this->session->data['order_id'];
$razorpay_order_id = $this->session->data["razorpay_order_id_" . $this->session->data['order_id']];
$razorpay_signature = $this->request->request['razorpay_signature'];
$razorpay_order_id = $this->session->data["payment_razorpay_order_id_" . $this->session->data['order_id']];
$razorpay_signature = $this->request->request['payment_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;

//validate Rzp signature
$api = $this->getApiIntance();
try
{
try {
$attributes = array(
'razorpay_order_id' => $razorpay_order_id,
'razorpay_order_id' => $razorpay_order_id,
'razorpay_payment_id' => $razorpay_payment_id,
'razorpay_signature' => $razorpay_signature
'razorpay_signature' => $razorpay_signature
);

$api->utility->verifyPaymentSignature($attributes);
Expand Down Expand Up @@ -272,9 +255,11 @@ protected function paymentAuthorized(array $data)
//capture only if payment status is 'authorized'
if($payment->status === 'authorized')
{
$payment->capture(array('amount' => $capture_amount,
'currency' => $order_info['currency_code']
));
$payment->capture(array(
'amount' => $capture_amount,
'currency' => $order_info['currency_code']
)
);
}

//update the order status in store
Expand Down Expand Up @@ -309,8 +294,7 @@ public function validateSignature($payloadRawData, $actualSignature)

if (empty($webhookSecret) === false)
{
$api->utility
->verifyWebhookSignature($payloadRawData, $actualSignature, $webhookSecret);
$api->utility->verifyWebhookSignature($payloadRawData, $actualSignature, $webhookSecret);
}

}
Expand Down Expand Up @@ -345,9 +329,7 @@ public function getMerchantPreferences(array &$preferences)

}

protected function getApiIntance()
{
protected function getApiIntance() {
return new Api($this->config->get('payment_razorpay_key_id'), $this->config->get('payment_razorpay_key_secret'));
}

}