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.

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

More nice admin controller #86

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
98 changes: 27 additions & 71 deletions admin/controller/extension/payment/razorpay.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?php

class ControllerExtensionPaymentRazorpay extends Controller
{
class ControllerExtensionPaymentRazorpay extends Controller {
private $error = array();

public function index()
{
public function index() {
$this->language->load('extension/payment/razorpay');

$this->document->setTitle($this->language->get('heading_title'));
Expand All @@ -20,33 +17,6 @@ public function index()
$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment', true));
}

$data['heading_title'] = $this->language->get('heading_title');

$data['text_edit'] = $this->language->get('text_edit');
$data['text_enabled'] = $this->language->get('text_enabled');
$data['text_disabled'] = $this->language->get('text_disabled');
$data['text_all_zones'] = $this->language->get('text_all_zones');
$data['text_yes'] = $this->language->get('text_yes');
$data['text_no'] = $this->language->get('text_no');

$data['entry_key_id'] = $this->language->get('entry_key_id');
$data['entry_key_secret'] = $this->language->get('entry_key_secret');
$data['entry_order_status'] = $this->language->get('entry_order_status');
$data['entry_status'] = $this->language->get('entry_status');
$data['entry_sort_order'] = $this->language->get('entry_sort_order');

$data['entry_payment_action'] = $this->language->get('entry_payment_action');
$data['entry_webhook_secret'] = $this->language->get('entry_webhook_secret');
$data['entry_webhook_status'] = $this->language->get('entry_webhook_status');
$data['entry_webhook_url'] = $this->language->get('entry_webhook_url');

$data['button_save'] = $this->language->get('button_save');
$data['button_cancel'] = $this->language->get('button_cancel');

$data['help_key_id'] = $this->language->get('help_key_id');
$data['help_order_status'] = $this->language->get('help_order_status');
$data['help_webhook_url'] = $this->language->get('help_webhook_url');

if (isset($this->error['warning'])) {
$data['error_warning'] = $this->error['warning'];
} else {
Expand Down Expand Up @@ -75,101 +45,91 @@ public function index()

$data['breadcrumbs'][] = array(
'text' => $this->language->get('text_home'),
'href' => $this->url->link('common/dashboard', 'user_token='.$this->session->data['user_token'], 'SSL'),
'separator' => false,
'href' => $this->url->link('common/dashboard', 'user_token='.$this->session->data['user_token'],true),
);

$data['breadcrumbs'][] = array(
'text' => $this->language->get('text_extension'),
'href' => $this->url->link('marketplace/extension', 'user_token='.$this->session->data['user_token'].'&type=payment', 'SSL'),
'separator' => ' :: ',
'href' => $this->url->link('marketplace/extension', 'user_token='.$this->session->data['user_token'].'&type=payment',true),
);

$data['breadcrumbs'][] = array(
'text' => $this->language->get('heading_title'),
'href' => $this->url->link('extension/payment/razorpay', 'user_token='.$this->session->data['user_token'], 'SSL'),
'separator' => ' :: ',
'href' => $this->url->link('extension/payment/razorpay', 'user_token='.$this->session->data['user_token'],true),
);

$data['action'] = $this->url->link('extension/payment/razorpay', 'user_token=' . $this->session->data['user_token'], true);

$data['cancel'] = $this->url->link('extension/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment', true);
$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment', true);

if (isset($this->request->post['payment_razorpay_key_id'])) {
$data['razorpay_key_id'] = $this->request->post['payment_razorpay_key_id'];
$data['payment_razorpay_key_id'] = $this->request->post['payment_razorpay_key_id'];
} else {
$data['razorpay_key_id'] = $this->config->get('payment_razorpay_key_id');
$data['payment_razorpay_key_id'] = $this->config->get('payment_razorpay_key_id');
}

if (isset($this->request->post['payment_razorpay_key_secret'])) {
$data['razorpay_key_secret'] = $this->request->post['payment_razorpay_key_secret'];
$data['payment_razorpay_key_secret'] = $this->request->post['payment_razorpay_key_secret'];
} else {
$data['razorpay_key_secret'] = $this->config->get('payment_razorpay_key_secret');
$data['payment_razorpay_key_secret'] = $this->config->get('payment_razorpay_key_secret');
}

if (isset($this->request->post['payment_razorpay_order_status_id'])) {
$data['razorpay_order_status_id'] = $this->request->post['payment_razorpay_order_status_id'];
$data['payment_razorpay_order_status_id'] = $this->request->post['payment_razorpay_order_status_id'];
} else {
$data['razorpay_order_status_id'] = ($this->config->get('payment_razorpay_order_status_id')) ? $this->config->get('payment_razorpay_order_status_id') : 2;
$data['payment_razorpay_order_status_id'] = ($this->config->get('payment_razorpay_order_status_id')) ? $this->config->get('payment_razorpay_order_status_id') : 2;
}

$this->load->model('localisation/order_status');

$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();

if (isset($this->request->post['payment_razorpay_status'])) {
$data['razorpay_status'] = $this->request->post['payment_razorpay_status'];
$data['payment_razorpay_status'] = $this->request->post['payment_razorpay_status'];
} else {
$data['razorpay_status'] = $this->config->get('payment_razorpay_status');
$data['payment_razorpay_status'] = $this->config->get('payment_razorpay_status');
}

if (isset($this->request->post['payment_razorpay_sort_order'])) {
$data['razorpay_sort_order'] = $this->request->post['payment_razorpay_sort_order'];
$data['payment_razorpay_sort_order'] = $this->request->post['payment_razorpay_sort_order'];
} else {
$data['razorpay_sort_order'] = $this->config->get('payment_razorpay_sort_order');
$data['payment_razorpay_sort_order'] = $this->config->get('payment_razorpay_sort_order');
}

if (isset($this->request->post['payment_razorpay_payment_action'])) {
$data['razorpay_payment_action'] = $this->request->post['payment_razorpay_payment_action'];
$data['payment_razorpay_payment_action'] = $this->request->post['payment_razorpay_payment_action'];
} else {
$data['razorpay_payment_action'] = $this->config->get('payment_razorpay_payment_action');
$data['payment_razorpay_payment_action'] = $this->config->get('payment_razorpay_payment_action');
}

if (isset($this->request->post['payment_razorpay_max_capture_delay'])) {
$data['razorpay_max_capture_delay'] = $this->request->post['payment_razorpay_max_capture_delay'];
$data['payment_razorpay_max_capture_delay'] = $this->request->post['payment_razorpay_max_capture_delay'];
} else {
$data['razorpay_max_capture_delay'] = $this->config->get('payment_razorpay_max_capture_delay');
$data['payment_razorpay_max_capture_delay'] = $this->config->get('payment_razorpay_max_capture_delay');
}

if (isset($this->request->post['payment_razorpay_webhook_status'])) {
$data['razorpay_webhook_status'] = $this->request->post['payment_razorpay_webhook_status'];
$data['payment_razorpay_webhook_status'] = $this->request->post['payment_razorpay_webhook_status'];
} else {
$data['razorpay_webhook_status'] = $this->config->get('payment_razorpay_webhook_status');
$data['payment_razorpay_webhook_status'] = $this->config->get('payment_razorpay_webhook_status');
}

if (isset($this->request->post['payment_razorpay_webhook_secret'])) {
$data['razorpay_webhook_secret'] = $this->request->post['payment_razorpay_webhook_secret'];
$data['payment_razorpay_webhook_secret'] = $this->request->post['payment_razorpay_webhook_secret'];
} else {
$data['razorpay_webhook_secret'] = $this->config->get('payment_razorpay_webhook_secret');
$data['payment_razorpay_webhook_secret'] = $this->config->get('payment_razorpay_webhook_secret');
}

$data['razorpay_webhook_url'] = HTTPS_CATALOG . 'index.php?route=extension/payment/razorpay/webhook';

$data['payment_razorpay_webhook_url'] = HTTPS_CATALOG . 'index.php?route=extension/payment/razorpay/webhook';

$this->template = 'extension/payment/razorpay';
$this->children = array(
'common/header',
'common/footer',
);
$data['header'] = $this->load->controller('common/header');
$data['column_left'] = $this->load->controller('common/column_left');
$data['footer'] = $this->load->controller('common/footer');

$this->response->setOutput($this->load->view('extension/payment/razorpay', $data));
}

protected function validate()
{
protected function validate() {
if (!$this->user->hasPermission('modify', 'extension/payment/razorpay')) {
$this->error['warning'] = $this->language->get('error_permission');
}
Expand All @@ -186,10 +146,6 @@ protected function validate()
$this->error['payment_razorpay_webhook_secret'] = $this->language->get('error_webhook_secret');
}

if (!$this->error) {
return true;
} else {
return false;
}
return !$this->error;
}
}