Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml

@@ -30,7 +30,30 @@ if ($block->getIsInCatalogProduct()) {
                 "shortcutContainerClass": "<?= /* @noEscape */ "." . $shortcutHtmlId ?>"
             }
      }'
-    >
+>
+    <?php
+    if(strpos($block->escapeUrl($block->getImageUrl()),'checkout-logo-medium') !== false){
+        $imgsrc = $block->getViewFileUrl('Magento_Paypal::images/checkout-logo-medium.png');
+        $class = 'checkout-logo-medium';
+    } else {
+        $imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-credit.png');
+        $class = 'paypal-credit';
+    }
+    ?>
+    <div class="<?= $class ?>" style="display: none;">
+        <input type="image" data-action="checkout-form-submit"
+               data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
+               src="<?= $imgsrc ?>"
+               alt="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"
+               title="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"/>
+        <?php if ($block->getAdditionalLinkImage()) : ?>
+            <?php $linkImage = $block->getAdditionalLinkImage(); ?>
+            <a href="<?= $block->escapeUrl($linkImage['href']) ?>">
+                <img src="<?= $block->escapeHtml($linkImage['src']) ?>" />
+            </a>
+        <?php endif; ?>
+    </div>
+
     <input type="image" data-action="checkout-form-submit"
            data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
            src="<?= $block->escapeUrl($block->getImageUrl()) ?>"