Skip to content

Commit 93a4f3a

Browse files
Thijs-RiezebeekThijs-Riezebeek
authored
Merge pull request #49 from mollie/opencart-2.3
Module compatible with OpenCart 2.3
2 parents 1be5dfc + bedcbff commit 93a4f3a

File tree

169 files changed

+9293
-1152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+9293
-1152
lines changed

‎admin/controller/payment/mollie/base.php‎ renamed to ‎admin/controller/extension/payment/mollie/base.php‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
* @property URL $url
4343
* @property User $user
4444
*/
45-
require_once(dirname(DIR_SYSTEM) . "/catalog/controller/payment/mollie/helper.php");
45+
require_once(dirname(DIR_SYSTEM) . "/catalog/controller/extension/payment/mollie/helper.php");
4646

47-
class ControllerPaymentMollieBase extends Controller
47+
class ControllerExtensionPaymentMollieBase extends Controller
4848
{
4949
// Current module name - should be overwritten by subclass using one of the MollieHelper::MODULE_NAME_* values.
5050
const MODULE_NAME = NULL;
@@ -114,8 +114,8 @@ protected function installAllModules ()
114114
$extensions->install("payment", "mollie_" . $module_name);
115115

116116
// Set permissions.
117-
$this->model_user_user_group->addPermission($user_id, "access", "payment/mollie_" . $module_name);
118-
$this->model_user_user_group->addPermission($user_id, "modify", "payment/mollie_" . $module_name);
117+
$this->model_user_user_group->addPermission($user_id, "access", "extension/payment/mollie_" . $module_name);
118+
$this->model_user_user_group->addPermission($user_id, "modify", "extension/payment/mollie_" . $module_name);
119119
}
120120
}
121121

@@ -168,7 +168,7 @@ protected function getExtensionModel ()
168168
public function index ()
169169
{
170170
// Load essential models
171-
$this->load->language("payment/mollie");
171+
$this->load->language("extension/payment/mollie");
172172
$this->load->model("setting/setting");
173173
$this->load->model("setting/store");
174174
$this->load->model("localisation/order_status");
@@ -207,7 +207,7 @@ public function index ()
207207
if ($doRedirect)
208208
{
209209
$this->session->data['success'] = $this->language->get("text_success");
210-
$this->redirect($this->url->link("extension/payment", "token=" . $this->session->data['token'], "SSL"));
210+
$this->redirect($this->url->link("extension/extension", "type=payment&token=" . $this->session->data['token'], "SSL"));
211211
}
212212

213213
// Set data for template
@@ -320,20 +320,20 @@ public function index ()
320320
);
321321

322322
$data['breadcrumbs'][] = array(
323-
"href" => $this->url->link("extension/payment", "token=" . $this->session->data['token'], "SSL"),
323+
"href" => $this->url->link("extension/extension", "type=payment&token=" . $this->session->data['token'], "SSL"),
324324
"text" => $this->language->get("text_payment"),
325325
"separator" => ' :: ',
326326
);
327327

328328
$data['breadcrumbs'][] = array(
329-
"href" => $this->url->link("payment/mollie_" . static::MODULE_NAME, "token=" . $this->session->data['token'], "SSL"),
329+
"href" => $this->url->link("extension/payment/mollie_" . static::MODULE_NAME, "token=" . $this->session->data['token'], "SSL"),
330330
"text" => $this->language->get("heading_title"),
331331
"separator" => " :: ",
332332
);
333333

334334
// Form action url
335-
$data['action'] = $this->url->link("payment/mollie_" . static::MODULE_NAME, "token=" . $this->session->data['token'], "SSL");
336-
$data['cancel'] = $this->url->link("extension/payment", "token=" . $this->session->data['token'], "SSL");
335+
$data['action'] = $this->url->link("extension/payment/mollie_" . static::MODULE_NAME, "token=" . $this->session->data['token'], "SSL");
336+
$data['cancel'] = $this->url->link("extension/extension", "type=payment&token=" . $this->session->data['token'], "SSL");
337337

