Extract the files and upload the content of the Upload directory into the root directory of your store using FTP/SSH.
diff --git a/upload/admin/controller/extension/payment/postfinancecheckout.php b/upload/admin/controller/extension/payment/postfinancecheckout.php
index e0c175c..33a0373 100644
--- a/upload/admin/controller/extension/payment/postfinancecheckout.php
+++ b/upload/admin/controller/extension/payment/postfinancecheckout.php
@@ -228,7 +228,11 @@ private function getSettingsPageTranslatedVariables(){
$data['entry_space_view_id'] = $this->language->get("entry_space_view_id");
$data['help_space_view_id'] = $this->language->get("help_space_view_id");
- $data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+ $orderStatuses = $this->model_localisation_order_status->getOrderStatuses();
+ array_unshift($orderStatuses, array('order_status_id' => 0, 'name' => $this->language->get('text_none')));
+ $data['order_statuses'] = $orderStatuses;
+ $data['description_none_status'] = $this->language->get('description_none_status');
+
$data['postfinancecheckout_statuses'] = $this->getOrderStatusTemplateVariables();
$data['title_debug'] = $this->language->get('title_debug');
@@ -414,8 +418,8 @@ private function getSettingsDefaults(){
"postfinancecheckout_space_id" => null,
"postfinancecheckout_space_view_id" => null,
- "postfinancecheckout_processing_status_id" => 1,
- "postfinancecheckout_failed_status_id" => 10,
+ "postfinancecheckout_processing_status_id" => 0,
+ "postfinancecheckout_failed_status_id" => 0,
"postfinancecheckout_voided_status_id" => 16,
"postfinancecheckout_decline_status_id" => 8,
"postfinancecheckout_fulfill_status_id" => 5,
diff --git a/upload/admin/controller/extension/postfinancecheckout/transaction.php b/upload/admin/controller/extension/postfinancecheckout/transaction.php
new file mode 100644
index 0000000..0793606
--- /dev/null
+++ b/upload/admin/controller/extension/postfinancecheckout/transaction.php
@@ -0,0 +1,213 @@
+load->language('extension/payment/postfinancecheckout');
+
+ $this->document->setTitle($this->language->get('heading_transaction_list'));
+
+ $this->load->model('extension/postfinancecheckout/transaction');
+
+ $this->getList();
+ }
+
+ protected function getList(){
+ $filters = $this->getFilters();
+ $breadcrumbs = $this->getBreadcrumbs();
+ $transactions = $this->model_extension_postfinancecheckout_transaction->loadList($filters);
+ $transactionCount = $this->model_extension_postfinancecheckout_transaction->countRows();
+
+ $use_space_view = false;
+ $space_view = null;
+ foreach ($transactions as $transaction) {
+ if (!$space_view) {
+ $space_view = $transaction['space_view_id'];
+ }
+ else if ($space_view != $transaction['space_view_id']) {
+ $use_space_view = true;
+ break;
+ }
+ }
+
+ $data = array_merge($this->loadLanguageVariables(), $this->getSortLinks($filters));
+ $data['use_space_view'] = $use_space_view;
+ $data['breadcrumbs'] = $breadcrumbs;
+ $data['transactions'] = $transactions;
+ $data['filters'] = $filters;
+ $data['pagination'] = $this->getPagination($filters, $transactionCount)->render();
+ $data['results'] = $this->getResultsText($transactionCount, $filters['page']);
+
+ $filters['page'] = 1; // reset to page one on search. leave other filters.
+ $data['filterAction'] = PostFinanceCheckoutVersionHelper::createUrl($this->url, 'extension/postfinancecheckout/transaction',
+ $this->getQueryString($filters), true);
+
+ $data['order_statuses'] = $this->model_extension_postfinancecheckout_transaction->getOrderStatuses();
+
+ $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->loadView('extension/postfinancecheckout/transaction', $data));
+ }
+
+ protected function getRequiredPermission(){
+ return 'extension/postfinancecheckout/transaction';
+ }
+
+ private function getFilters(){
+ $filters = array(
+ 'id' => null,
+ 'order_id' => null,
+ 'transaction_id' => null,
+ 'space_id' => null,
+ 'space_view_id' => null,
+ 'state' => null,
+ 'payment_method_id' => null,
+ 'authorization_amount' => null,
+ 'created_at' => null,
+ 'updated_at' => null,
+ 'sort' => $this->getSort(),
+ 'page' => $this->getPage(),
+ 'order' => $this->getOrder()
+ );
+ foreach ($filters as $filterName => $filter) {
+ if (isset($this->request->post['filters'][$filterName])) {
+ $filters[$filterName] = $this->request->post['filters'][$filterName];
+ }
+ elseif (isset($this->request->get['filters'][$filterName])) {
+ $filters[$filterName] = $this->request->get['filters'][$filterName];
+ }
+ }
+ return $filters;
+ }
+
+ private function getQueryString(array $filters){
+ $url = '';
+ foreach ($filters as $name => $value) {
+ if ($value) {
+ $url .= '&filters[' . $name . ']=' . $value;
+ }
+ }
+ $url .= '&token=' . $this->session->data['token'];
+ return $url;
+ }
+
+ private function getSortLinks($filters){
+ $sortable = array(
+ 'id',
+ 'order_id',
+ 'transaction_id',
+ 'space_id',
+ 'space_view_id',
+ 'state',
+ 'payment_method_id',
+ 'authorization_amount',
+ 'created_at',
+ 'updated_at'
+ );
+ $filters['sort'] = null;
+ $filters['order'] = $this->getNewOrder($filters);
+ $query = $this->getQueryString($filters);
+ $sortUrl = PostFinanceCheckoutVersionHelper::createUrl($this->url, 'extension/postfinancecheckout/transaction', $query, true);
+ $links = array();
+ foreach ($sortable as $key) {
+ $links['sort_' . $key] = $sortUrl . '&filters[sort]=' . $key;
+ }
+ return $links;
+ }
+
+ private function getNewOrder(array $filters){
+ if (isset($filters['order']) && $filters['order'] == 'DESC') {
+ return 'ASC';
+ }
+ return 'DESC';
+ }
+
+ private function getPagination(array $filters, $transactionCount){
+ $pagination = new Pagination();
+ $pagination->total = $transactionCount;
+ $pagination->page = $filters['page'];
+ $pagination->limit = $this->config->get('config_limit_admin');
+ $filters['page'] = '{page}';
+ $pagination->url = PostFinanceCheckoutVersionHelper::createUrl($this->url, 'extension/postfinancecheckout/transaction',
+ $this->getQueryString($filters), true);
+ return $pagination;
+ }
+
+ private function getResultsText($transactionCount, $page){
+ $limit = $this->config->get('config_limit_admin');
+ return sprintf($this->language->get('text_pagination'), ($transactionCount) ? (($page - 1) * $limit) + 1 : 0,
+ ((($page - 1) * $limit) > ($transactionCount - $limit)) ? $transactionCount : ((($page - 1) * $limit) + $limit), $transactionCount,
+ ceil($transactionCount / $limit));
+ }
+
+ private function getOrder(){
+ if (isset($this->request->get['filters']['order'])) {
+ return $this->request->get['filters']['order'];
+ }
+ return 'DESC';
+ }
+
+ private function getPage(){
+ if (isset($this->request->get['filters']['page'])) {
+ return $this->request->get['filters']['page'];
+ }
+ return 1;
+ }
+
+ private function getSort(){
+ if (isset($this->request->get['filters']['sort'])) {
+ return $this->request->get['filters']['sort'];
+ }
+ return 'id';
+ }
+
+ private function getBreadcrumbs(){
+ return array(
+ array(
+ 'text' => $this->language->get('text_home'),
+ 'href' => PostFinanceCheckoutVersionHelper::createUrl($this->url, 'sale/order',
+ array(
+ 'token' => $this->session->data['token']
+ ), true)
+ ),
+ array(
+ 'text' => $this->language->get('heading_transaction_list'),
+ 'href' => PostFinanceCheckoutVersionHelper::createUrl($this->url, 'extension/postfinancecheckout/transaction',
+ array(
+ 'token' => $this->session->data['token']
+ ), true)
+ )
+ );
+ }
+
+ private function loadLanguageVariables(){
+ //TODO * NOTE: Filter works by id, e.g. searching by 'credit card' doesn't work.
+ $required = array(
+ 'heading_transaction_list',
+ 'text_transaction_list',
+ 'text_no_results',
+ 'column_id',
+ 'column_order_id',
+ 'column_transaction_id',
+ 'column_space_view_id',
+ 'column_space_id',
+ 'column_state',
+ 'column_payment_method',
+ 'column_authorization_amount',
+ 'column_created',
+ 'column_updated',
+ 'column_actions',
+ 'description_payment_method',
+ 'button_view',
+ 'button_filter'
+ );
+ $translations = array();
+ foreach ($required as $key) {
+ $translations[$key] = $this->language->get($key);
+ }
+ return $translations;
+ }
+}
\ No newline at end of file
diff --git a/upload/admin/language/en-gb/extension/payment/postfinancecheckout.php b/upload/admin/language/en-gb/extension/payment/postfinancecheckout.php
index 516c253..ba7b644 100644
--- a/upload/admin/language/en-gb/extension/payment/postfinancecheckout.php
+++ b/upload/admin/language/en-gb/extension/payment/postfinancecheckout.php
@@ -54,6 +54,7 @@
$_['description_decline_status'] = "Status the order enters when the transaction is in the PostFinance Checkout declined status.";
$_['entry_refund_status'] = "Refund status";
$_['description_refund_status'] = "Status the order enters when the transaction has been fully refunded.";
+$_['description_none_status'] = "Standard OpenCart behaviour specificies that an order confirmation email is sent when an order is moved from the 'None' state into any other state. For this reason you may want to treat 'Processing' and 'Failed' as 'None' so no emails are sent.";
// Modifications
$_['title_modifications'] = "Modifications";
@@ -94,6 +95,25 @@
$_['error_user_id_unset'] = "User ID must not be empty.";
$_['error_user_id_numeric'] = "User ID must be numeric.";
+/**
+ * ===========================================================================================
+ * Transaction list
+ * ===========================================================================================
+ */
+$_['heading_transaction_list'] = "PostFinanceCheckout Transactions";
+$_['text_transaction_list'] = "Transactions";
+$_['column_id'] = "ID";
+$_['column_order_id'] = "Order ID";
+$_['column_transaction_id'] = "Transaction ID";
+$_['column_space_id'] = "Space ID";
+$_['column_space_view_id'] = "Space View ID";
+$_['column_state'] = "State";
+$_['column_payment_method'] = "Payment Method";
+$_['description_payment_method'] = "Here you may search using the payment method ID - e.g. searching for 'Credit Card' will not return any results.";
+$_['column_created'] = "Created";
+$_['column_updated'] = "Created";
+$_['column_authorization_amount'] = "Amount";
+
/**
* ===========================================================================================
* Alerts
diff --git a/upload/admin/model/extension/postfinancecheckout/setup.php b/upload/admin/model/extension/postfinancecheckout/setup.php
index 3ae1111..d1a1c95 100644
--- a/upload/admin/model/extension/postfinancecheckout/setup.php
+++ b/upload/admin/model/extension/postfinancecheckout/setup.php
@@ -73,6 +73,7 @@ private function addPermissions(){
$this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/update');
$this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/pdf');
$this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/alert');
+ $this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/transaction');
}
private function removePermissions(){
@@ -84,5 +85,6 @@ private function removePermissions(){
$this->model_user_user_group->removePermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/update');
$this->model_user_user_group->removePermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/pdf');
$this->model_user_user_group->removePermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/alert');
+ $this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/postfinancecheckout/transaction');
}
}
\ No newline at end of file
diff --git a/upload/admin/model/extension/postfinancecheckout/transaction.php b/upload/admin/model/extension/postfinancecheckout/transaction.php
new file mode 100644
index 0000000..b3e124e
--- /dev/null
+++ b/upload/admin/model/extension/postfinancecheckout/transaction.php
@@ -0,0 +1,63 @@
+registry, $filters);
+ /* @var $transactionInfoList TransactionInfo[] */
+ $transactions = array();
+ foreach ($transactionInfoList as $transactionInfo) {
+ $paymentMethod = PaymentMethod::instance($this->registry)->find($transactionInfo->getPaymentMethodId());
+ if ($paymentMethod) {
+ $paymentMethodName = PostFinanceCheckoutHelper::instance($this->registry)->translate($paymentMethod->getName()) . " (" . $transactionInfo->getPaymentMethodId() . ")";
+ }
+ else {
+ $paymentMethodName = $transactionInfo->getPaymentMethodId();
+ }
+ $transactions[] = array(
+ 'id' => $transactionInfo->getId(),
+ 'order_id' => $transactionInfo->getOrderId(),
+ 'transaction_id' => $transactionInfo->getTransactionId(),
+ 'space_id' => $transactionInfo->getSpaceId(),
+ 'space_view_id' => $transactionInfo->getSpaceViewId(),
+ 'state' => $transactionInfo->getState(),
+ 'authorization_amount' => $transactionInfo->getAuthorizationAmount(),
+ 'created_at' => $transactionInfo->getCreatedAt()->format(self::DATE_FORMAT),
+ 'updated_at' => $transactionInfo->getUpdatedAt()->format(self::DATE_FORMAT),
+ 'payment_method' => $paymentMethodName,
+ 'view' => PostFinanceCheckoutVersionHelper::createUrl($this->url, 'sale/order/info',
+ array(
+ 'token' => $this->session->data['token'],
+ 'order_id' => $transactionInfo->getOrderId()
+ ), true)
+ );
+ }
+ return $transactions;
+ }
+
+ public function getOrderStatuses() {
+ return array(
+ '',
+ PostFinanceCheckout\Sdk\Model\TransactionState::AUTHORIZED,
+ PostFinanceCheckout\Sdk\Model\TransactionState::COMPLETED,
+ PostFinanceCheckout\Sdk\Model\TransactionState::CONFIRMED,
+ PostFinanceCheckout\Sdk\Model\TransactionState::CREATE,
+ PostFinanceCheckout\Sdk\Model\TransactionState::DECLINE,
+ PostFinanceCheckout\Sdk\Model\TransactionState::FULFILL,
+ PostFinanceCheckout\Sdk\Model\TransactionState::FAILED,
+ PostFinanceCheckout\Sdk\Model\TransactionState::PENDING,
+ PostFinanceCheckout\Sdk\Model\TransactionState::PROCESSING,
+ PostFinanceCheckout\Sdk\Model\TransactionState::AUTHORIZED,
+ PostFinanceCheckout\Sdk\Model\TransactionState::VOIDED,
+ );
+ }
+
+ public function countRows() {
+ return TransactionInfo::countRows($this->registry);
+ }
+}
\ No newline at end of file
diff --git a/upload/admin/view/template/extension/payment/postfinancecheckout.tpl b/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
index a9d1754..828d6ad 100644
--- a/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
+++ b/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
@@ -157,6 +157,7 @@
+ ]]>
+