テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

private-content.phtml

作成日 3 年前差分は期限切れになりません

1 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

149 行

54 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

199 行

<?php

/**

* Hyvä Themes - https://hyva.io

* This product is licensed per Magento install

* See https://hyva.io/license

declare(strict_types=1);

/** @var Template $block */

/** @var Escaper $escaper */

use Magento\Framework\Escaper;

use Magento\Framework\View\Element\Template;

'use strict';

{

const private_content_key = 'mage-cache-storage';

const private_content_expire_key = 'mage-cache-timeout';

const private_content_version_key = 'private_content_version';

const section_data_ids_key = 'section_data_ids';

const mage_cache_session_id_key = 'mage-cache-sessid';

const last_visited_store_key = 'last_visited_store';

const ttl = 3600;

<?php

/**

* The `hyva` JS namespace is being set by Hyva_Theme/src/view/frontend/templates/page/js/hyva.phtml

* and should be included through Hyva_Theme/src/view/frontend/layout/default_hyva.xml

if (typeof hyva === 'undefined' || (!hyva.getBrowserStorage || !hyva.getCookie || !hyva.setCookie)) {

console.warn("Hyvä helpers are not loaded yet. Make sure they are included before this script");

}

function loadSectionData () {

const browserStorage = hyva.getBrowserStorage();

if (!browserStorage) {

typeof window.dispatchMessages !== "undefined" && window.dispatchMessages(

[{

type: "warning",

text: "Please enable LocalStorage in your browser."

text: "<?= $escaper->escapeHtml(__('Please enable LocalStorage in your browser.')) ?>"

}]

);

return;

}

try {

let isInvalid = false;

<?php

/**

* Usually store switch is made via POST requests, but if this happen on other ways (eg. the customer

* changing manually the base url, or landing from search engines on a different store) we need to

* request again private contents

if (hyva.getCookie(last_visited_store_key) !== CURRENT_STORE_CODE) {

isInvalid = true;

}

hyva.setCookie(last_visited_store_key, CURRENT_STORE_CODE, false, false);

<?php

/**

* The `mage-cache-sessid` cookie is being unset from backend to

* indicate that sectionData is invalidated and needs to be reloaded

* in the frontend. So we mark it as invalid, and then re-set the

* `mage-cache-sessid` cookie

if (!hyva.getCookie(mage_cache_session_id_key)) {

isInvalid = true;

const skipSetDomain = true;

const days = false;

hyva.setCookie(mage_cache_session_id_key, true, days, skipSetDomain)

}

const cookieVersion = hyva.getCookie(private_content_version_key);

const storageVersion = browserStorage.getItem(private_content_version_key);

if (cookieVersion && !storageVersion || cookieVersion !== storageVersion) {

isInvalid = true;

}

const privateContentExpires = browserStorage.getItem(private_content_expire_key);

if (privateContentExpires && new Date(privateContentExpires) < new Date()) {

browserStorage.removeItem(private_content_key);

}

if (isInvalid) {

fetchPrivateContent([]);

} else if (cookieVersion && storageVersion && cookieVersion === storageVersion) {

const privateContent = JSON.parse(browserStorage.getItem(private_content_key));

if (

privateContent &&

privateContentExpires &&

privateContent.cart &&

privateContent.customer

) {

dispatchPrivateContent(privateContent);

} else {

fetchPrivateContent([]);

}

} else {

dispatchPrivateContent({});

}

} catch (error) {

console.warn('Error retrieving Private Content:', error);

}

window.addEventListener('load', loadSectionData);

window.addEventListener('alpine:initialized', loadSectionData);

window.addEventListener('reload-customer-section-data', loadSectionData);

function dispatchPrivateContent(data) {

const privateContentEvent = new CustomEvent("private-content-loaded", {

detail: {

data: data

}

});

window.dispatchEvent(privateContentEvent);

}

<?php

/**

* We use 'X-Requested-With': 'XMLHttpRequest' to prevent Magento from clearing the customer session

* in \Magento\PageCache\Model\DepersonalizeChecker::checkIfDepersonalize

* Otherwise, \Magento\Tax\Plugin\Checkout\CustomerData\Cart::afterGetSectionData can't add tax to

* cart items.

function fetchPrivateContent(sections) {

fetch(`${BASE_URL}customer/section/load/?sections=${encodeURIComponent(sections.join(','))}`, {

method: 'GET',

headers: {

'Content-Type': 'application/json',

'X-Requested-With': 'XMLHttpRequest'

}

})

.then(response => response.json())

.then(

data => {

if (data) {

try {

const browserStorage = hyva.getBrowserStorage();

// merge new data preserving non-invalidated sections

const oldSectionData = JSON.parse(browserStorage.getItem(private_content_key) || '{}');

const oldSectionData = JSON.parse(browserStorage.getItem(private_content_key) || '{}') || {};

<?php

/** Ensure no checkout data remains after logout (from Luma checkout) */

if ((! data.cart || ! data.cart.cartId) && oldSectionData['checkout-data']) {

delete oldSectionData['checkout-data'];

}

const newSectionData = Object.assign(oldSectionData, data);

dispatchPrivateContent(newSectionData);

// don't persist messages, they've been dispatched already

if (newSectionData.messages && newSectionData.messages.messages ) {

newSectionData.messages.messages = [];

}

browserStorage.setItem(private_content_key, JSON.stringify(newSectionData));

const expiresAt = new Date(Date.now() + (ttl * 1000)).toISOString();

browserStorage.setItem(private_content_expire_key, expiresAt);

const newCookieVersion = hyva.getCookie(private_content_version_key);

browserStorage.setItem(private_content_version_key, newCookieVersion);

// We don't need the section_data_ids in Hyvä, but we store them for compatibility

// with Luma Fallback. Otherwise, not all sections are loaded in Luma Checkout

hyva.setCookie(

section_data_ids_key,

JSON.stringify(

Object.keys(data).reduce((sectionDataIds, sectionKey) => {

sectionDataIds[sectionKey] = data[sectionKey]['data_id'];

return sectionDataIds;

}, {})

false,

true

);

} catch (error) {

console.warn("Couldn't store privateContent", error);

}

);

}