338338
// Load global settings. Some are prefixed with mollie_ideal_ for legacy reasons.
339339
$settings = array(
@@ -435,15 +435,15 @@ public function index ()
435435
// Set different template for Opencart 2 as it uses Bootstrap and a left column
436436
if ($this->isOpencart2())
437437
{
438-
$this->renderTemplate("payment/mollie_2.tpl", $data, array(
438+
$this->renderTemplate("extension/payment/mollie_2.tpl", $data, array(
439439
"header",
440440
"column_left",
441441
"footer",
442442
));
443443
}
444444
else
445445
{
446-
$this->renderTemplate("payment/mollie.tpl", $data, array(
446+
$this->renderTemplate("extension/payment/mollie.tpl", $data, array(
447447
"header",
448448
"footer",
449449
));
@@ -457,7 +457,7 @@ public function index ()
457457
*/
458458
private function validate ($store = 0)
459459
{
460-
if (!$this->user->hasPermission("modify", "payment/mollie_" . static::MODULE_NAME))
460+
if (!$this->user->hasPermission("modify", "extension/payment/mollie_" . static::MODULE_NAME))
461461
{
462462
$this->error['warning'] = $this->language->get("error_permission");
463463
}
@@ -482,33 +482,33 @@ protected function checkModuleStatus ()
482482
if ($this->isOpencart22())
483483
{
484484
$mod_files = array(
485-
DIR_APPLICATION . "controller/payment/mollie/base.php",
486-
DIR_APPLICATION . "language/en-gb/payment/mollie.php",
487-
DIR_TEMPLATE . "payment/mollie.tpl",
488-
DIR_TEMPLATE . "payment/mollie_2.tpl",
489-
DIR_CATALOG . "controller/payment/mollie-api-client/",
490-
DIR_CATALOG . "controller/payment/mollie/base.php",
491-
DIR_CATALOG . "language/en-gb/payment/mollie.php",
492-
DIR_CATALOG . "model/payment/mollie/base.php",
493-
DIR_CATALOG . "view/theme/default/template/payment/mollie_checkout_form.tpl",
494-
DIR_CATALOG . "view/theme/default/template/payment/mollie_return.tpl",
495-
DIR_CATALOG . "view/theme/default/template/payment/mollie_return_2.tpl",
485+
DIR_APPLICATION . "controller/extension/payment/mollie/base.php",
486+
DIR_APPLICATION . "language/en-gb/extension/payment/mollie.php",
487+
DIR_TEMPLATE . "extension/payment/mollie.tpl",
488+
DIR_TEMPLATE . "extension/payment/mollie_2.tpl",
489+
DIR_CATALOG . "controller/extension/payment/mollie-api-client/",
490+
DIR_CATALOG . "controller/extension/payment/mollie/base.php",
491+
DIR_CATALOG . "language/en-gb/extension/payment/mollie.php",
492+
DIR_CATALOG . "model/extension/payment/mollie/base.php",
493+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_checkout_form.tpl",
494+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_return.tpl",
495+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_return_2.tpl",
496496
);
497497
}
498498
else
499499
{
500500
$mod_files = array(
501-
DIR_APPLICATION . "controller/payment/mollie/base.php",
502-
DIR_APPLICATION . "language/english/payment/mollie.php",
503-
DIR_TEMPLATE . "payment/mollie.tpl",
504-
DIR_TEMPLATE . "payment/mollie_2.tpl",
505-
DIR_CATALOG . "controller/payment/mollie-api-client/",
506-
DIR_CATALOG . "controller/payment/mollie/base.php",
507-
DIR_CATALOG . "language/english/payment/mollie.php",
508-
DIR_CATALOG . "model/payment/mollie/base.php",
509-
DIR_CATALOG . "view/theme/default/template/payment/mollie_checkout_form.tpl",
510-
DIR_CATALOG . "view/theme/default/template/payment/mollie_return.tpl",
511-
DIR_CATALOG . "view/theme/default/template/payment/mollie_return_2.tpl",
501+
DIR_APPLICATION . "controller/extension/payment/mollie/base.php",
502+
DIR_APPLICATION . "language/english/extension/payment/mollie.php",
503+
DIR_TEMPLATE . "extension/payment/mollie.tpl",
504+
DIR_TEMPLATE . "extension/payment/mollie_2.tpl",
505+
DIR_CATALOG . "controller/extension/payment/mollie-api-client/",
506+
DIR_CATALOG . "controller/extension/payment/mollie/base.php",
507+
DIR_CATALOG . "language/english/extension/payment/mollie.php",
508+
DIR_CATALOG . "model/extension/payment/mollie/base.php",
509+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_checkout_form.tpl",
510+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_return.tpl",
511+
DIR_CATALOG . "view/theme/default/template/extension/payment/mollie_return_2.tpl",
512512
);
513513
}
514514

@@ -517,17 +517,17 @@ protected function checkModuleStatus ()
517517
{
518518
if ($this->isOpencart22())
519519
{
520-
$mod_files[] = DIR_APPLICATION . "controller/payment/mollie_" . $module_name . ".php";
521-
$mod_files[] = DIR_APPLICATION . "language/en-gb/payment/mollie_" . $module_name . ".php";
522-
$mod_files[] = DIR_CATALOG . "controller/payment/mollie_" . $module_name . ".php";
523-
$mod_files[] = DIR_CATALOG . "model/payment/mollie_" . $module_name . ".php";
520+
$mod_files[] = DIR_APPLICATION . "controller/extension/payment/mollie_" . $module_name . ".php";
521+
$mod_files[] = DIR_APPLICATION . "language/en-gb/extension/payment/mollie_" . $module_name . ".php";
522+
$mod_files[] = DIR_CATALOG . "controller/extension/payment/mollie_" . $module_name . ".php";
523+
$mod_files[] = DIR_CATALOG . "model/extension/payment/mollie_" . $module_name . ".php";
524524
}
525525
else
526526
{
527-
$mod_files[] = DIR_APPLICATION . "controller/payment/mollie_" . $module_name . ".php";
528-
$mod_files[] = DIR_APPLICATION . "language/english/payment/mollie_" . $module_name . ".php";
529-
$mod_files[] = DIR_CATALOG . "controller/payment/mollie_" . $module_name . ".php";
530-
$mod_files[] = DIR_CATALOG . "model/payment/mollie_" . $module_name . ".php";
527+
$mod_files[] = DIR_APPLICATION . "controller/extension/payment/mollie_" . $module_name . ".php";
528+
$mod_files[] = DIR_APPLICATION . "language/english/extension/payment/mollie_" . $module_name . ".php";
529+
$mod_files[] = DIR_CATALOG . "controller/extension/payment/mollie_" . $module_name . ".php";
530+
$mod_files[] = DIR_CATALOG . "model/extension/payment/mollie_" . $module_name . ".php";
531531
}
532532
}
533533

‎catalog/model/payment/mollie_banktransfer.php‎ renamed to ‎admin/controller/extension/payment/mollie_banktransfer.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ModelPaymentMollieBankTransfer extends ModelPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_BANKTRANSFER;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMollieBankTransfer extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_BANKTRANSFER;
7+
}

‎catalog/model/payment/mollie_belfius.php‎ renamed to ‎admin/controller/extension/payment/mollie_belfius.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
require_once(dirname(__FILE__) . "/mollie/base.php");
33

4-
class ModelPaymentMollieBelfius extends ModelPaymentMollieBase
4+
class ControllerExtensionPaymentMollieBelfius extends ControllerExtensionPaymentMollieBase
55
{
66
const MODULE_NAME = MollieHelper::MODULE_NAME_BELFIUS;
77
}

‎catalog/model/payment/mollie_bitcoin.php‎ renamed to ‎admin/controller/extension/payment/mollie_bitcoin.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ModelPaymentMollieBitcoin extends ModelPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_BITCOIN;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMollieBitcoin extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_BITCOIN;
7+
}

‎catalog/controller/payment/mollie_creditcard.php‎ renamed to ‎admin/controller/extension/payment/mollie_creditcard.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ControllerPaymentMollieCreditcard extends ControllerPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_CREDITCARD;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMollieCreditcard extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_CREDITCARD;
7+
}

‎admin/controller/payment/mollie_directdebit.php‎ renamed to ‎admin/controller/extension/payment/mollie_directdebit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
require_once(dirname(__FILE__) . "/mollie/base.php");
33

4-
class ControllerPaymentMollieDirectDebit extends ControllerPaymentMollieBase
4+
class ControllerExtensionPaymentMollieDirectDebit extends ControllerExtensionPaymentMollieBase
55
{
66
const MODULE_NAME = MollieHelper::MODULE_NAME_DIRECTDEBIT;
77
}

‎catalog/controller/payment/mollie_ideal.php‎ renamed to ‎admin/controller/extension/payment/mollie_ideal.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ControllerPaymentMollieIDEAL extends ControllerPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_IDEAL;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMollieIDEAL extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_IDEAL;
7+
}

‎catalog/controller/payment/mollie_mistercash.php‎ renamed to ‎admin/controller/extension/payment/mollie_mistercash.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ControllerPaymentMollieMisterCash extends ControllerPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_MISTERCASH;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMollieMisterCash extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_MISTERCASH;
7+
}

‎admin/controller/payment/mollie_paypal.php‎ renamed to ‎admin/controller/extension/payment/mollie_paypal.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ControllerPaymentMolliePayPal extends ControllerPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_PAYPAL;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMolliePayPal extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_PAYPAL;
7+
}

‎catalog/controller/payment/mollie_paysafecard.php‎ renamed to ‎admin/controller/extension/payment/mollie_paysafecard.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?php
2-
require_once(dirname(__FILE__) . "/mollie/base.php");
3-
4-
class ControllerPaymentMolliePaysafecard extends ControllerPaymentMollieBase
5-
{
6-
const MODULE_NAME = MollieHelper::MODULE_NAME_PAYSAFECARD;
7-
}
1+
<?php
2+
require_once(dirname(__FILE__) . "/mollie/base.php");
3+
4+
class ControllerExtensionPaymentMolliePaysafecard extends ControllerExtensionPaymentMollieBase
5+
{
6+
const MODULE_NAME = MollieHelper::MODULE_NAME_PAYSAFECARD;
7+
}

0 commit comments

Comments
 (0)