Merge branch 'MAGETWO-40138' into develop

Yushkin, Dmytro · Yushkin, Dmytro · commit e958a131aa01 · 2015-07-14T18:59:04.000+03:00
diff --git a/app/code/Magento/Paypal/Block/Bml/Form.php b/app/code/Magento/Paypal/Block/Bml/Form.php
@@ -31,7 +31,7 @@ protected function _construct()
             'https://www.securecheckout.billmelater.com/paycapture-content/'
             . 'fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html'
         )->setPaymentAcceptanceMarkSrc(
-            'https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png'
+            'https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png'
         )->setPaymentWhatIs(__('See terms'));
 
         $this->_initializeRedirectTemplateWithMark($mark);
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
@@ -971,7 +971,7 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n
             case self::PAYMENT_MARK_LARGE:
                 break;
             default:
-                $staticSize = self::PAYMENT_MARK_SMALL;
+                $staticSize = self::PAYMENT_MARK_MEDIUM;
         }
 
         return sprintf(
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -347,7 +347,7 @@ public function dataProviderGetExpressCheckoutShortcutImageUrl()
             ],
             [
                 'en_US', null, null, Config::EC_FLAVOR_STATIC, false, Config::EC_BUTTON_TYPE_MARK,
-                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
             ],
             [
                 'en_US', null, null, Config::EC_FLAVOR_STATIC, true, Config::EC_BUTTON_TYPE_SHORTCUT,
@@ -413,8 +413,8 @@ public function dataProviderGetPaymentMarkImageUrl()
                 'https://fpdbs.paypal.com/dynamicimageweb?cmd=_dynamic-image&buttontype=ecmark&locale=en_GB'
             ],
             [
-                'en_US', null, null, 'small', Config::EC_FLAVOR_STATIC, true,
-                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+                'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,
+                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
             ],
             [
                 'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,
@@ -426,7 +426,7 @@ public function dataProviderGetPaymentMarkImageUrl()
             ],
             [
                 'en_GB', null, null, 'affected', Config::EC_FLAVOR_STATIC, true,
-                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
             ],
         ];
     }
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label data-bind="attr: {'for': getCode()}" class="label">
             <!-- PayPal Logo -->
-            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png"
+            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
                  data-bind="attr: {alt: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label data-bind="attr: {'for': getCode()}" class="label">
             <!-- PayPal Logo -->
-            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png"
+            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
                  data-bind="attr: {alt: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->

Original file line number	Diff line number	Diff line change
`@@ -971,7 +971,7 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n`
`971`	`971`	`case self::PAYMENT_MARK_LARGE:`
`972`	`972`	`break;`
`973`	`973`	`default:`
`974`		`- $staticSize = self::PAYMENT_MARK_SMALL;`
	`974`	`+ $staticSize = self::PAYMENT_MARK_MEDIUM;`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`return sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public function dataProviderGetExpressCheckoutShortcutImageUrl()`
`347`	`347`	`],`
`348`	`348`	`[`
`349`	`349`	`'en_US', null, null, Config::EC_FLAVOR_STATIC, false, Config::EC_BUTTON_TYPE_MARK,`
`350`		`- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'`
	`350`	`+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'`
`351`	`351`	`],`
`352`	`352`	`[`
`353`	`353`	`'en_US', null, null, Config::EC_FLAVOR_STATIC, true, Config::EC_BUTTON_TYPE_SHORTCUT,`
`@@ -413,8 +413,8 @@ public function dataProviderGetPaymentMarkImageUrl()`
`413`	`413`	`'https://fpdbs.paypal.com/dynamicimageweb?cmd=_dynamic-image&buttontype=ecmark&locale=en_GB'`
`414`	`414`	`],`
`415`	`415`	`[`
`416`		`- 'en_US', null, null, 'small', Config::EC_FLAVOR_STATIC, true,`
`417`		`- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'`
	`416`	`+ 'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,`
	`417`	`+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'`
`418`	`418`	`],`
`419`	`419`	`[`
`420`	`420`	`'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,`
`@@ -426,7 +426,7 @@ public function dataProviderGetPaymentMarkImageUrl()`
`426`	`426`	`],`
`427`	`427`	`[`
`428`	`428`	`'en_GB', null, null, 'affected', Config::EC_FLAVOR_STATIC, true,`
`429`		`- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'`
	`429`	`+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'`
`430`	`430`	`],`
`431`	`431`	`];`
`432`	`432`	`}`