</script>

保存された差分

原文

ファイルを開く

const ttl = 3600;

if (typeof hyva === 'undefined' || (!hyva.getBrowserStorage || !hyva.getCookie || !hyva.setCookie)) {
            console.warn("Hyvä helpers are not loaded yet. Make sure they are included before this script");
        }

function loadSectionData () {
            const browserStorage = hyva.getBrowserStorage();
            if (!browserStorage) {
                typeof window.dispatchMessages !== "undefined" && window.dispatchMessages(
                    [{
                        type: "warning",
                        text: "Please enable LocalStorage in your browser."
                    }]
                );
                return;
            }
            try {
                let isInvalid = false;

if (hyva.getCookie(last_visited_store_key) !== CURRENT_STORE_CODE) {
                    isInvalid = true;
                }
                hyva.setCookie(last_visited_store_key, CURRENT_STORE_CODE, false, false);

if (!hyva.getCookie(mage_cache_session_id_key)) {
                    isInvalid = true;
                    const skipSetDomain = true;
                    const days = false;
                    hyva.setCookie(mage_cache_session_id_key, true, days, skipSetDomain)
                }

const cookieVersion = hyva.getCookie(private_content_version_key);
                const storageVersion = browserStorage.getItem(private_content_version_key);

if (cookieVersion && !storageVersion || cookieVersion !== storageVersion) {
                    isInvalid = true;
                }

const privateContentExpires = browserStorage.getItem(private_content_expire_key);
                if (privateContentExpires && new Date(privateContentExpires) < new Date()) {
                    browserStorage.removeItem(private_content_key);
                }

if (isInvalid) {
                    fetchPrivateContent([]);
                } else if (cookieVersion && storageVersion && cookieVersion === storageVersion) {
                    const privateContent = JSON.parse(browserStorage.getItem(private_content_key));
                    if (
                        privateContent &&
                        privateContentExpires &&
                        privateContent.cart &&
                        privateContent.customer
                    ) {
                        dispatchPrivateContent(privateContent);
                    } else {
                        fetchPrivateContent([]);
                    }
                } else {
                    dispatchPrivateContent({});
                }

} catch (error) {
                console.warn('Error retrieving Private Content:', error);
            }
        }

