增加文件

fae40076 · lmf · b47644d9 · fae40076 · fae40076 · fae40076
Commit fae40076 authored Nov 07, 2022 by lmf
30 changed files
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/images/paypal-color.svg
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/images/paypal-color.svg
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 188 49"><path fill="#0070E0" d="M164.01 11.446l-4.012 25.207a.643.643 0 0 0 .642.746h4.748a.701.701 0 0 0 .698-.589l4.012-25.207a.643.643 0 0 0-.642-.746h-4.748a.692.692 0 0 0-.698.589zm-5.07 7.356h-4.505a.699.699 0 0 0-.697.588l-.149.928s-3.499-3.794-9.694-1.23c-3.554 1.468-5.26 4.501-5.986 6.723 0 0-2.304 6.753 2.907 10.47 0 0 4.832 3.575 10.273-.22l-.094.592a.644.644 0 0 0 .37.686c.085.04.178.06.272.06h4.508a.692.692 0 0 0 .698-.589l2.742-17.262a.632.632 0 0 0-.149-.521.643.643 0 0 0-.496-.226zm-6.629 9.54a5.005 5.005 0 0 1-1.715 3.095 5.073 5.073 0 0 1-3.345 1.203 4.602 4.602 0 0 1-1.416-.206c-1.945-.62-3.055-2.474-2.736-4.484a5.01 5.01 0 0 1 1.717-3.093 5.08 5.08 0 0 1 3.343-1.207 4.6 4.6 0 0 1 1.416.208c1.957.616 3.062 2.473 2.741 4.485h-.005zm-24.056.477c2.443 0 4.806-.868 6.662-2.446a10.147 10.147 0 0 0 3.456-6.158c.789-4.993-3.14-9.351-8.71-9.351h-8.973a.699.699 0 0 0-.697.589L115.98 36.66a.644.644 0 0 0 .37.686c.086.04.178.06.272.06h4.751a.699.699 0 0 0 .697-.589l1.178-7.402a.692.692 0 0 1 .698-.59l4.309-.006zm3.974-8.831c-.293 1.846-1.731 3.205-4.482 3.205h-3.517l1.068-6.713h3.454c2.844.005 3.77 1.67 3.477 3.513v-.005z"/><path fill="#003087" d="M110.567 19.23l-5.434 9.105-2.758-9.038a.694.694 0 0 0-.672-.495h-4.904a.526.526 0 0 0-.527.446.515.515 0 0 0 .025.247l4.942 15.224-4.47 7.174a.516.516 0 0 0 .18.728.527.527 0 0 0 .269.07h5.282a.876.876 0 0 0 .751-.42l13.804-22.667a.512.512 0 0 0 .011-.53.524.524 0 0 0-.463-.263h-5.28a.877.877 0 0 0-.756.419zm-16.548-.428H89.51a.7.7 0 0 0-.698.59l-.146.927s-3.502-3.794-9.697-1.23c-3.553 1.468-5.26 4.501-5.983 6.723 0 0-2.306 6.753 2.904 10.47 0 0 4.833 3.575 10.274-.22l-.094.592a.642.642 0 0 0 .37.686c.085.04.178.06.272.06h4.508a.701.701 0 0 0 .697-.589l2.743-17.262a.642.642 0 0 0-.37-.687.655.655 0 0 0-.272-.06zm-6.63 9.542a5.011 5.011 0 0 1-1.716 3.091 5.082 5.082 0 0 1-3.343 1.206 4.605 4.605 0 0 1-1.414-.206c-1.944-.62-3.053-2.474-2.734-4.485a5.011 5.011 0 0 1 1.723-3.098 5.082 5.082 0 0 1 3.353-1.201c.48-.005.959.065 1.417.208 1.937.616 3.04 2.472 2.72 4.485h-.005zm-24.055.476a10.284 10.284 0 0 0 6.656-2.449 10.144 10.144 0 0 0 3.452-6.156c.79-4.992-3.14-9.35-8.708-9.35H55.76a.7.7 0 0 0-.698.588l-4 25.2a.642.642 0 0 0 .37.687c.085.039.178.06.272.06h4.748a.7.7 0 0 0 .698-.59l1.176-7.402a.692.692 0 0 1 .698-.589h4.31zm3.974-8.832c-.293 1.846-1.73 3.205-4.481 3.205H59.31l1.066-6.713h3.454c2.845.005 3.77 1.671 3.478 3.513v-.005z"/><path fill="#001C64" d="M32.639 12.16c.107-5.566-4.484-9.836-10.797-9.836H8.784a1.277 1.277 0 0 0-1.262 1.078L2.29 36.095a1.038 1.038 0 0 0 1.025 1.2h7.736l-1.209 7.57a1.038 1.038 0 0 0 1.025 1.2h6.302c.304 0 .575-.109.807-.306.23-.198.268-.471.316-.772l1.85-10.884c.047-.3.2-.69.431-.888.231-.198.433-.306.738-.306h3.856c6.183 0 11.428-4.395 12.387-10.507.679-4.338-1.181-8.286-4.915-10.243z"/><path fill="#0070E0" d="M12.725 25.238l-1.927 12.218-1.21 7.664a1.038 1.038 0 0 0 1.026 1.199h6.67a1.276 1.276 0 0 0 1.26-1.078l1.758-11.139a1.277 1.277 0 0 1 1.261-1.078h3.926c6.183 0 11.428-4.51 12.388-10.622.68-4.338-1.504-8.286-5.238-10.243-.01.462-.05.923-.121 1.38-.959 6.11-6.206 10.621-12.387 10.621h-6.145a1.278 1.278 0 0 0-1.261 1.079"/><path fill="#003087" d="M10.797 37.456h-7.76a1.037 1.037 0 0 1-1.024-1.2L7.245 3.078A1.277 1.277 0 0 1 8.506 2h13.336c6.313 0 10.904 4.594 10.797 10.159-1.571-.824-3.417-1.295-5.439-1.295H16.082a1.277 1.277 0 0 0-1.262 1.078l-2.094 13.296-1.93 12.218z"/></svg>
\ No newline at end of file
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/images/paypal-credit.png
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/images/paypal-credit.png
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/billing/agreement/view.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/billing/agreement/view.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Billing\Agreement\View $block
+ */
+$relatedOrders = $block->getRelatedOrders();
+?>
+<div class="block block-billing-agreements-view">
+    <div class="block-title">
+        <strong>
+            <?= $block->escapeHtml(__('Billing Agreement # ')) ?>
+            <?= $block->escapeHtml($block->getReferenceId()) ?>
+        </strong>
+        <?php if ($block->getCanCancel()) : ?>
+            <button data-mage-init='{"Magento_Paypal/js/in-context/billing-agreement": {
+                        "cancelMessage" : "<?= $block->escapeHtml(__('Are you sure you want to do this?')) ?>",
+                        "cancelUrl" : "<?= $block->escapeUrl($block->getCancelUrl()) ?>"
+                    }}'
+                    type="button" title="<?= $block->escapeHtml(__('Cancel')) ?>"
+                    class="secondary action cancel" />
+                <span><?= $block->escapeHtml(__('Cancel')) ?></span>
+            </button>
+        <?php endif; ?>
+    </div>
+    <div class="block-title">
+        <strong><?= $block->escapeHtml(__('Agreement Information')) ?></strong>
+    </div>
+    <div class="block-content">
+        <div class="table-wrapper billing-agreements-view">
+            <table class="data table table-billing-agreements-view">
+                <caption class="table-caption"><?= $block->escapeHtml(__('Agreement Information')) ?></caption>
+                <thead>
+                <tr>
+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Reference ID:')) ?></th>
+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status:')) ?></th>
+                    <th scope="col" class="col created"><?= $block->escapeHtml(__('Created:')) ?></th>
+                    <?php if ($block->getAgreementUpdatedAt()) : ?>
+                        <th scope="col" class="col updated"><?= $block->escapeHtml(__('Updated:')) ?></th>
+                    <?php endif; ?>
+                    <th scope="col" class="col payment"><?= $block->escapeHtml(__('Payment Method:')) ?></th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td data-th="<?= $block->escapeHtml(__('Reference ID:')) ?>" class="col id">
+                        <?= $block->escapeHtml($block->getReferenceId()) ?>
+                    </td>
+                    <td data-th="<?= $block->escapeHtml(__('Status:')) ?>" class="col status">
+                        <?= $block->escapeHtml($block->getAgreementStatus()) ?>
+                    </td>
+                    <td data-th="<?= $block->escapeHtml(__('Created:')) ?>" class="col created">
+                        <?= $block->escapeHtml($block->getAgreementCreatedAt()) ?>
+                    </td>
+                    <?php if ($block->getAgreementUpdatedAt()) : ?>
+                        <td data-th="<?= $block->escapeHtml(__('Updated:')) ?>" class="col updated">
+                            <?= $block->escapeHtml($block->getAgreementUpdatedAt()) ?>
+                        </td>
+                    <?php endif; ?>
+                    <td data-th="<?= $block->escapeHtml(__('Payment Method:')) ?>" class="col payment">
+                        <?= $block->escapeHtml($block->getPaymentMethodTitle()) ?>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<?php if (count($relatedOrders) > 0) : ?>
+    <div class="block block-billing-orders-view">
+        <?= $block->getChildHtml('pager') ?>
+        <div class="block-title">
+            <span><?= $block->escapeHtml(__('Related Orders')) ?></span>
+        </div>
+        <div class="block-content">
+            <div class="table-wrapper billing-agreements-related">
+                <table class="data table table-billing-agreements-related" id="related-orders-table">
+                    <caption class="table-caption"><?= $block->escapeHtml(__('Related Orders')) ?></caption>
+                    <thead>
+                    <tr>
+                        <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
+                        <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
+                        <th scope="col" class="col shipto"><?= $block->escapeHtml(__('Ship To')) ?></th>
+                        <th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
+                        <th scope="col" class="col status"><?= $block->escapeHtml(__('Order Status')) ?></th>
+                        <th scope="col" class="col actions">&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($relatedOrders as $order) : ?>
+                            <tr>
+                                <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
+                                        $order,
+                                        'order_increment_id'
+                                    )); ?>
+                                </td>
+                                <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date">
+                                    <?= $block->escapeHtml($block->getOrderItemValue($order, 'created_at')) ?>
+                                </td>
+                                <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipto">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
+                                        $order,
+                                        'shipping_address'
+                                    )); ?>
+                                </td>
+                                <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total">
+                                    <?= /* @noEscape */ $block->getOrderItemValue($order, 'order_total') ?>
+                                </td>
+                                <td data-th="<?= $block->escapeHtml(__('Order Status')) ?>" class="col status">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
+                                        $order,
+                                        'status_label'
+                                    )); ?>
+                                </td>
+                                <td data-th="" class="col actions">
+                                    <a href="<?= $block->escapeUrl($block->getOrderItemValue(
+                                        $order,
+                                        'view_url'
+                                    )); ?>" class="action view">
+                                        <span><?= $block->escapeHtml(__('View Order')) ?></span>
+                                    </a>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
+
+<div class="actions-toolbar">
+    <div class="secondary">
+        <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+            <?= $block->escapeHtml(__('Back to Billing Agreements')) ?>
+        </a>
+    </div>
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/billing/agreements.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/billing/agreements.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Billing\Agreements $block
+ */
+
+$billingAgreements = $block->getBillingAgreements();
+$paymentMethods = $block->getWizardPaymentMethodOptions();
+?>
+<div class="account-billing-agreements">
+    <?php if (count($billingAgreements) > 0) : ?>
+        <?= $block->getChildHtml('pager') ?>
+        <div class="table-wrapper billing-agreements">
+            <table id="billing-agreements" class="data table table-billing-agreements">
+                <caption class="table-caption"><?= $block->escapeHtml(__('Billing Agreements')) ?></caption>
+                <thead>
+                <tr>
+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Reference ID')) ?></th>
+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
+                    <th scope="col" class="col created"><?= $block->escapeHtml(__('Created At')) ?></th>
+                    <th scope="col" class="col updated"><?= $block->escapeHtml(__('Updated At')) ?></th>
+                    <th scope="col" class="col payment"><?= $block->escapeHtml(__('Payment Method')) ?></th>
+                    <th scope="col" class="col actions">&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($billingAgreements as $item) : ?>
+                        <tr>
+                            <td data-th="<?= $block->escapeHtml(__('Reference ID')) ?>" class="col id">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'reference_id')) ?>
+                            </td>
+                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'status')) ?>
+                            </td>
+                            <td data-th="<?= $block->escapeHtml(__('Created At')) ?>" class="col created">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'created_at')) ?>
+                            </td>
+                            <td data-th="<?= $block->escapeHtml(__('Updated At')) ?>" class="col updated">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'updated_at')) ?>
+                            </td>
+                            <td data-th="<?= $block->escapeHtml(__('Payment Method')) ?>" class="col payment">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'payment_method_label')) ?>
+                            </td>
+                            <td data-th="" class="col actions">
+                                <a href="<?= $block->escapeUrl($block->getItemValue($item, 'edit_url')) ?>"
+                                   class="action view">
+                                    <span><?= $block->escapeHtml(__('View')) ?></span>
+                                </a>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    <?php else : ?>
+        <div class="message info empty">
+            <span><?= $block->escapeHtml(__('There are no billing agreements yet.')) ?></span>
+        </div>
+    <?php endif; ?>
+
+    <?php if ($paymentMethods) : ?>
+        <form action="<?= $block->escapeUrl($block->getCreateUrl()) ?>" method="post"
+              class="form form-new-agreement">
+            <fieldset class="fieldset">
+                <legend class="legend">
+                    <span><?= $block->escapeHtml(__('New Billing Agreement')) ?></span>
+                </legend>
+                <br />
+                <p class="note">
+                    <?= $block->escapeHtml(__('You will be redirected to the payment system website.')) ?>
+                </p>
+
+                <div class="field payment method">
+                    <div class="control">
+                        <select id="payment_method" name="payment_method">
+                            <option value=""><?= $block->escapeHtml(__('-- Please Select --')) ?></option>
+                            <?php foreach ($paymentMethods as $code => $title) : ?>
+                                <option value="<?= $block->escapeHtml($code) ?>">
+                                    <?= $block->escapeHtml($title) ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+                </div>
+                <div class="actions-toolbar">
+                    <div class="primary">
+                        <button type="submit" class="primary action create">
+                            <span><?= $block->escapeHtml(__('Create...')) ?></span>
+                        </button>
+                    </div>
+                    <div class="secondary">
+                        <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                            <span><?= $block->escapeHtml(__('Back')) ?></span>
+                        </a>
+                    </div>
+                </div>
+            </fieldset>
+        </form>
+    <?php else : ?>
+    <div class="actions-toolbar">
+        <div class="secondary">
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                <span><?= $block->escapeHtml(__('Back')) ?></span>
+            </a>
+        </div>
+    </div>
+    <?php endif; ?>
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/bml.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/bml.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+/**
+ * @see \Magento\Paypal\Block\Bml\Banners
+ */
+?>
+<div class="paypal-logo">
+    <script data-pp-pubid="<?= $block->escapeHtml($block->getPublisherId()) ?>"
+            data-pp-placementtype="<?= $block->escapeHtml($block->getSize()) ?>"
+        > (function (d, t) {
+            "use strict";
+            var s = d.getElementsByTagName(t)[0], n = d.createElement(t);
+            n.src = "//paypal.adtag.where.com/merchant.js";
+            s.parentNode.insertBefore(n, s);
+        }(document, "script"));
+    </script>
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/checkout/onepage/review/totals.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/checkout/onepage/review/totals.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @see \Magento\Checkout\Block\Cart\Totals
+ */
+?>
+<?php if ($block->getTotals()) : ?>
+    <?php $_colspan = 3; ?>
+    <?= /* @noEscape */ $block->renderTotals(null, $_colspan) ?>
+    <?= /* @noEscape */ $block->renderTotals('footer', $_colspan) ?>
+    <?php if ($block->needDisplayBaseGrandtotal()) : ?>
+    <tr class="totals charge">
+        <th class="mark" colspan="<?= /* @noEscape */ $_colspan ?>" scope="row">
+            <?= $block->escapeHtml(__('Your credit card will be charged for')) ?>
+        </th>
+        <td class="amount" data-th="<?= $block->escapeHtml(__('Your credit card will be charged for')) ?>">
+            <?= /* @noEscape */ $block->displayBaseGrandtotal() ?>
+        </td>
+    </tr>
+    <?php endif?>
+<?php endif; ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/checkout/onepage/success/billing_agreement.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/checkout/onepage/success/billing_agreement.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+/**
+ * @var \Magento\Paypal\Block\Checkout\Onepage\Success\BillingAgreement $block
+ */
+?>
+<p data-mage-init='{"Magento_Paypal/js/in-context/billing-agreement": {"invalidateOnLoad" : true}}'>
+    <?= $block->escapeHtml(__('Your billing agreement # is: ')) ?>
+    <a href="<?= $block->escapeUrl($block->getAgreementUrl()) ?>">
+        <?= $block->escapeHtml($block->getAgreementRefId()) ?>
+    </a>.
+</p>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/in-context/shortcut/button.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/in-context/shortcut/button.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton $block
+ */
+$widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getJsInitParams());
+$widgetConfig = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['Magento_Paypal/js/in-context/button']);
+?>
+<div data-mage-init='{"Magento_Paypal/js/in-context/button":<?= /* @noEscape */ $widgetConfig ?>}'
+     class="paypal checkout paypal-logo <?= $block->escapeHtml($block->getContainerId()) ?>-container">
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Paypal\Block\Express\Review;
+
+/**
+ * @var Review $block
+ * @var Escaper $escaper
+ * @var SecureHtmlRenderer $secureRenderer
+ */
+?>
+<div class="paypal-review view">
+    <div class="block block-order-details-view">
+        <div class="block-content">
+            <?php if ($block->getShippingAddress()): ?>
+                <div class="box box-order-shipping-method">
+                    <strong class="box-title">
+                        <span><?= $escaper->escapeHtml(__('Shipping Method')) ?></span>
+                    </strong>
+                    <div class="box-content">
+                        <form method="post" id="shipping-method-form"
+                              action="<?= $escaper->escapeUrl($block->getShippingMethodSubmitUrl()) ?>"
+                              class="form">
+                            <?php if ($block->canEditShippingMethod()): ?>
+                                <?php if ($groups = $block->getShippingRateGroups()): ?>
+                                    <?php $currentRate = $block->getCurrentShippingRate(); ?>
+                                    <div class="field shipping required">
+                                        <select name="shipping_method" id="shipping-method" class="select">
+                                            <?php if (!$currentRate): ?>
+                                                <option value="">
+                                                    <?= $escaper->escapeHtml(
+                                                        __('Please select a shipping method...')
+                                                    ); ?>
+                                                </option>
+                                            <?php endif; ?>
+                                            <?php foreach ($groups as $code => $rates): ?>
+                                                <optgroup label="<?=
+                                                    $escaper->escapeHtml($block->getCarrierName($code));
+                                                ?>">
+                                                    <?php foreach ($rates as $rate): ?>
+                                                        <option value="<?=
+                                                                        $block->escapeHtml(
+                                                                            $block->renderShippingRateValue($rate)
+                                                                        );
+                                                                        ?>"
+                                                            <?= ($currentRate === $rate) ?
+                                                                ' selected="selected"' : '';
+                                                            ?>>
+                                                            <?= /* @noEscape */ $block->renderShippingRateOption($rate);
+                                                            ?>
+                                                        </option>
+                                                    <?php endforeach; ?>
+                                                </optgroup>
+                                            <?php endforeach; ?>
+                                        </select>
+                                    </div>
+                                    <div class="actions-toolbar"></div>
+                                <?php else: ?>
+                                    <p>
+                                        <?= $escaper->escapeHtml(__(
+                                            'Sorry, no quotes are available for this order right now.'
+                                        )); ?>
+                                    </p>
+                                <?php endif; ?>
+                            <?php else: ?>
+                                <p>
+                                    <?= /* @noEscape */ $block->renderShippingRateOption(
+                                        $block->getCurrentShippingRate()
+                                    ); ?>
+                                </p>
+                            <?php endif; ?>
+                        </form>
+                    </div>
+                </div>
+                <div class="box box-order-shipping-address">
+                    <strong class="box-title">
+                        <span><?= $escaper->escapeHtml(__('Shipping Address')) ?></span>
+                    </strong>
+                    <div class="box-content">
+                        <address>
+                            <?= $escaper->escapeHtml(
+                                $block->renderAddress($block->getShippingAddress()),
+                                ['br']
+                            ); ?>
+                        </address>
+                    </div>
+                    <?php if ($block->getCanEditShippingAddress()): ?>
+                        <div class="box-actions">
+                            <a href="<?= $escaper->escapeUrl($block->getEditUrl()) ?>" class="action edit">
+                                <span><?= $escaper->escapeHtml(__('Edit')) ?></span>
+                            </a>
+                        </div>
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
+            <div class="box box-order-billing-address">
+                <strong class="box-title"><span><?= $escaper->escapeHtml(__('Payment Method')) ?></span></strong>
+                <div class="box-content">
+                    <?= $escaper->escapeHtml($block->getPaymentMethodTitle()) ?><br>
+                    <?= $escaper->escapeHtml($block->getEmail()) ?> <br>
+                    <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png"
+                         alt="<?= $block->escapeHtml(__('Buy now with PayPal')) ?>"/>
+                </div>
+                <?php if ($block->getEditUrl()): ?>
+                    <div class="box-actions">
+                        <a href="<?= $escaper->escapeUrl($block->getEditUrl()) ?>" class="action edit">
+                            <span><?= $escaper->escapeHtml(__('Edit Payment Information')) ?></span>
+                        </a>
+                    </div>
+                <?php endif ?>
+            </div>
+        </div>
+    </div>
+
+    <div class="paypal-review-discount">
+        <?= $block->getChildHtml('paypal.additional.actions') ?>
+    </div>
+
+    <div class="paypal-review-items">
+        <div class="paypal-review-title">
+            <strong><?= $escaper->escapeHtml(__('Items in Your Shopping Cart')) ?></strong>
+            <a href="<?= $escaper->escapeUrl($block->getUrl('checkout/cart')) ?>" class="action edit">
+                <span><?= $escaper->escapeHtml(__('Edit Shopping Cart')) ?></span>
+            </a>
+        </div>
+
+        <?= $block->getChildHtml('details') ?>
+
+        <form method="post" id="order-review-form" action="<?= $escaper->escapeUrl($block->getPlaceOrderUrl()) ?>"
+              class="form order-review-form">
+            <?= $block->getChildHtml('agreements') ?>
+            <div class="actions-toolbar" id="review-buttons-container">
+                <div class="primary">
+                    <button type="button" id="review-button" class="action checkout primary"
+                            value="<?= $escaper->escapeHtml(__('Place Order')) ?>">
+                        <span><?= $escaper->escapeHtml(__('Place Order')) ?></span>
+                    </button>
+                </div>
+                <span class="please-wait load indicator" id="review-please-wait"
+                      data-text="<?= $escaper->escapeHtml(__('Submitting order information...')) ?>">
+                   <span><?= $escaper->escapeHtml(__('Submitting order information...')) ?></span>
+                </span>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'span#review-please-wait') ?>
+            </div>
+        </form>
+    </div>
+</div>
+<script type="text/x-magento-init">
+    {
+        "#order-review-form": {
+            "validation": {},
+            "orderReview": {
+                "shippingSubmitFormSelector": "#shipping-method-form",
+                "shippingSelector": "#shipping-method",
+                "shippingMethodUpdateUrl": "<?= $escaper->escapeJs($block->getUpdateShippingMethodsUrl()) ?>",
+                "isAjax": <?= /* @noEscape */ $block->getUseAjax() ? 'true' : 'false' ?>,
+                "canEditShippingMethod": <?= /* @noEscape */ $block->canEditShippingMethod() ? 'true' : 'false' ?>
+            }
+        }
+    }
+</script>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review/details.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review/details.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Express\Review\Details
+ * @var \Magento\Paypal\Block\Express\Review\Details $block
+ */
+?>
+<div id="details-reload" class="table-wrapper order-items cart">
+    <table id="details-table" class="cart items data table table-paypal-review-items">
+        <caption class="table-caption"><?= $block->escapeHtml(__('Items in Your Shopping Cart')) ?></caption>
+        <thead>
+        <tr>
+            <th class="col name" scope="col"><?= $block->escapeHtml(__('Item')) ?></th>
+            <th class="col price" scope="col"><?= $block->escapeHtml(__('Price')) ?></th>
+            <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
+            <th class="col subtotal" scope="col"><?= $block->escapeHtml(__('Subtotal')) ?></th>
+        </tr>
+        </thead>
+            <?php foreach ($block->getItems() as $item) : ?>
+                <?= $block->getItemHtml($item) ?>
+            <?php endforeach ?>
+        <tfoot class="opc-block-summary">
+            <?= $block->getChildHtml('totals') ?>
+        </tfoot>
+    </table>
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review/shipping/method.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/review/shipping/method.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var $block \Magento\Paypal\Block\Express\Review
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<div id="shipping-method-container">
+    <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()): ?>
+        <?php if ($groups = $block->getShippingRateGroups()): ?>
+            <?php $currentRate = $block->getCurrentShippingRate(); ?>
+            <select name="shipping_method" id="shipping_method" class="required-entry">
+                <?php if (!$currentRate): ?>
+                    <option value="">
+                        <?= $block->escapeHtml(__('Please select a shipping method...')) ?>
+                    </option>
+                <?php endif; ?>
+                <?php foreach ($groups as $code => $rates): ?>
+                    <optgroup id="group_<?= /* @noEscape */ $code ?>"
+                              label="<?= $block->escapeHtml($block->getCarrierName($code)) ?>">
+                        <?php foreach ($rates as $rate): ?>
+                            <option
+                                value="<?= $block->escapeHtml($block->renderShippingRateValue($rate)) ?>"
+                                    <?= ($currentRate === $rate) ? ' selected="selected"' : '' ?>>
+                                <?= /* @noEscape */ $block->renderShippingRateOption($rate) ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </optgroup>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        'font-style:normal;',
+                        'optgroup#group_' . /* @noEscape */ $code
+                    ) ?>
+                <?php endforeach; ?>
+            </select>
+        <?php else: ?>
+            <p>
+                <strong>
+                    <?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?>
+                </strong>
+            </p>
+        <?php endif; ?>
+    <?php else: ?>
+        <p>
+            <strong>
+                <?= /* @noEscape */ $block->renderShippingRateOption($block->getCurrentShippingRate()) ?>
+            </strong>
+        </p>
+    <?php endif; ?>
+</div>
+<div id="shipping_method_update">
+    <p><?= $block->escapeHtml(__('Please update order data to get shipping methods and rates')) ?></p>
+</div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#shipping_method_update'
+) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Express\Shortcut $block
+ */
+?>
+<?php
+$labelPosition = '';
+if ($block->isOrPositionBefore()) {
+    $labelPosition = ' before';
+} elseif ($block->isOrPositionAfter()) {
+    $labelPosition = ' after';
+}
+$shortcutHtmlId = $block->escapeHtml($block->getShortcutHtmlId());
+$isInCatalogProduct = false;
+if ($block->getIsInCatalogProduct()) {
+    $isInCatalogProduct = $block->getIsInCatalogProduct();
+}
+?>
+<div data-label="<?= $block->escapeHtml(__('or')) ?>"
+     class="paypal checkout <?= /* @noEscape */ $labelPosition ?> paypal-logo
+        <?= /* @noEscape */ $shortcutHtmlId ?>"
+     data-mage-init='{
+     "paypalCheckout": {
+                "isCatalogProduct": "<?= /* @noEscape */ !empty($isInCatalogProduct) ? (bool)$isInCatalogProduct : false ?>",
+                "shortcutContainerClass": "<?= /* @noEscape */ "." . $shortcutHtmlId ?>"
+            }
+     }'
+    >
+    <input type="image" data-action="checkout-form-submit"
+           data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
+           src="<?= $block->getViewFileUrl('Magento_Paypal::images/paypal-color.svg') ?>"
+           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 class="checkout-txt">Checkout</div>
+</div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut/container.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut/container.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var $block Magento\Paypal\Block\Express\Shortcut
+ */
+?>
+<?php if ($block->getIsInCatalogProduct()) : ?>
+    <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
+<?php endif; ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut_button.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/express/shortcut_button.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var \Magento\Paypal\Block\Express\InContext\SmartButton $block
+ */
+$widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getJsInitParams());
+$widgetConfig = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(
+    $widget['Magento_Paypal/js/in-context/product-express-checkout']
+);
+?>
+<div id ="paypal-smart-button" data-mage-init='{"Magento_Paypal/js/in-context/product-express-checkout"
+:<?= /* @noEscape */ $widgetConfig ?>}'></div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/form.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/form.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @see \Magento\Paypal\Block\Payflow\Link\Iframe
+ */
+?>
+<html>
+<head>
+</head>
+<body>
+<form id="token_form" method="POST" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
+</form>
+<?php $scriptString = <<<script
+    document.getElementById('token_form').submit();
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+</body>
+</html>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/iframe.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/iframe.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ */
+?>
+<div id="iframe-warning" class="message notice">
+    <div><?= $block->escapeHtml(__('Please do not refresh the page until you complete payment.')) ?></div>
+</div>
+<iframe id="hss-iframe" data-container="paypal-iframe" class="paypal iframe" scrolling="no" frameborder="0" border="0"
+        src="<?= $block->escapeUrl($block->getFrameActionUrl()) ?>" height="610" width="100%"></iframe>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/info.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/info.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payment\Info $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<div id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="hss items">
+    <?= $block->escapeHtml(__(
+        'You will be required to enter your payment details after you place an order.'
+    )); ?>
+</div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/js.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/js.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Iframe
+ */
+?>
+<div id="checkout-paypaliframe-load" class="authentication"></div>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/review/button.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/hss/review/button.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+
+?>
+<button type="submit" data-role="review-save" title="<?= $block->escapeHtml(__('Continue')) ?>"
+        class="button action checkout primary">
+    <span><?= $block->escapeHtml(__('Continue')) ?></span>
+</button>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/js/components.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/js/components.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?= $block->getChildHtml() ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/partner/logo.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/partner/logo.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+/**
+ * @var \Magento\Paypal\Block\Logo $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @see \Magento\Paypal\Block\Logo
+ */
+?>
+
+<div class="block paypal acceptance">
+    <div class="block-content">
+        <a href="#" title="<?= $block->escapeHtml(__('Additional Options')) ?>"
+           class="action paypal additional">
+            <img src="<?= $block->escapeUrl($block->getLogoImageUrl()) ?>"
+                 alt="<?= $block->escapeHtml(__('Additional Options')) ?>"
+                 title="<?= $block->escapeHtml(__('Additional Options')) ?>" />
+        </a>
+    </div>
+</div>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "window.open(
+               '" . $block->escapeJs($block->getAboutPaypalPageUrl()) . "',
+               'paypal',
+               'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
+               ); event.preventDefault();",
+    'div.block.paypal.acceptance div.block-content a.action.paypal.additional'
+) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowadvanced/form.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowadvanced/form.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Advanced\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<html>
+<head>
+</head>
+<body>
+<form id="token_form" method="GET" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
+</form>
+<?php $scriptString = <<<script
+    document.getElementById('token_form').submit();
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+</body>
+</html>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowadvanced/info.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowadvanced/info.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Advanced\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
+          class="fieldset payflowadvanced items redirect">
+    <div>
+        <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
+    </div>
+</fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/form.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/form.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @see \Magento\Paypal\Block\Payflow\Link\Iframe
+ */
+?>
+<html>
+<head>
+</head>
+<body>
+<form id="token_form" method="GET" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
+</form>
+<?php $scriptString = <<<script
+    document.getElementById('token_form').submit();
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+</body>
+</html>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/info.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/info.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Link\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<div class="payflowlink items" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+    <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
+</div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/redirect.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payflowlink/redirect.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+
+/**
+ * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<html>
+<head>
+</head>
+<body>
+<?php $scriptString= <<<script
+
+    (function() {
+        'use strict';
+
+        function redirect(cartUrl, errorMessage, goToSuccessPage, successUrl) {
+            if (!!errorMessage.message) {
+                alert(errorMessage.message);
+                window.location = cartUrl;
+            } else if (!!goToSuccessPage) {
+                window.location = successUrl;
+            } else {
+                window.location = cartUrl;
+            }
+        }
+
+        var cartUrl = '{$block->escapeJs($block->getUrl('checkout/cart'))}',
+            successUrl = '{$block->escapeJs($block->getUrl('checkout/onepage/success'))}',
+            goToSuccessPage = '{$block->escapeJs($block->getGotoSuccessPage())}',
+            require = window.top.require,
+            windowContext = window,
+            errorMessage = {
+                message: '{$block->escapeJs($block->getErrorMsg())}'
+            };
+
+        if(typeof(require) == "undefined") {
+            redirect(cartUrl, errorMessage, goToSuccessPage, successUrl);
+        } else {
+            require([
+                'underscore',
+                'Magento_Paypal/js/model/iframe-redirect'
+            ], function(_, iframeRedirect) {
+                _.bind(iframeRedirect, windowContext)(cartUrl, errorMessage, goToSuccessPage, successUrl);
+            })
+        }
+
+    })();
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+</body>
+</html>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/paylater/banner.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/paylater/banner.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var $block \Magento\Paypal\Block\PayLater\Banner */
+/** @var $cartBlock Magento\Checkout\Block\Cart */
+?>
+<?php $cartBlock = $block->getLayout()->getBlock('checkout.cart'); ?>
+<?php if ($block->getData('placement') !== 'cart' || is_object($cartBlock) && $cartBlock->getItemsCount()): ?>
+    <div id="pay-later" data-bind="scope: 'payLater'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <script type="text/x-magento-init">
+            {
+                "#pay-later": {
+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
+                }
+            }
+        </script>
+    </div>
+<?php endif; ?>
+
+
+
+
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/form/billing/agreement.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/form/billing/agreement.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Paypal\Block\Payment\Form\Billing\Agreement $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+$code = $block->escapeHtml($block->getMethodCode());
+?>
+<div class="field items required" id="payment_form_<?= /* @noEscape */ $code ?>">
+    <label for="<?= /* @noEscape */ $code ?>_ba_agreement_id" class="label">
+        <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
+    </label>
+    <div class="control">
+        <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
+                name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]" class="select">
+            <option value=""><?= $block->escapeHtml(__('-- Please Select Billing Agreement--')) ?></option>
+            <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
+                <option value="<?= $block->escapeHtml($id) ?>">
+                    <?= $block->escapeHtml($referenceId) ?>
+                </option>
+            <?php endforeach; ?>
+        </select>
+    </div>
+</div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#payment_form_' . /* @noEscape */ $code) ?>
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/mark.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/mark.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Note: This mark is a requirement of PayPal
+ * @var \Magento\Paypal\Block\Express\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @see \Magento\Paypal\Block\Express\Form
+ */
+$url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
+?>
+<!-- PayPal Logo -->
+<img src="<?= $block->escapeUrl($block->getPaymentAcceptanceMarkSrc()) ?>"
+     alt="<?= $block->escapeHtml(__('Acceptance Mark')) ?>" class="paypal icon"/>
+<a href="<?= /* @noEscape */ $url ?>" class="action paypal about">
+    <?php if ($block->getPaymentWhatIs()) {
+        echo $block->escapeHtml(__($block->getPaymentWhatIs()));
+    } else {
+        echo $block->escapeHtml(__('What is PayPal?'));
+    } ?>
+</a>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "window.open(
+           '" . /* @noEscape */ $block->escapeJs($block->getPaymentAcceptanceMarkHref()) . "',
+           'olcwhatispaypal',
+           'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
+           'left=0, top=0, width=400, height=350'
+       ); event.preventDefault();",
+    'a.action.paypal.about'
+) ?>
+<!-- PayPal Logo -->
--- a/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/redirect.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Paypal/templates/payment/redirect.phtml
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\PayPal\Block\Express\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @see \Magento\PayPal\Block\Express\Form
+ */
+$code = $block->escapeHtml($block->getBillingAgreementCode());
+?>
+<fieldset class="fieldset paypal items redirect" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+    <div><?= $block->escapeHtml($block->getRedirectMessage()) ?></div>
+    <?php  ?>
+    <?php if ($code): ?>
+        <input type="checkbox" id="<?= /* @noEscape */ $code ?>" value="1" class="checkbox"
+               name="payment[<?= /* @noEscape */ $code ?>]">
+        <label for="<?= /* @noEscape */ $code ?>" class="label">
+            <span>
+                <?= $block->escapeHtml(__('Sign a billing agreement to streamline further purchases  with PayPal.')) ?>
+            </span>
+        </label>
+    <?php endif; ?>
+</fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>