Skip to content

Commit a66a246

Browse files
NicoEigenmannCWNicoEigenmannCW
committed
Release 1.1.6
1 parent 6fd2f0b commit a66a246

14 files changed

+46
-36
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ This repository contains the PostFinance Checkout WooCommerce plugin that enable
1313

1414
## Documentation
1515

16-
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.5/docs/en/documentation.html)
16+
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.6/docs/en/documentation.html)
1717

1818
## License
1919

20-
Please see the [license file](https://github.com/pfpayments/woocommerce/blob/1.1.5/LICENSE) for more information.
20+
Please see the [license file](https://github.com/pfpayments/woocommerce/blob/1.1.6/LICENSE) for more information.
2121

2222

2323

‎changelog.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@
9595

9696
* Fix - Fixes Fatal Error with newest version of WooCommerce Multilingual
9797

98+
= 1.1.6 - July 19, 2018 =
99+
100+
* Tweak - Updated settings page
101+
* Dev - Updated to PostFinance Checkout SDK 1.1.8
102+

‎docs/en/documentation.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
77
<meta name="keywords" value="PostFinance Checkout, WooCommerce, Wordpress Plugin, WooCommerce Extension, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the WooCommerce PostFinance Checkout plugin that enables processing payments with PostFinance Checkout."> <link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/woocommerce/master/docs/en/documentation.html" />
8-
<title>Documentation</title>
8+
<title>PostFinance Checkout WooCommerce</title>
99
<link href="assets/base.css" rel="stylesheet" />
1010
</head>
1111
<body class="documentation">
1212
<div class="layout-wrapper">
1313
<div class="layout-title">
14-
<h1>Documentation</h1>
14+
<h1>PostFinance Checkout WooCommerce</h1>
1515
<h2>Documentation</h2> </div>
1616
<div class="layout-navigation">
1717
<ul class="nav">
@@ -21,7 +21,7 @@ <h2>Documentation</h2> </div>
2121
</a>
2222
</li>
2323
<li>
24-
<a href="https://github.com/pfpayments/woocommerce/releases/tag/1.1.5/">
24+
<a href="https://github.com/pfpayments/woocommerce/releases/tag/1.1.6/">
2525
Source
2626
</a>
2727
</li>

‎includes/admin/class-wc-postfinancecheckout-admin-settings-page.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function get_settings(){
145145
$settings = array(
146146
array(
147147
'links' => array(
148-
'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.5/docs/en/documentation.html' => __('Documentation', 'woo-postfinancecheckout'),
148+
'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.6/docs/en/documentation.html' => __('Documentation', 'woo-postfinancecheckout'),
149149
'https://www.postfinance-checkout.ch/user/signup' => __('Sign Up', 'woo-postfinancecheckout')
150150
),
151151
'type' => 'postfinancecheckout_links',
@@ -159,32 +159,32 @@ public function get_settings(){
159159
'type' => 'title',
160160
'id' => 'general_options'
161161
),
162+
163+
array(
164+
'title' => __('Space Id', 'woo-postfinancecheckout'),
165+
'id' => WooCommerce_PostFinanceCheckout::CK_SPACE_ID,
166+
'type' => 'text',
167+
'css' => 'min-width:300px;',
168+
'desc' => __('(required)', 'woo-postfinancecheckout')
169+
),
162170

163171
array(
164172
'title' => __('User Id', 'woo-postfinancecheckout'),
165-
'desc_tip' => __('The Application User needs to have full permissions in the space this shop is linked to.', 'woo-postfinancecheckout'),
173+
'desc_tip' => __('The user needs to have full permissions in the space this shop is linked to.', 'woo-postfinancecheckout'),
166174
'id' => WooCommerce_PostFinanceCheckout::CK_APP_USER_ID,
167175
'type' => 'text',
168176
'css' => 'min-width:300px;',
169177
'desc' => __('(required)', 'woo-postfinancecheckout')
170178
),
171179

172180
array(
173-
'title' => __('Application Key', 'woo-postfinancecheckout'),
181+
'title' => __('Authentication Key', 'woo-postfinancecheckout'),
174182
'id' => WooCommerce_PostFinanceCheckout::CK_APP_USER_KEY,
175183
'type' => 'password',
176184
'css' => 'min-width:300px;',
177185
'desc' => __('(required)', 'woo-postfinancecheckout')
178186
),
179187

180-
array(
181-
'title' => __('Space Id', 'woo-postfinancecheckout'),
182-
'id' => WooCommerce_PostFinanceCheckout::CK_SPACE_ID,
183-
'type' => 'text',
184-
'css' => 'min-width:300px;',
185-
'desc' => __('(required)', 'woo-postfinancecheckout')
186-
),
187-
188188
array(
189189
'title' => __('Space View Id', 'woo-postfinancecheckout'),
190190
'id' => WooCommerce_PostFinanceCheckout::CK_SPACE_VIEW_ID,

‎includes/class-wc-postfinancecheckout-migration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private static function parse_update_notice($content, $new_version){
260260
public static function plugin_row_meta( $links, $file ) {
261261
if ( WC_POSTFINANCECHECKOUT_PLUGIN_BASENAME === $file ) {
262262
$row_meta = array(
263-
'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.5/docs/en/documentation.html" aria-label="' . esc_attr__('View Documentation', 'woo-postfinancecheckout') . '">' . esc_html__('Documentation', 'woo-postfinancecheckout') . '</a>',
263+
'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/1.1.6/docs/en/documentation.html" aria-label="' . esc_attr__('View Documentation', 'woo-postfinancecheckout') . '">' . esc_html__('Documentation', 'woo-postfinancecheckout') . '</a>',
264264
);
265265

266266
return array_merge( $links, $row_meta );

‎languages/woo-postfinancecheckout-de_DE.mo‎

-23 Bytes
Binary file not shown.

‎languages/woo-postfinancecheckout-de_DE.po‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,10 @@ msgstr "Benutzer ID"
421421

422422
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:165
423423
msgid ""
424-
"The Application User needs to have full permissions in the space this shop "
424+
"The user needs to have full permissions in the space this shop "
425425
"is linked to."
426426
msgstr ""
427-
"Der Anwendungsbenutzer muss über volle Berechtigungen in dem Bereich "
427+
"Der Benutzer muss über volle Berechtigungen in dem Bereich "
428428
"verfügen, mit dem dieser Shop verknüpft ist."
429429

430430
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:169
@@ -434,16 +434,16 @@ msgid "(required)"
434434
msgstr "(Pflicht)"
435435

436436
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:173
437-
msgid "Application Key"
438-
msgstr "Applikationsschlüssel"
437+
msgid "Authentication Key"
438+
msgstr "Authentication Key"
439439

440440
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:181
441441
msgid "Space Id"
442442
msgstr "Space ID"
443443

444444
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:189
445445
msgid "Space View Id"
446-
msgstr "Space VIew ID"
446+
msgstr "Space View ID"
447447

448448
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:201
449449
msgid "Email Options"

‎languages/woo-postfinancecheckout.pot‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ msgstr ""
395395

396396
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:165
397397
msgid ""
398-
"The Application User needs to have full permissions in the space this shop "
398+
"The user needs to have full permissions in the space this shop "
399399
"is linked to."
400400
msgstr ""
401401

@@ -406,7 +406,7 @@ msgid "(required)"
406406
msgstr ""
407407

408408
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:173
409-
msgid "Application Key"
409+
msgid "Authentication Key"
410410
msgstr ""
411411

412412
#: includes/admin/class-wc-postfinancecheckout-admin-settings-page.php:181

‎postfinancecheckout-sdk/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"sdk",
99
"api"
1010
],
11-
"homepage": "https://www.postfinance.ch/",
11+
"homepage": "https://www.postfinance.ch",
1212
"license": "Apache-2.0",
1313
"authors": [
1414
{

‎postfinancecheckout-sdk/lib/Http/SocketHttpClient.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,11 @@ private function createSocketStream(ApiClient $apiClient, HttpRequest $request)
303303
$host = ($request->isSecureConnection() ? $this->getSslProtocol() . '://' : '') . $request->getHost();
304304
$port = $request->getPort();
305305
}
306-
$socket = $host . ':' . $port;
306+
307+
$socket = $host;
308+
if(!empty($port)){
309+
$socket .= ':' . $port;
310+
}
307311

308312
$filePointer = @stream_socket_client($socket, $errno, $errstr, $apiClient->getConnectionTimeout(), STREAM_CLIENT_CONNECT,
309313
$this->createStreamContext($apiClient, $request));

0 commit comments

Comments
 (0)