Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SW-267: Remove Masterpass #322

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Frontend/MoptPaymentPayone/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ public function addJsFiles(Enlight_Event_EventArgs $args)
$this->Path() . 'Views/frontend/_resources/javascript/mopt_account.js',
$this->Path() . 'Views/frontend/_resources/javascript/mopt_shipping.js',
$this->Path() . 'Views/frontend/_resources/javascript/mopt_amazonpay.js',
$this->Path() . 'Views/frontend/_resources/javascript/fatchipBSPayoneMasterpass.js',
];
return new Doctrine\Common\Collections\ArrayCollection($jsFiles);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,12 @@ class Mopt_PayoneConfig
'mopt_payone__ibt_bancontact',
'mopt_payone__ewallet_amazon_pay',
'mopt_payone__ewallet_alipay',
'mopt_payone__ewallet_masterpass',
'mopt_payone__fin_paypal_installment',
];

// only paypal express
const PAYMENTS_ADDRESSCHECK_EXCLUDED = [
'mopt_payone__ewallet_amazon_pay',
'mopt_payone__ewallet_masterpass',
'mopt_payone__ewallet_paypal',

];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,6 @@ public function mopt_payone__getPaymentMethods()
'description' => 'PAYONE AliPay',
'template' => 'mopt_paymentmean_alipay_ewallet.tpl',
'position' => 35,),
array(
'name' => 'mopt_payone__ewallet_masterpass',
'description' => 'PAYONE Masterpass',
'template' => null,
'position' => 36,),
array(
'name' => 'mopt_payone__fin_paypal_installment',
'description' => 'PAYONE Ratenkauf powered by Paypal',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public function getPayoneConfig($paymentId = 0, $forceReload = false, $asArray =
if ($this->paymentHelper->isPayoneRatepay($paymentName) ||
$this->paymentHelper->isPayoneRatepayDirectDebit($paymentName) ||
$this->paymentHelper->isPayoneRatepayInstallment($paymentName) ||
$this->paymentHelper->isPayoneMasterpass($paymentName) ||
$this->paymentHelper->isPayoneAmazonPay($paymentName)
) {
$data['sendOrdernumberAsReference'] = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -692,17 +692,6 @@ public function isPayoneAmazonPay($paymentName)
return preg_match('#mopt_payone__ewallet_amazon_pay#', $paymentName) ? true : false;
}

/**
* check if given payment name is payone masterpass
*
* @param string $paymentName
* @return boolean
*/
public function isPayoneMasterpass($paymentName)
{
return preg_match('#mopt_payone__ewallet_masterpass#', $paymentName) ? true : false;
}

/**
* check if given payment name is payone paypal installments
*
Expand Down Expand Up @@ -1196,9 +1185,6 @@ public function getActionFromPaymentName($paymentShortName)
if ($this->isPayoneAlipay($paymentShortName)) {
return 'alipay';
}
if ($this->isPayoneMasterpass($paymentShortName)) {
return 'masterpass';
}
return false;
}

Expand Down Expand Up @@ -1315,19 +1301,6 @@ public function isAmazonPayActive()
return $paymentAmazonPay->getActive();
}

/**
* checks if Masterpass is enabled
*
* @return bool
*/
public function isMasterpassActive()
{
$paymentMasterpass = Shopware()->Models()->getRepository('Shopware\Models\Payment\Payment')->findOneBy(
['name' => 'mopt_payone__ewallet_masterpass']
);
return $paymentMasterpass->getActive();
}

/**
* Marks all OrderDetails and Shipping as Fully Captured
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ class Payone_Api_Enum_GenericpaymentAction

const AMAZON_SETORDERREFERENCEDETAILS = "setorderreferencedetails";

const MASTERPASS_SETCHECKOUT = "setcheckout";

const MASTERPASS_GETCHECKOUT = "getcheckout";

const PAYDIREKTEXPRESS_CHECKOUT = "checkout";

const PAYDIREKTEXPRESS_GETSTATUS = "getstatus";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,6 @@ protected function moptGetPaymentConfig($paymentId)
if ($paymentHelper->isPayoneSofortuerberweisung($paymentData['name'])) {
$data['extra'] = 'sofort';
}
if ($paymentHelper->isPayoneMasterpass($paymentData['name'])) {
$data['extra'] = 'masterpass';
}
if ($paymentHelper->isPayoneAmazonPay($paymentData['name'])) {
$data['extra'] = 'amazonpay';
}
Expand Down

This file was deleted.

Loading