Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Commit

Permalink
Release 1.0.26
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Schurter committed Dec 17, 2018
1 parent 76e2608 commit c67a398
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 15 deletions.
25 changes: 25 additions & 0 deletions Plugin/Sales/Model/AdminOrder/Create.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
* PostFinance Checkout Magento 2
*
* This Magento 2 extension enables to process payments with PostFinance Checkout (https://www.postfinance.ch/).
*
* @package PostFinanceCheckout_Payment
* @author customweb GmbH (http://www.customweb.com/)
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache Software License (ASL 2.0)
*/
namespace PostFinanceCheckout\Payment\Plugin\Sales\Model\AdminOrder;

use PostFinanceCheckout\Payment\Model\Payment\Method\Adapter;

class Create
{

public function beforeCreateOrder(\Magento\Sales\Model\AdminOrder\Create $subject)
{
if ($subject->getQuote()->getPayment()->getMethodInstance() instanceof Adapter) {
$subject->setSendConfirmation(false);
}
}

}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ This repository contains the Magento 2.2 extension that enables to process payme

## Documentation

* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html)
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html)

## License

Please see the [license file](https://github.com/pfpayments/magento-2.2/blob/1.0.25/LICENSE) for more information.
Please see the [license file](https://github.com/pfpayments/magento-2.2/blob/1.0.26/LICENSE) for more information.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"type" : "magento2-module",
"version" : "1.0.25",
"version" : "1.0.26",
"require" : {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/framework" : "^101.0.2",
Expand Down
2 changes: 1 addition & 1 deletion docs/en/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Documentation</h2> </div>
</a>
</li>
<li>
<a href="https://github.com/pfpayments/magento-2.2/releases/tag/1.0.25/">
<a href="https://github.com/pfpayments/magento-2.2/releases/tag/1.0.26/">
Source
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<resource>PostFinanceCheckout_Payment::config</resource>
<group id="information" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Information</label>
<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
<field id="version" translate="label" type="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Module Version</label>
</field>
Expand Down
2 changes: 1 addition & 1 deletion etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<default>
<postfinancecheckout_payment>
<information>
<version>1.0.25</version>
<version>1.0.26</version>
<sdk_version>1.1.12</sdk_version>
</information>
<general>
Expand Down
3 changes: 3 additions & 0 deletions etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,7 @@
<type name="Magento\Sales\Model\Service\CreditmemoService">
<plugin name="postfinancecheckout_payment_sales_creditmemo_service" type="PostFinanceCheckout\Payment\Plugin\Sales\Model\Service\CreditmemoService" />
</type>
<type name="Magento\Sales\Model\AdminOrder\Create">
<plugin name="postfinancecheckout_payment_sales_adminorder_create" type="PostFinanceCheckout\Payment\Plugin\Sales\Model\AdminOrder\Create" />
</type>
</config>
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="PostFinanceCheckout_Payment" setup_version="1.0.25">
<module name="PostFinanceCheckout_Payment" setup_version="1.0.26">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Payment"/>
Expand Down
2 changes: 1 addition & 1 deletion i18n/de_DE.csv
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"General","Allgemein"
"Hold Delivery","Lieferung halten"
"ID required","ID erforderlich"
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
"Inactive","Inaktiv"
"Information","Informationen"
"Invoice","Rechnung"
Expand Down
2 changes: 1 addition & 1 deletion i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"General","General"
"Hold Delivery","Hold Delivery"
"ID required","ID required"
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.25/docs/en/documentation.html"" target=""_blank"">documentation</a>."
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.2/1.0.26/docs/en/documentation.html"" target=""_blank"">documentation</a>."
"Inactive","Inactive"
"Information","Information"
"Invoice","Invoice"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ define([
'jquery',
'Magento_Checkout/js/view/payment/default',
'rjsResolver',
'Magento_Checkout/js/model/full-screen-loader'
'Magento_Checkout/js/model/full-screen-loader',
'Magento_Checkout/js/model/payment/method-list'
], function(
$,
Component,
resolver,
fullScreenLoader
fullScreenLoader,
methodList
){
'use strict';
return Component.extend({
Expand All @@ -37,6 +39,14 @@ define([
this.createHandler();
}
}).bind(this));

/*methodList.subscribe($.proxy(function(methods){
if (methods) {
this.handler = null;
$('#' + this.getFormId()).find('iframe').remove();
this.createHandler();
}
}, this));*/
},

getFormId: function(){
Expand Down Expand Up @@ -66,10 +76,12 @@ define([
this.placeOrder();
} else {
$('html, body').animate({ scrollTop: $('#' + this.getCode()).offset().top - 20 });
for (var i = 0; i < validationResult.errors.length; i++) {
this.messageContainer.addErrorMessage({
message: validationResult.errors[i]
});
if (validationResult.errors) {
for (var i = 0; i < validationResult.errors.length; i++) {
this.messageContainer.addErrorMessage({
message: validationResult.errors[i]
});
}
}
}
}).bind(this), function(){
Expand Down

0 comments on commit c67a398

Please sign in to comment.