window.addEventListener('load', loadSectionData);
        window.addEventListener('reload-customer-section-data', loadSectionData);

function dispatchPrivateContent(data) {
            const privateContentEvent = new CustomEvent("private-content-loaded", {
                detail: {
                    data: data
                }
            });
            window.dispatchEvent(privateContentEvent);
        }

function fetchPrivateContent(sections) {
            fetch(`${BASE_URL}customer/section/load/?sections=${encodeURIComponent(sections.join(','))}`, {
                method: 'GET',
                headers: {
                    'Content-Type': 'application/json',
                    'X-Requested-With': 'XMLHttpRequest'
                }
            })
                .then(response => response.json())
                .then(
                    data => {
                        if (data) {
                            try {
                                const browserStorage = hyva.getBrowserStorage();

// merge new data preserving non-invalidated sections
                                const oldSectionData = JSON.parse(browserStorage.getItem(private_content_key) || '{}');

if ((! data.cart || ! data.cart.cartId) && oldSectionData['checkout-data']) {
                                    delete oldSectionData['checkout-data'];
                                }
                                const newSectionData = Object.assign(oldSectionData, data);

dispatchPrivateContent(newSectionData);

// don't persist messages, they've been dispatched already
                                if (newSectionData.messages && newSectionData.messages.messages ) {
                                    newSectionData.messages.messages = [];
                                }

browserStorage.setItem(private_content_key, JSON.stringify(newSectionData));

const expiresAt = new Date(Date.now() + (ttl * 1000)).toISOString();
                                browserStorage.setItem(private_content_expire_key, expiresAt);

const newCookieVersion = hyva.getCookie(private_content_version_key);
                                browserStorage.setItem(private_content_version_key, newCookieVersion);

// We don't need the section_data_ids in Hyvä, but we store them for compatibility
                                // with Luma Fallback. Otherwise, not all sections are loaded in Luma Checkout
                                hyva.setCookie(
                                    section_data_ids_key,
                                    JSON.stringify(
                                        Object.keys(data).reduce((sectionDataIds, sectionKey) => {
                                            sectionDataIds[sectionKey] = data[sectionKey]['data_id'];
                                            return sectionDataIds;
                                        }, {})
                                    ),
                                    false,
                                    true
                                );
                            } catch (error) {
                                console.warn("Couldn't store privateContent", error);
                            }
                        }
                    }
                );
        }
    }
</script>

変更されたテキスト

ファイルを開く

declare(strict_types=1);

/** @var Template $block */
/** @var Escaper $escaper */

use Magento\Framework\Escaper;
use Magento\Framework\View\Element\Template;

