Skip to content
This repository was archived by the owner on Mar 8, 2023. It is now read-only.

Commit 0fdc80d

Browse files
luchaosluchaos
committed
Merge branch 'release/1.2.0'
2 parents 1b99487 + f2f4341 commit 0fdc80d

File tree

8 files changed

+47
-34
lines changed

8 files changed

+47
-34
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Release Notes
22

3-
## Unreleased
3+
## v1.2.0 (2019-09-10)
4+
### Added
5+
- [README](README.md) note on enabling/disabling additional adapters
6+
### Changed
7+
- Display title, gateway API username & password configurable for individual adapters
48

59
## v1.1.0 (2019-09-03)
610
### Added

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
* Clone or download the source from this repository.
1111
* Update [src/logo.png](src/logo.png), [src/logo.gif](src/logo.gif) and images in [src/views/img/creditcard](src/views/img/creditcard).
12+
* Comment/disable adapters in`src/paymentgatewaycloud.php` - see `getCreditCards()` method.
1213
* Run the build script to apply desired branding and create a zip file ready for distribution:
1314
```shell script
1415
php build.php gateway.mypaymentprovider.com "My Payment Provider"

‎build.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* extension source version
44
*/
5-
$version = '1.1.0';
5+
$version = '1.2.0';
66

77
/**
88
* dist filename

‎src/controllers/front/callback.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public function postProcess()
1414

1515
\PaymentGatewayCloud\Client\Client::setApiUrl(Configuration::get('PAYMENT_GATEWAY_CLOUD_HOST', null));
1616
$client = new \PaymentGatewayCloud\Client\Client(
17-
Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER', null),
18-
Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD', null),
17+
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER', null),
18+
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD', null),
1919
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_API_KEY', null),
2020
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_SHARED_SECRET', null)
2121
);

‎src/controllers/front/payment.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public function postProcess()
7777
*/
7878
PaymentGatewayCloud\Client\Client::setApiUrl(Configuration::get('PAYMENT_GATEWAY_CLOUD_HOST', null));
7979
$client = new PaymentGatewayCloud\Client\Client(
80-
Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER', null),
81-
Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD', null),
80+
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER', null),
81+
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD', null),
8282
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_API_KEY', null),
8383
Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_SHARED_SECRET', null)
8484
);

‎src/paymentgatewaycloud.php

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ public function install()
6666
public function uninstall()
6767
{
6868
// TODO: delete Configuration
69+
// $prefix = strtoupper(str_replace(' ', '', $creditCard));
6970
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_ENABLED');
70-
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER');
71-
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD');
71+
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER');
72+
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD');
7273
// Configuration::deleteByName('PAYMENT_GATEWAY_CLOUD_HOST');
7374

7475
return parent::uninstall();
@@ -129,8 +130,11 @@ protected function renderForm()
129130

130131
private function getCreditCards()
131132
{
133+
/**
134+
* Comment/disable adapters that are not applicable
135+
*/
132136
return [
133-
'cc' => 'CreditCard',
137+
'cc' => 'Credit Card',
134138
'visa' => 'Visa',
135139
'mastercard' => 'MasterCard',
136140
'amex' => 'Amex',
@@ -152,7 +156,7 @@ protected function getConfigForm()
152156
'form' => [
153157
'tabs' => [
154158
'General' => 'General',
155-
'CreditCard' => 'CreditCard',
159+
'CreditCard' => 'Credit Card',
156160
],
157161
'legend' => [
158162
'title' => $this->l('Settings'),
@@ -178,25 +182,12 @@ protected function getConfigForm()
178182
],
179183
],
180184
],
181-
[
182-
'name' => 'PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER',
183-
'label' => $this->l('User'),
184-
'tab' => 'General',
185-
'type' => 'text',
186-
],
187-
[
188-
'name' => 'PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD',
189-
'label' => $this->l('Password'),
190-
'tab' => 'General',
191-
'type' => 'text',
192-
],
193185
[
194186
'name' => 'PAYMENT_GATEWAY_CLOUD_HOST',
195187
'label' => $this->l('Host'),
196188
'tab' => 'General',
197189
'type' => 'text',
198190
],
199-
200191
// [
201192
// 'type' => 'select',
202193
// 'name' => 'PAYMENT_GATEWAY_CLOUD_CC_TYPES[]',
@@ -222,8 +213,7 @@ protected function getConfigForm()
222213

223214
foreach ($this->getCreditCards() as $creditCard) {
224215

225-
$prefix = strtoupper($creditCard);
226-
216+
$prefix = strtoupper(str_replace(' ', '', $creditCard));
227217

228218
$form['form']['input'][] = [
229219
'name' => 'line',
@@ -251,6 +241,24 @@ protected function getConfigForm()
251241
],
252242
],
253243
];
244+
$form['form']['input'][] = [
245+
'name' => 'PAYMENT_GATEWAY_CLOUD_' . $prefix . '_TITLE',
246+
'label' => $this->l('Title'),
247+
'tab' => 'CreditCard',
248+
'type' => 'text',
249+
];
250+
$form['form']['input'][] = [
251+
'name' => 'PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER',
252+
'label' => $this->l('User'),
253+
'tab' => 'CreditCard',
254+
'type' => 'text',
255+
];
256+
$form['form']['input'][] = [
257+
'name' => 'PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD',
258+
'label' => $this->l('Password'),
259+
'tab' => 'CreditCard',
260+
'type' => 'text',
261+
];
254262
$form['form']['input'][] = [
255263
'name' => 'PAYMENT_GATEWAY_CLOUD_' . $prefix . '_API_KEY',
256264
'label' => $this->l('API Key'),
@@ -306,16 +314,17 @@ protected function getConfigFormValues()
306314
{
307315
$values = [
308316
'PAYMENT_GATEWAY_CLOUD_ENABLED' => Configuration::get('PAYMENT_GATEWAY_CLOUD_ENABLED', null),
309-
'PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER' => Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_USER', null),
310-
'PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD' => Configuration::get('PAYMENT_GATEWAY_CLOUD_ACCOUNT_PASSWORD', null),
311317
'PAYMENT_GATEWAY_CLOUD_HOST' => Configuration::get('PAYMENT_GATEWAY_CLOUD_HOST', null),
312318
// 'PAYMENT_GATEWAY_CLOUD_CC_TYPES[]' => json_decode(Configuration::get('PAYMENT_GATEWAY_CLOUD_CC_TYPES', null)),
313319
];
314320

315321
foreach ($this->getCreditCards() as $creditCard) {
316322

317-
$prefix = strtoupper($creditCard);
323+
$prefix = strtoupper(str_replace(' ', '', $creditCard));
318324
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ENABLED'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ENABLED', null);
325+
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_TITLE'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_TITLE') ?: $creditCard;
326+
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_USER', null);
327+
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ACCOUNT_PASSWORD', null);
319328
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_API_KEY'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_API_KEY', null);
320329
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_SHARED_SECRET'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_SHARED_SECRET', null);
321330
$values['PAYMENT_GATEWAY_CLOUD_' . $prefix . '_INTEGRATION_KEY'] = Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_INTEGRATION_KEY', null);
@@ -325,7 +334,6 @@ protected function getConfigFormValues()
325334
return $values;
326335
}
327336

328-
329337
/**
330338
* Payment options hook
331339
*
@@ -358,7 +366,7 @@ public function hookPaymentOptions($params)
358366

359367
foreach ($this->getCreditCards() as $key => $creditCard) {
360368

361-
$prefix = strtoupper($creditCard);
369+
$prefix = strtoupper(str_replace(' ', '', $creditCard));
362370

363371
if (!Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_ENABLED', null)) {
364372
continue;
@@ -367,8 +375,10 @@ public function hookPaymentOptions($params)
367375
$payment = new PaymentOption();
368376
$payment
369377
->setModuleName($this->name)
370-
->setCallToActionText($this->l($creditCard))
371-
->setAction($this->context->link->getModuleLink($this->name, 'payment', ['type' => $creditCard], true));
378+
->setCallToActionText($this->l(Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_TITLE', null)))
379+
->setAction($this->context->link->getModuleLink($this->name, 'payment', [
380+
'type' => $creditCard,
381+
], true));
372382

373383
if (Configuration::get('PAYMENT_GATEWAY_CLOUD_' . $prefix . '_SEAMLESS', null)) {
374384

‎src/views/js/front.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ $(document).on('submit', '#payment-form', function (e) {
3939
}
4040

4141
$("#payment-error-" + id).show().html(errorsTexts.join('<br>'));
42-
console.log(errors);
4342
}
4443
);
4544
});

‎src/views/templates/front/seamless.tpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<input type="hidden" name="ccEmail" value="">
33
<div>
44
<div id="payment-error-{$id}" class="alert alert-warning" style="display: none;">
5-
An error occured.
65
</div>
76
<div class="row">
87
<div class="form-group col-md-6">

0 commit comments

Comments
 (0)