diff --git a/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/Block/Adminhtml/System/Config/Fieldset/Expanded.php index 48ceb9d3..2d7a9af3 100644 --- a/Block/Adminhtml/System/Config/Fieldset/Expanded.php +++ b/Block/Adminhtml/System/Config/Fieldset/Expanded.php @@ -1,7 +1,6 @@ isPaid() || $transaction->isPending()) { $resultRedirect = $this->resultRedirectFactory->create(); - - return $resultRedirect->setPath('checkout/onepage/success'); } else { //canceled, reorder diff --git a/Model/Config.php b/Model/Config.php index 91df4cd3..29918e22 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -1,6 +1,6 @@ _isAvailable()) { - return [0 => __('No'), 1 => __('Yes')]; - } else { - return [0 => __('Not available (please edit the serviceID ('.$this->_config->getServiceId().') on admin.pay.nl')]; + $configured = $this->_config->configureSDK(); + if (!$configured) { + return [0 => __('Enter your API-token and ServiceId first')]; + } + try { + if ($this->_isAvailable()) { + return [0 => __('No'), 1 => __('Yes')]; + } else { + return [0 => __('Not available, you can enable this on admin.pay.nl')]; + } + } catch(\Exception $e){ + return [0 => 'Error: '.$e->getMessage()]; } } diff --git a/Model/Config/Source/Available/Billink.php b/Model/Config/Source/Available/Billink.php index b2176a9a..5429b134 100644 --- a/Model/Config/Source/Available/Billink.php +++ b/Model/Config/Source/Available/Billink.php @@ -1,4 +1,7 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Config\Source\Order\Status; diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php index 7f7d8754..a6c3f5f6 100644 --- a/Model/ConfigProvider.php +++ b/Model/ConfigProvider.php @@ -1,8 +1,8 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Billink.php b/Model/Paymentmethod/Billink.php index a7d39575..f16211c5 100644 --- a/Model/Paymentmethod/Billink.php +++ b/Model/Paymentmethod/Billink.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Cartebleue.php b/Model/Paymentmethod/Cartebleue.php index b8defd46..7fa047cd 100644 --- a/Model/Paymentmethod/Cartebleue.php +++ b/Model/Paymentmethod/Cartebleue.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Clickandbuy.php b/Model/Paymentmethod/Clickandbuy.php index 94ed8056..99608c9a 100644 --- a/Model/Paymentmethod/Clickandbuy.php +++ b/Model/Paymentmethod/Clickandbuy.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Fashioncheque.php b/Model/Paymentmethod/Fashioncheque.php index 53ec0447..b51914a2 100644 --- a/Model/Paymentmethod/Fashioncheque.php +++ b/Model/Paymentmethod/Fashioncheque.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Fashiongiftcard.php b/Model/Paymentmethod/Fashiongiftcard.php index a580e866..5b3937aa 100644 --- a/Model/Paymentmethod/Fashiongiftcard.php +++ b/Model/Paymentmethod/Fashiongiftcard.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Gezondheidsbon.php b/Model/Paymentmethod/Gezondheidsbon.php index 84243ff0..ae84eaab 100644 --- a/Model/Paymentmethod/Gezondheidsbon.php +++ b/Model/Paymentmethod/Gezondheidsbon.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Giropay.php b/Model/Paymentmethod/Giropay.php index bc5f32de..94d60a1b 100644 --- a/Model/Paymentmethod/Giropay.php +++ b/Model/Paymentmethod/Giropay.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Givacard.php b/Model/Paymentmethod/Givacard.php index 7b332e17..83d1100a 100644 --- a/Model/Paymentmethod/Givacard.php +++ b/Model/Paymentmethod/Givacard.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Ideal.php b/Model/Paymentmethod/Ideal.php index b45fc388..8783082e 100644 --- a/Model/Paymentmethod/Ideal.php +++ b/Model/Paymentmethod/Ideal.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Maestro.php b/Model/Paymentmethod/Maestro.php index 4feacd08..c6981516 100644 --- a/Model/Paymentmethod/Maestro.php +++ b/Model/Paymentmethod/Maestro.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Mistercash.php b/Model/Paymentmethod/Mistercash.php index 42f91901..a9ca4694 100644 --- a/Model/Paymentmethod/Mistercash.php +++ b/Model/Paymentmethod/Mistercash.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Mybank.php b/Model/Paymentmethod/Mybank.php index a2d41476..57cb2a26 100644 --- a/Model/Paymentmethod/Mybank.php +++ b/Model/Paymentmethod/Mybank.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Overboeking.php b/Model/Paymentmethod/Overboeking.php index b8588a29..7b660349 100644 --- a/Model/Paymentmethod/Overboeking.php +++ b/Model/Paymentmethod/Overboeking.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/PaymentMethod.php b/Model/Paymentmethod/PaymentMethod.php index d9ef4ca5..8fcd41a1 100644 --- a/Model/Paymentmethod/PaymentMethod.php +++ b/Model/Paymentmethod/PaymentMethod.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; @@ -29,14 +16,6 @@ abstract class PaymentMethod extends AbstractMethod protected $_isInitializeNeeded = true; protected $_canRefund = false; -// protected $_formBlockType = 'Paynl\Payment\Block\Form\Default'; - /** - * Sidebar payment info block - * - * @var string - */ - //protected $_infoBlockType = 'Magento\Payment\Block\Info\Instructions'; - /** * Get payment instructions text from config * diff --git a/Model/Paymentmethod/Paypal.php b/Model/Paymentmethod/Paypal.php index df1e79e5..e111af2a 100644 --- a/Model/Paymentmethod/Paypal.php +++ b/Model/Paymentmethod/Paypal.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Paysafecard.php b/Model/Paymentmethod/Paysafecard.php index b144977f..a63e0e94 100644 --- a/Model/Paymentmethod/Paysafecard.php +++ b/Model/Paymentmethod/Paysafecard.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Podiumcadeaukaart.php b/Model/Paymentmethod/Podiumcadeaukaart.php index 29174285..4a268baf 100644 --- a/Model/Paymentmethod/Podiumcadeaukaart.php +++ b/Model/Paymentmethod/Podiumcadeaukaart.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Postepay.php b/Model/Paymentmethod/Postepay.php index 4f87edf4..4707957d 100644 --- a/Model/Paymentmethod/Postepay.php +++ b/Model/Paymentmethod/Postepay.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Sofortbanking.php b/Model/Paymentmethod/Sofortbanking.php index a35d5f4a..3a912abf 100644 --- a/Model/Paymentmethod/Sofortbanking.php +++ b/Model/Paymentmethod/Sofortbanking.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Telefonischbetalen.php b/Model/Paymentmethod/Telefonischbetalen.php index 355733b9..e66a6007 100644 --- a/Model/Paymentmethod/Telefonischbetalen.php +++ b/Model/Paymentmethod/Telefonischbetalen.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Visamastercard.php b/Model/Paymentmethod/Visamastercard.php index 1cf93a81..d84b82a8 100644 --- a/Model/Paymentmethod/Visamastercard.php +++ b/Model/Paymentmethod/Visamastercard.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Webshopgiftcard.php b/Model/Paymentmethod/Webshopgiftcard.php index 0c4cd72b..c36d8fbe 100644 --- a/Model/Paymentmethod/Webshopgiftcard.php +++ b/Model/Paymentmethod/Webshopgiftcard.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Wijncadeau.php b/Model/Paymentmethod/Wijncadeau.php index 94c106f3..0c4c4e72 100644 --- a/Model/Paymentmethod/Wijncadeau.php +++ b/Model/Paymentmethod/Wijncadeau.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/Model/Paymentmethod/Yourgift.php b/Model/Paymentmethod/Yourgift.php index 4676dca6..20cafb01 100644 --- a/Model/Paymentmethod/Yourgift.php +++ b/Model/Paymentmethod/Yourgift.php @@ -1,19 +1,6 @@ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/** + * Copyright © 2015 Pay.nl All rights reserved. */ namespace Paynl\Payment\Model\Paymentmethod; diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml index f138291e..1eec9952 100644 --- a/etc/adminhtml/paymentmethods.xml +++ b/etc/adminhtml/paymentmethods.xml @@ -5,6 +5,7 @@ + diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 19b5d1d7..c6b41265 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -21,7 +21,7 @@ along with this program. If not, see .
- + @@ -34,7 +34,7 @@ along with this program. If not, see . Paynl\Payment\Block\Adminhtml\System\Config\Fieldset\Expanded - + diff --git a/etc/payment.xml b/etc/payment.xml index 049d278a..c4fea4c6 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -6,20 +6,84 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd"> + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + 0 - - diff --git a/registration.php b/registration.php index 2c884aa2..34df1e14 100644 --- a/registration.php +++ b/registration.php @@ -1,4 +1,7 @@ -getMethod()->getInstructions()): ?> - - diff --git a/view/frontend/web/js/action/set-payment-method.js b/view/frontend/web/js/action/set-payment-method.js index 382f7ead..042f32ed 100644 --- a/view/frontend/web/js/action/set-payment-method.js +++ b/view/frontend/web/js/action/set-payment-method.js @@ -20,7 +20,6 @@ define( payload, paymentData = quote.paymentMethod(), billingAddress = quote.billingAddress(); - /** * Checkout for guest and registered customer. */ @@ -44,6 +43,7 @@ define( }; } + fullScreenLoader.startLoader(); return storage.post( serviceUrl, JSON.stringify(payload) ).done(