?>
<script>
    'use strict';
    {
        const private_content_key = 'mage-cache-storage';
        const private_content_expire_key = 'mage-cache-timeout';
        const private_content_version_key = 'private_content_version';
        const section_data_ids_key = 'section_data_ids';
        const mage_cache_session_id_key = 'mage-cache-sessid';
        const last_visited_store_key = 'last_visited_store';

const ttl = 3600;

<?php
        /**
         * The `hyva` JS namespace is being set by Hyva_Theme/src/view/frontend/templates/page/js/hyva.phtml
         * and should be included through Hyva_Theme/src/view/frontend/layout/default_hyva.xml
         */
?>
        if (typeof hyva === 'undefined' || (!hyva.getBrowserStorage || !hyva.getCookie || !hyva.setCookie)) {
            console.warn("Hyvä helpers are not loaded yet. Make sure they are included before this script");
        }

function loadSectionData () {
            const browserStorage = hyva.getBrowserStorage();
            if (!browserStorage) {
                typeof window.dispatchMessages !== "undefined" && window.dispatchMessages(
                    [{
                        type: "warning",
                        text: "<?= $escaper->escapeHtml(__('Please enable LocalStorage in your browser.')) ?>"
                    }]
                );
                return;
            }
            try {
                let isInvalid = false;

<?php
                /**
                 * Usually store switch is made via POST requests, but if this happen on other ways (eg. the customer
                 * changing manually the base url, or landing from search engines on a different store) we need to
                 * request again private contents
                 */
?>
                if (hyva.getCookie(last_visited_store_key) !== CURRENT_STORE_CODE) {
                    isInvalid = true;
                }
                hyva.setCookie(last_visited_store_key, CURRENT_STORE_CODE, false, false);

<?php
                /**
                 * The `mage-cache-sessid` cookie is being unset from backend to
                 * indicate that sectionData is invalidated and needs to be reloaded
                 * in the frontend. So we mark it as invalid, and then re-set the
                 * `mage-cache-sessid` cookie
                 */
?>
                if (!hyva.getCookie(mage_cache_session_id_key)) {
                    isInvalid = true;
                    const skipSetDomain = true;
                    const days = false;
                    hyva.setCookie(mage_cache_session_id_key, true, days, skipSetDomain)
                }

const cookieVersion = hyva.getCookie(private_content_version_key);
                const storageVersion = browserStorage.getItem(private_content_version_key);

if (cookieVersion && !storageVersion || cookieVersion !== storageVersion) {
                    isInvalid = true;
                }

} catch (error) {
                console.warn('Error retrieving Private Content:', error);
            }
        }

window.addEventListener('alpine:initialized', loadSectionData);
        window.addEventListener('reload-customer-section-data', loadSectionData);

<?php
        /**
         * We use 'X-Requested-With': 'XMLHttpRequest' to prevent Magento from clearing the customer session
         * in \Magento\PageCache\Model\DepersonalizeChecker::checkIfDepersonalize
         * Otherwise, \Magento\Tax\Plugin\Checkout\CustomerData\Cart::afterGetSectionData can't add tax to
         * cart items.
         */
?>
        function fetchPrivateContent(sections) {
            fetch(`${BASE_URL}customer/section/load/?sections=${encodeURIComponent(sections.join(','))}`, {
                method: 'GET',
                headers: {
                    'Content-Type': 'application/json',
                    'X-Requested-With': 'XMLHttpRequest'
                }
            })
                .then(response => response.json())
                .then(
                    data => {
                        if (data) {
                            try {
                                const browserStorage = hyva.getBrowserStorage();

// merge new data preserving non-invalidated sections
                                const oldSectionData = JSON.parse(browserStorage.getItem(private_content_key) || '{}') || {};

<?php
                                /** Ensure no checkout data remains after logout (from Luma checkout) */
?>
                                if ((! data.cart || ! data.cart.cartId) && oldSectionData['checkout-data']) {
                                    delete oldSectionData['checkout-data'];
                                }
                                const newSectionData = Object.assign(oldSectionData, data);

dispatchPrivateContent(newSectionData);

browserStorage.setItem(private_content_key, JSON.stringify(newSectionData));

const expiresAt = new Date(Date.now() + (ttl * 1000)).toISOString();
                                browserStorage.setItem(private_content_expire_key, expiresAt);

const newCookieVersion = hyva.getCookie(private_content_version_key);
                                browserStorage.setItem(private_content_version_key, newCookieVersion);