Skip to content

J
joshine
Commit c31cf6ea by lmf
Options

优化checkout乱码

parents 2c4930cd f5332f12
Showing with 534 additions and 555 deletions
app/code/Magento/Catalog/composer.json
{ {
"name": "magento/module-catalog", "name": "magento/module-catalog",
"description": "N/A", "description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": { "config": {
"sort-packages": true "sort-packages": true
}, },
"version": "104.0.3",
"require": { "require": {
"php": "~7.3.0||~7.4.0", "php": "~7.3.0||~7.4.0",
"magento/framework": "*", "magento/framework": "103.0.*",
"magento/module-authorization": "*", "magento/module-authorization": "100.4.*",
"magento/module-asynchronous-operations": "*", "magento/module-asynchronous-operations": "100.4.*",
"magento/module-backend": "*", "magento/module-backend": "102.0.*",
"magento/module-catalog-inventory": "*", "magento/module-catalog-inventory": "100.4.*",
"magento/module-catalog-rule": "*", "magento/module-catalog-rule": "101.2.*",
"magento/module-catalog-url-rewrite": "*", "magento/module-catalog-url-rewrite": "100.4.*",
"magento/module-checkout": "*", "magento/module-checkout": "100.4.*",
"magento/module-cms": "*", "magento/module-cms": "104.0.*",
"magento/module-config": "*", "magento/module-config": "101.2.*",
"magento/module-customer": "*", "magento/module-customer": "103.0.*",
"magento/module-directory": "*", "magento/module-directory": "100.4.*",
"magento/module-eav": "*", "magento/module-eav": "102.1.*",
"magento/module-indexer": "*", "magento/module-indexer": "100.4.*",
"magento/module-media-storage": "*", "magento/module-media-storage": "100.4.*",
"magento/module-msrp": "*", "magento/module-msrp": "100.4.*",
"magento/module-page-cache": "*", "magento/module-page-cache": "100.4.*",
"magento/module-product-alert": "*", "magento/module-product-alert": "100.4.*",
"magento/module-quote": "*", "magento/module-quote": "101.2.*",
"magento/module-store": "*", "magento/module-store": "101.1.*",
"magento/module-tax": "*", "magento/module-tax": "100.4.*",
"magento/module-theme": "*", "magento/module-theme": "101.1.*",
"magento/module-ui": "*", "magento/module-ui": "101.2.*",
"magento/module-url-rewrite": "*", "magento/module-url-rewrite": "102.0.*",
"magento/module-widget": "*", "magento/module-widget": "101.2.*",
"magento/module-wishlist": "*" "magento/module-wishlist": "101.2.*"
}, },
"suggest": { "suggest": {
"magento/module-cookie": "*", "magento/module-cookie": "100.4.*",
"magento/module-sales": "*", "magento/module-sales": "103.0.*",
"magento/module-catalog-sample-data": "*" "magento/module-catalog-sample-data": "Sample Data version: 100.4.*"
}, },
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": { "autoload": {
"files": [ "files": [
"registration.php" "registration.php"
...@@ -52,3 +53,4 @@ ...@@ -52,3 +53,4 @@
} }
} }
} }
app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
/** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */ /** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */
?> ?>
<!--<a href="#"--> <a href="#"
<!-- class="action tocompare"--> class="action tocompare"
<!-- title="--><?//= $block->escapeHtml(__('Add to Compare')) ?><!--"--> title="<?= $block->escapeHtml(__('Add to Compare')) ?>"
<!-- aria-label="--><?//= $block->escapeHtml(__('Add to Compare')) ?><!--"--> aria-label="<?= $block->escapeHtml(__('Add to Compare')) ?>"
<!-- data-post='--><?//= /* @noEscape */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?><!--'--> data-post='<?= /* @noEscape */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
<!-- role="button">--> role="button">
<!-- <span>--><?//= $block->escapeHtml(__('Add to Compare')) ?><!--</span>--> <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
<!--</a>--> </a>
app/code/Magento/Checkout/composer.json
{ {
"name": "magento/module-checkout", "name": "magento/module-checkout",
"description": "N/A", "description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": { "config": {
"sort-packages": true "sort-packages": true
}, },
"version": "100.4.3",
"require": { "require": {
"php": "~7.3.0||~7.4.0", "php": "~7.3.0||~7.4.0",
"magento/framework": "*", "magento/framework": "103.0.*",
"magento/module-captcha": "*", "magento/module-captcha": "100.4.*",
"magento/module-catalog": "*", "magento/module-catalog": "104.0.*",
"magento/module-catalog-inventory": "*", "magento/module-catalog-inventory": "100.4.*",
"magento/module-config": "*", "magento/module-config": "101.2.*",
"magento/module-customer": "*", "magento/module-customer": "103.0.*",
"magento/module-directory": "*", "magento/module-directory": "100.4.*",
"magento/module-eav": "*", "magento/module-eav": "102.1.*",
"magento/module-msrp": "*", "magento/module-msrp": "100.4.*",
"magento/module-page-cache": "*", "magento/module-page-cache": "100.4.*",
"magento/module-payment": "*", "magento/module-payment": "100.4.*",
"magento/module-quote": "*", "magento/module-quote": "101.2.*",
"magento/module-sales": "*", "magento/module-sales": "103.0.*",
"magento/module-sales-rule": "*", "magento/module-sales-rule": "101.2.*",
"magento/module-security": "*", "magento/module-security": "100.4.*",
"magento/module-shipping": "*", "magento/module-shipping": "100.4.*",
"magento/module-store": "*", "magento/module-store": "101.1.*",
"magento/module-tax": "*", "magento/module-tax": "100.4.*",
"magento/module-theme": "*", "magento/module-theme": "101.1.*",
"magento/module-ui": "*", "magento/module-ui": "101.2.*",
"magento/module-authorization": "*" "magento/module-authorization": "100.4.*"
}, },
"suggest": { "suggest": {
"magento/module-cookie": "*" "magento/module-cookie": "100.4.*"
}, },
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": { "autoload": {
"files": [ "files": [
"registration.php" "registration.php"
...@@ -45,3 +46,4 @@ ...@@ -45,3 +46,4 @@
} }
} }
} }
app/code/Magento/Checkout/i18n/en_US.csv
...@@ -6,7 +6,7 @@ State/Province,State/Province ...@@ -6,7 +6,7 @@ State/Province,State/Province
"Zip/Postal Code","Zip/Postal Code" "Zip/Postal Code","Zip/Postal Code"
"My Cart (1 item)","My Cart (1 item)" "My Cart (1 item)","My Cart (1 item)"
"My Cart (%1 items)","My Cart (%1 items)" "My Cart (%1 items)","My Cart (%1 items)"
"My Cart","Cart" "My Cart","My Cart"
"For delivery questions.","For delivery questions." "For delivery questions.","For delivery questions."
"Customer is already registered","Customer is already registered" "Customer is already registered","Customer is already registered"
"Your session has expired","Your session has expired" "Your session has expired","Your session has expired"
...@@ -121,7 +121,7 @@ Login,Login ...@@ -121,7 +121,7 @@ Login,Login
"See Details","See Details" "See Details","See Details"
"Options Details","Options Details" "Options Details","Options Details"
Remove,Remove Remove,Remove
"Cart Subtotal","Total:" "Cart Subtotal","Cart Subtotal"
"Payment Information","Payment Information" "Payment Information","Payment Information"
"No Payment method available.","No Payment method available." "No Payment method available.","No Payment method available."
"You can track your order status by creating an account.","You can track your order status by creating an account." "You can track your order status by creating an account.","You can track your order status by creating an account."
...@@ -132,7 +132,7 @@ Remove,Remove ...@@ -132,7 +132,7 @@ Remove,Remove
"Ship To:","Ship To:" "Ship To:","Ship To:"
edit,edit edit,edit
"Order Summary","Order Summary" "Order Summary","Order Summary"
"View and Edit Cart","View Cart" "View and Edit Cart","View and Edit Cart"
"View Details","View Details" "View Details","View Details"
"Field ","Field " "Field ","Field "
" is required."," is required." " is required."," is required."
...@@ -141,7 +141,7 @@ edit,edit ...@@ -141,7 +141,7 @@ edit,edit
"If you believe it is the right one you can ignore this notice.","If you believe it is the right one you can ignore this notice." "If you believe it is the right one you can ignore this notice.","If you believe it is the right one you can ignore this notice."
"New Address","New Address" "New Address","New Address"
"Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?" "Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?"
"Review & Payments","Order Details" "Review & Payments","Review & Payments"
"Select a new payment method","Select a new payment method" "Select a new payment method","Select a new payment method"
Shipping,Shipping Shipping,Shipping
"Save Address","Save Address" "Save Address","Save Address"
...@@ -180,8 +180,8 @@ Payment,Payment ...@@ -180,8 +180,8 @@ Payment,Payment
"Thank you for your purchase!","Thank you for your purchase!" "Thank you for your purchase!","Thank you for your purchase!"
"Password", "Password" "Password", "Password"
"Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again." "Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
"Item in Cart","Item" "Item in Cart","Item in Cart"
"Items in Cart","Items" "Items in Cart","Items in Cart"
"Close","Close" "Close","Close"
"Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart" "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>." "You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
......
app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
...@@ -25,11 +25,6 @@ ...@@ -25,11 +25,6 @@
data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?> data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
</div> </div>
<?php endif ?> <?php endif ?>
<div class="page-title-wrapper">
<h2 class="page-title">
<?= $block->escapeHtml(__('Shopping Cart Items')) ?>
</h2>
</div>
<table id="shopping-cart-table" <table id="shopping-cart-table"
class="cart items data table" class="cart items data table"
data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear", data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
......
app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
...@@ -42,21 +42,19 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima ...@@ -42,21 +42,19 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
<?php endif; ?> <?php endif; ?>
</strong> </strong>
<?php if ($_options = $block->getOptionList()) :?> <?php if ($_options = $block->getOptionList()) :?>
<div class="item-options"> <dl class="item-options">
<?php <?php foreach ($_options as $_option) :?>
foreach ($_options as $k=>$_option) :
?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?> <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<div> <dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?= $block->escapeHtml($_option['label']) ?>: <dd>
<?php if (isset($_formatedOptionValue['full_view'])) :?> <?php if (isset($_formatedOptionValue['full_view'])) :?>
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?> <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
<?php else :?> <?php else :?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?> <?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
<?php endif; ?> <?php endif; ?>
</div> </dd>
<?php endforeach; ?> <?php endforeach; ?>
</div> </dl>
<?php endif;?> <?php endif;?>
<?php if ($messages = $block->getMessages()) :?> <?php if ($messages = $block->getMessages()) :?>
<?php foreach ($messages as $message) :?> <?php foreach ($messages as $message) :?>
......
app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
...@@ -8,9 +8,14 @@ ...@@ -8,9 +8,14 @@
?> ?>
<div class="cart-empty"> <div class="cart-empty">
<?= $block->getChildHtml('checkout_cart_empty_widget') ?> <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
<div class="empty-img"><img src="<?= $block->getViewFileUrl('Magento_Checkout::images/empty-cart.svg');?>" /></div>
<p><?= $block->escapeHtml(__('You have no items in your shopping cart.')) ?></p> <p><?= $block->escapeHtml(__('You have no items in your shopping cart.')) ?></p>
<p><a href="<?= $block->escapeUrl($block->getContinueShoppingUrl());?>">continue shopping>></a> <p><?= $block->escapeHtml(
__(
'Click <a href="%1">here</a> to continue shopping.',
$block->escapeUrl($block->getContinueShoppingUrl())
),
['a']
) ?>
</p> </p>
<?= $block->getChildHtml('shopping.cart.table.after') ?> <?= $block->getChildHtml('shopping.cart.table.after') ?>
</div> </div>
......
app/code/Magento/Checkout/view/frontend/web/images/empty-cart.svg deleted 100644 → 0
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666333165025" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13278" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M725.333333 981.333333a42.666667 42.666667 0 1 1 42.666667-42.666666 42.713333 42.713333 0 0 1-42.666667 42.666666z m0-42.666666z m-384 42.666666a42.666667 42.666667 0 1 1 42.666667-42.666666 42.713333 42.713333 0 0 1-42.666667 42.666666z m0-42.666666z m382.313334-128H347.146667a85.333333 85.333333 0 0 1-82.146667-62.226667L90.506667 128H21.333333a21.333333 21.333333 0 0 1 0-42.666667h85.333334a21.333333 21.333333 0 0 1 20.533333 15.56L170.826667 256h766.086666a37.333333 37.333333 0 0 1 34.953334 50.44l-168.32 448.853333a85.333333 85.333333 0 0 1-79.9 55.373334zM182.826667 298.666667l123.246666 438.22a42.82 42.82 0 0 0 41.073334 31.113333h376.5a42.873333 42.873333 0 0 0 39.953333-27.686667L929.213333 298.666667z" fill="#bfbfbf" p-id="13279"></path></svg>
\ No newline at end of file
app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
...@@ -130,14 +130,6 @@ define([ ...@@ -130,14 +130,6 @@ define([
return; return;
} }
if (ratesData.length >= 1) {
//set shipping rate if we have only one available shipping rate
if(!selectedShippingRate) {
selectShippingMethodAction(ratesData[0]);
}
console.log(selectedShippingRate)
}
if (quote.shippingMethod()) { if (quote.shippingMethod()) {
availableRate = _.find(ratesData, function (rate) { availableRate = _.find(ratesData, function (rate) {
return rate['carrier_code'] == quote.shippingMethod()['carrier_code'] && //eslint-disable-line return rate['carrier_code'] == quote.shippingMethod()['carrier_code'] && //eslint-disable-line
......
app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
...@@ -5,63 +5,46 @@ ...@@ -5,63 +5,46 @@
*/ */
--> -->
<div class="block-title"> <div class="block-title">
<strong>
<span class="text" translate="'My Cart'"></span>
<span
class="qty empty"
text="getCartParam('summary_count')"
data-bind="css: { empty: !!getCartParam('summary_count') == false },
attr: { title: $t('Items in Cart') }">
</span>
</strong>
</div> </div>
<div class="block-content"> <div class="block-content">
<button type="button"
id="btn-minicart-close"
class="action close"
data-action="close"
data-bind="
attr: {
title: $t('Close')
},
click: closeMinicart()
">
<span translate="'Close'"></span>
</button>
<if args="getCartParam('summary_count')"> <if args="getCartParam('summary_count')">
<strong class="subtitle" translate="'Recently added item(s)'"></strong> <div class="items-total">
<div data-action="scroll" class="minicart-items-wrapper"> <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"></span>
<ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartItems(), as: 'item' }"> <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"></translate>
<each args="$parent.getRegion($parent.getItemRenderer(item.product_type))" <span class="count" text="getCartParam('summary_count')"></span>
render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"></each>
</ol>
</div>
</if>
<ifnot args="getCartParam('summary_count')">
<strong class="subtitle empty"
translate="'You have no items in your shopping cart.'"></strong>
<if args="getCartParam('cart_empty_message')">
<p class="minicart empty text" text="getCartParam('cart_empty_message')"></p>
<div class="actions">
<div class="secondary">
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
<span translate="'View and Edit Cart'"></span>
</a>
</div>
</div>
</if>
</ifnot>
<if args="getCartParam('summary_count')">
<div class="item-total-subtotal">
<div class="items-total">
<span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"></span>
<translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"></translate>
<span class="count" text="getCartParam('summary_count')"></span>
<!-- ko if: (getCartParam('summary_count') > 1) --> <!-- ko if: (getCartParam('summary_count') > 1) -->
<span translate="'Items in Cart'"></span> <span translate="'Items in Cart'"></span>
<!--/ko--> <!--/ko-->
<!-- ko if: (getCartParam('summary_count') === 1) --> <!-- ko if: (getCartParam('summary_count') === 1) -->
<span translate="'Item in Cart'"></span> <span translate="'Item in Cart'"></span>
<!--/ko--> <!--/ko-->
</div>
<each args="getRegion('subtotalContainer')" render=""></each>
</div> </div>
<each args="getRegion('subtotalContainer')" render=""></each>
<each args="getRegion('extraInfo')" render=""></each> <each args="getRegion('extraInfo')" render=""></each>
<div class="actions" if="getCartParam('summary_count')">
<div class="secondary">
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
<span translate="'View and Edit Cart'"></span>
</a>
</div>
</div>
<div class="actions" if="getCartParam('possible_onepage_checkout')"> <div class="actions" if="getCartParam('possible_onepage_checkout')">
<div class="primary"> <div class="primary">
...@@ -81,9 +64,41 @@ ...@@ -81,9 +64,41 @@
<div data-bind="html: getCartParamUnsanitizedHtml('extra_actions')"></div> <div data-bind="html: getCartParamUnsanitizedHtml('extra_actions')"></div>
</div> </div>
</div> </div>
</if>
<if args="getCartParam('summary_count')">
<strong class="subtitle" translate="'Recently added item(s)'"></strong>
<div data-action="scroll" class="minicart-items-wrapper">
<ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartItems(), as: 'item' }">
<each args="$parent.getRegion($parent.getItemRenderer(item.product_type))"
render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"></each>
</ol>
</div>
</if> </if>
<ifnot args="getCartParam('summary_count')">
<strong class="subtitle empty"
translate="'You have no items in your shopping cart.'"></strong>
<if args="getCartParam('cart_empty_message')">
<p class="minicart empty text" text="getCartParam('cart_empty_message')"></p>
<div class="actions">
<div class="secondary">
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
<span translate="'View and Edit Cart'"></span>
</a>
</div>
</div>
</if>
</ifnot>
<div class="actions" if="getCartParam('summary_count')">
<div class="secondary">
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
<span translate="'View and Edit Cart'"></span>
</a>
</div>
</div>
<div id="minicart-widgets" class="minicart-widgets" if="regionHasElements('promotion')"> <div id="minicart-widgets" class="minicart-widgets" if="regionHasElements('promotion')">
<each args="getRegion('promotion')" render=""></each> <each args="getRegion('promotion')" render=""></each>
</div> </div>
......
app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
...@@ -20,45 +20,46 @@ ...@@ -20,45 +20,46 @@
<!-- /ko --> <!-- /ko -->
</span> </span>
<!-- /ko --> <!-- /ko -->
<div class="product-item-details"> <div class="product-item-details">
<strong class="product-item-name">
<!-- ko if: product_has_url --> <!-- ko if: product_has_url -->
<a data-bind="attr: {href: product_url}, html: $parent.getProductNameUnsanitizedHtml(product_name)"></a> <a data-bind="attr: {href: product_url}, html: $parent.getProductNameUnsanitizedHtml(product_name)"></a>
<!-- /ko --> <!-- /ko -->
<!-- ko ifnot: product_has_url --> <!-- ko ifnot: product_has_url -->
<span data-bind="html: $parent.getProductNameUnsanitizedHtml(product_name)"></span> <span data-bind="html: $parent.getProductNameUnsanitizedHtml(product_name)"></span>
<!-- /ko --> <!-- /ko -->
</strong>
<!-- ko if: options.length --> <!-- ko if: options.length -->
<div class="product options"> <div class="product options" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
<span data-role="title" class="toggle"><!-- ko i18n: 'See Details' --><!-- /ko --></span>
<div data-role="content" class="content"> <div data-role="content" class="content">
<div class="product options list"> <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
<dl class="product options list">
<!-- ko foreach: { data: options, as: 'option' } --> <!-- ko foreach: { data: options, as: 'option' } -->
<div class="opitem"> <dt class="label"><!-- ko text: option.label --><!-- /ko --></dt>
<dd class="values">
<!-- ko if: Array.isArray(option.value) --> <!-- ko if: Array.isArray(option.value) -->
<span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value.join('<br/>'))"></span> <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value.join('<br/>'))"></span>
<!-- /ko --> <!-- /ko -->
<!-- ko if: (!Array.isArray(option.value) && ['file', 'html'].includes(option.option_type)) --> <!-- ko if: (!Array.isArray(option.value) && ['file', 'html'].includes(option.option_type)) -->
<span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value)"></span> <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value)"></span>
<!-- /ko --> <!-- /ko -->
<!-- ko if: (!Array.isArray(option.value) && !['file', 'html'].includes(option.option_type)) --> <!-- ko if: (!Array.isArray(option.value) && !['file', 'html'].includes(option.option_type)) -->
<span data-bind="text: option.value"></span> <span data-bind="text: option.value"></span>
<!-- /ko --> <!-- /ko -->
<!-- ko if: ($index() != ($parent.options.length-1)) --> </dd>
,
<!-- /ko -->
</div>
<!-- /ko --> <!-- /ko -->
</div> </dl>
</div> </div>
</div> </div>
<!-- /ko --> <!-- /ko -->
<div class="product-item-pricing"> <div class="product-item-pricing">
<div class="details-qty qty">
<span data-bind="text: qty"></span>*
</div>
<!-- ko if: canApplyMsrp --> <!-- ko if: canApplyMsrp -->
<div class="details-map"> <div class="details-map">
<span class="label" data-bind="i18n: 'Price'"></span> <span class="label" data-bind="i18n: 'Price'"></span>
<span class="value" data-bind="i18n: 'See price before order confirmation.'"></span> <span class="value" data-bind="i18n: 'See price before order confirmation.'"></span>
...@@ -70,10 +71,38 @@ ...@@ -70,10 +71,38 @@
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
<div class="details-qty qty">
<label class="label" data-bind="i18n: 'Qty', attr: {
for: 'cart-item-'+item_id+'-qty'}"></label>
<input data-bind="attr: {
id: 'cart-item-'+item_id+'-qty',
'data-cart-item': item_id,
'data-item-qty': qty,
'data-cart-item-id': product_sku
}, value: qty"
type="number"
size="4"
class="item-qty cart-item-qty"/>
<button data-bind="attr: {
id: 'update-cart-item-'+item_id,
'data-cart-item': item_id,
title: $t('Update')
}"
class="update-cart-item"
style="display: none">
<span data-bind="i18n: 'Update'"></span>
</button>
</div>
</div> </div>
<div class="product actions"> <div class="product actions">
<!-- ko if: is_visible_in_site_visibility -->
<div class="primary">
<a data-bind="attr: {href: configure_url, title: $t('Edit item')}" class="action edit">
<span data-bind="i18n: 'Edit'"></span>
</a>
</div>
<!-- /ko -->
<div class="secondary"> <div class="secondary">
<a href="#" data-bind="attr: {'data-cart-item': item_id, title: $t('Remove item')}" <a href="#" data-bind="attr: {'data-cart-item': item_id, title: $t('Remove item')}"
class="action delete"> class="action delete">
......
app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
...@@ -13,18 +13,14 @@ ...@@ -13,18 +13,14 @@
<div class="product-item-inner"> <div class="product-item-inner">
<div class="product-item-name-block"> <div class="product-item-name-block">
<strong class="product-item-name" data-bind="html: getNameUnsanitizedHtml($parent)"></strong> <strong class="product-item-name" data-bind="html: getNameUnsanitizedHtml($parent)"></strong>
</div>
<div class="price-qty-info">
<!-- ko foreach: getRegion('after_details') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
<div class="details-qty"> <div class="details-qty">
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span> <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
<span class="value" data-bind="text: $parent.qty"></span> <span class="value" data-bind="text: $parent.qty"></span>
</div> </div>
</div> </div>
<!-- ko foreach: getRegion('after_details') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
</div> </div>
<!-- ko if: (JSON.parse($parent.options).length > 0)--> <!-- ko if: (JSON.parse($parent.options).length > 0)-->
......
app/code/Magento/Paypal/composer.json
{ {
"name": "magento/module-paypal", "name": "magento/module-paypal",
"description": "N/A", "description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": { "config": {
"sort-packages": true "sort-packages": true
}, },
"version": "101.0.3",
"require": { "require": {
"php": "~7.3.0||~7.4.0", "php": "~7.3.0||~7.4.0",
"lib-libxml": "*", "lib-libxml": "*",
"magento/framework": "*", "magento/framework": "103.0.*",
"magento/module-authorization": "*", "magento/module-authorization": "100.4.*",
"magento/module-backend": "*", "magento/module-backend": "102.0.*",
"magento/module-catalog": "*", "magento/module-catalog": "104.0.*",
"magento/module-checkout": "*", "magento/module-checkout": "100.4.*",
"magento/module-config": "*", "magento/module-config": "101.2.*",
"magento/module-customer": "*", "magento/module-customer": "103.0.*",
"magento/module-directory": "*", "magento/module-directory": "100.4.*",
"magento/module-eav": "*", "magento/module-eav": "102.1.*",
"magento/module-instant-purchase": "*", "magento/module-instant-purchase": "100.4.*",
"magento/module-payment": "*", "magento/module-payment": "100.4.*",
"magento/module-quote": "*", "magento/module-quote": "101.2.*",
"magento/module-sales": "*", "magento/module-sales": "103.0.*",
"magento/module-store": "*", "magento/module-store": "101.1.*",
"magento/module-tax": "*", "magento/module-tax": "100.4.*",
"magento/module-theme": "*", "magento/module-theme": "101.1.*",
"magento/module-ui": "*", "magento/module-ui": "101.2.*",
"magento/module-vault": "*" "magento/module-vault": "101.2.*"
}, },
"suggest": { "suggest": {
"magento/module-checkout-agreements": "*" "magento/module-checkout-agreements": "100.4.*"
}, },
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": { "autoload": {
"files": [ "files": [
"registration.php" "registration.php"
...@@ -43,3 +44,4 @@ ...@@ -43,3 +44,4 @@
} }
} }
} }
app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
...@@ -30,40 +30,16 @@ if ($block->getIsInCatalogProduct()) { ...@@ -30,40 +30,16 @@ if ($block->getIsInCatalogProduct()) {
"shortcutContainerClass": "<?= /* @noEscape */ "." . $shortcutHtmlId ?>" "shortcutContainerClass": "<?= /* @noEscape */ "." . $shortcutHtmlId ?>"
} }
}' }'
> >
<?php <input type="image" data-action="checkout-form-submit"
if(strpos($block->escapeUrl($block->getImageUrl()),'checkout-logo-medium') !== false){ data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-color.svg'); src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
$class = 'checkout-logo-medium'; alt="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"
} else { title="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"/>
$imgsrc = $block->getViewFileUrl('Magento_Paypal::images/paypal-credit.png'); <?php if ($block->getAdditionalLinkImage()) : ?>
$class = 'paypal-credit'; <?php $linkImage = $block->getAdditionalLinkImage(); ?>
} <a href="<?= $block->escapeUrl($linkImage['href']) ?>">
?> <img src="<?= $block->escapeHtml($linkImage['src']) ?>" />
<div class="<?= $class ?>"> </a>
<input type="image" data-action="checkout-form-submit" <?php endif; ?>
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 class="checkout-txt">Checkout</div>
</div>
<!-- <input type="image" data-action="checkout-form-submit"-->
<!-- data-checkout-url="--><?//= $block->escapeUrl($block->getCheckoutUrl()) ?><!--"-->
<!-- src="--><?//= $block->escapeUrl($block->getImageUrl()) ?><!--"-->
<!-- 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> </div>
app/code/Magento/Paypal/view/frontend/web/images/paypal-color.svg deleted 100644 → 0
<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
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
...@@ -4,27 +4,6 @@ ...@@ -4,27 +4,6 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
?> ?>
<div data-role="content" style="margin-top: 30px;margin-bottom: -23px;display: none;" id="home_search">
<form class="" id="home_search_form" action="/catalogsearch/result/" method="get">
<div class="field search">
<div class="control">
<input id="new-search"
data-mage-init='{"quickSearch":{
"formSelector":"#new_search_form",
"minSearchLength": 1,
"url":"/search/ajax/suggest",
"destinationSelector":"#search_results"}
}'
type="text"
name="q"
placeholder="<?= $block->escapeHtmlAttr(__('Search entire store here...')) ?>"
class="input-text"/>
<div id="search_results" class="search-autocomplete"></div>
</div>
</div>
</form>
</div>
<style> <style>
.banner1,.banner1 >.imgbox, .banner1 >.imgbox > a, .banner1 >.imgbox > a >img{ .banner1,.banner1 >.imgbox, .banner1 >.imgbox > a, .banner1 >.imgbox > a >img{
height: 634px !important; height: 634px !important;
...@@ -49,9 +28,6 @@ ...@@ -49,9 +28,6 @@
require([ require([
'jquery' 'jquery'
], function ($) { ], function ($) {
$(".page-header .actions.search-dropdown").click(function () {
$("#home_search").toggle();
});
$.fn.banner = function(options){ $.fn.banner = function(options){
var that = this; var that = this;
options = options || {}; options = options || {};
...@@ -228,7 +204,7 @@ ...@@ -228,7 +204,7 @@
moveTime: 500, moveTime: 500,
index: 0 index: 0
}); });
})($); });
function isMobile() { function isMobile() {
var userAgentInfo = navigator.userAgent; var userAgentInfo = navigator.userAgent;
......
app/design/frontend/Joshine/breeze/Magento_Customer/templates/widget/name.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var \Magento\Customer\Block\Widget\Name $block */
/*
<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
->setObject($block->getAddress())
->toHtml() ?>
For checkout/onepage/shipping.phtml:
<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
->setObject($block->getAddress())
->setFieldIdFormat('shipping:%s')
->setFieldNameFormat('shipping[%s]')
->toHtml() ?>
*/
$prefix = $block->showPrefix();
$middle = $block->showMiddlename();
$suffix = $block->showSuffix();
?>
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
<div class="control">
<fieldset class="fieldset fieldset-fullname">
<div class="fields">
<?php endif; ?>
<?php if ($prefix) : ?>
<div class="field field-name-prefix<?= $block->isPrefixRequired() ? ' required' : '' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
<div class="control">
<?php if ($block->getPrefixOptions() === false) : ?>
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?>>
<?php else : ?>
<select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?> >
<?php foreach ($block->getPrefixOptions() as $_option) : ?>
<option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option) : ?> selected="selected"<?php endif; ?>>
<?= $block->escapeHtml(__($_option)) ?>
</option>
<?php endforeach; ?>
</select>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
<div class="field field-name-firstname required">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
maxlength="20"
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
</div>
</div>
<?php if ($middle) : ?>
<?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
<div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
value="<?= $block->escapeHtmlAttr($block->getObject()->getMiddlename()) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('middlename')) ?>"
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>" <?= $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
</div>
</div>
<?php endif; ?>
<div class="field field-name-lastname required">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
maxlength="20"
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
</div>
</div>
<?php if ($suffix) : ?>
<div class="field field-name-suffix<?= $block->isSuffixRequired() ? ' required' : '' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
<div class="control">
<?php if ($block->getSuffixOptions() === false) : ?>
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
<?php else : ?>
<select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
<?php foreach ($block->getSuffixOptions() as $_option) : ?>
<option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option) : ?> selected="selected"<?php endif; ?>>
<?= $block->escapeHtml(__($_option)) ?>
</option>
<?php endforeach; ?>
</select>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
</div>
</fieldset>
</div>
</div>
<?php endif; ?>
app/design/frontend/Joshine/breeze/Magento_Directory/templates/currency.phtml
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<span><?= $block->escapeHtml($currentCurrencyCode) ?></span> <span><?= $block->escapeHtml($currentCurrencyCode) ?></span>
</strong> </strong>
</div> </div>
<ul class="dropdown switcher-dropdown" data-target="dropdown"> <ul class="dropdown switcher-dropdown" data-target="dropdown" style="width: 90px;">
<?php foreach ($currencies as $_code => $_name) : ?> <?php foreach ($currencies as $_code => $_name) : ?>
<?php if ($_code != $currentCurrencyCode) : ?> <?php if ($_code != $currentCurrencyCode) : ?>
......
app/design/frontend/Joshine/breeze/Magento_SalesRule/web/template/cart/totals/discount.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<!-- ko if: isDisplayed() -->
<tr class="totals">
<th colspan="1" style="" class="mark" scope="row">
<span class="title" data-bind="text: getTitle()"></span>
<span class="discount coupon" data-bind="text: getCouponLabel()"></span>
</th>
<td class="amount" data-bind="attr: {'data-th': title}">
<span><span class="price" data-bind="text: getValue()"></span></span>
</td>
</tr>
<!-- /ko -->
app/design/frontend/Joshine/breeze/Magento_SalesRule/web/template/payment/discount.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<div class="payment-option _collapsible opc-payment-additional discount-code"
data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true">
<div class="payment-option-title field choice" data-role="title">
<span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">
<!-- ko i18n: 'Apply Discount Code'--><!-- /ko -->
</span>
</div>
<div class="payment-option-content" data-role="content">
<!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<form class="form form-discount" id="discount-form">
<div class="payment-option-inner">
<div class="field">
<label class="label" for="discount-code">
<span data-bind="i18n: 'Enter discount code'"></span>
</label>
<div class="control">
<input class="input-text"
type="text"
id="discount-code"
name="discount_code"
data-validate="{'required-entry':true}"
data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
</div>
</div>
</div>
<div class="actions-toolbar">
<div class="primary">
<!-- ko ifnot: isApplied() -->
<button class="action action-apply" type="submit" data-bind="'value': $t('Apply Discount'), click: apply">
<span><!-- ko i18n: 'Apply Discount'--><!-- /ko --></span>
</button>
<!-- /ko -->
<!-- ko if: isApplied() -->
<button class="action action-cancel" type="submit" data-bind="'value': $t('Cancel'), click: cancel">
<span><!-- ko i18n: 'Cancel coupon'--><!-- /ko --></span>
</button>
<!-- /ko -->
</div>
</div>
<!-- ko foreach: getRegion('captcha') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
</form>
</div>
</div>
app/design/frontend/Joshine/breeze/Magento_SalesRule/web/template/summary/discount.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<!-- ko if: isDisplayed() -->
<tr class="totals discount">
<th class="mark" scope="row">
<span class="title" data-bind="text: getTitle()"></span>
<span class="discount coupon" data-bind="text: getCouponCode()"></span>
</th>
<td class="amount">
<span class="price" data-bind="text: getValue(), attr: {'data-th': name}"></span>
</td>
</tr>
<!-- /ko -->
app/design/frontend/Joshine/breeze/Magento_Search/templates/form.mini.phtml
...@@ -16,15 +16,15 @@ $allowedSuggestion = $configProvider->isSuggestionsAllowed(); ...@@ -16,15 +16,15 @@ $allowedSuggestion = $configProvider->isSuggestionsAllowed();
$quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUrl()) : ''; $quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUrl()) : '';
?> ?>
<div class="block block-search"> <div class="block block-search">
<!-- <div class="block block-title"><strong>--><?//= $escaper->escapeHtml(__('Search')) ?><!--</strong></div>--> <div class="block block-title"><strong style="display: none"><?= $escaper->escapeHtml(__('Search')) ?></strong></div>
<div class="block block-content"> <div class="block block-content">
<form class="form minisearch" id="search_mini_form" <form class="form minisearch" id="search_mini_form"
action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get"> action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get">
<div class="field search"> <div class="field search">
<!-- <label class="label" for="search" data-role="minisearch-label">--> <label class="label" for="search" data-role="minisearch-label">
<!-- <span>--><?//= $escaper->escapeHtml(__('Search')) ?><!--</span>--> <span style="display: none"><?= $escaper->escapeHtml(__('Search')) ?></span>
<!-- </label>--> </label>
<div class="control"> <div class="control" id="search_mini_form_input">
<input id="search" <input id="search"
data-mage-init='{ data-mage-init='{
"quickSearch": { "quickSearch": {
......
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
$(this).siblings("ul").css("display","none"); $(this).siblings("ul").css("display","none");
$(this).children("span").html('>') $(this).children("span").html('>')
} }
}) });
$(".page-header .actions.search-dropdown").click(function () {
$("#search_mini_form_input").toggle();
});
}); });
</script> </script>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/topmenu.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/**
* Top menu for store
*
* @var $block \Magento\Theme\Block\Html\Topmenu
*/
$columnsLimit = $block->getColumnsLimit() ?: 0;
$_menuHtml = $block->getHtml('level-top', 'submenu', $columnsLimit)
?>
<div class="nav-sections">
<nav class="navigation" data-action="navigation">
<ul data-mage-init='{"menu":{"responsive":true,"dropdown":"div", "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
<li class="level0 nav-0 level-top"><a href="/" class="level-top"><span>Home</span></a></li>
<?= /* @noEscape */ $_menuHtml?>
<?= $block->getChildHtml() ?>
</ul>
</nav>
</div>
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -127,9 +127,6 @@ ...@@ -127,9 +127,6 @@
display: block !important; display: block !important;
} }
.block-content > .minisearch{
display: none !important;
}
.header.content{ .header.content{
gap: 3px; gap: 3px;
...@@ -274,9 +271,6 @@ footer .footer_link{ ...@@ -274,9 +271,6 @@ footer .footer_link{
display: none; display: none;
} }
.block-content > .minisearch{
display: none !important;
}
.footer_link > div > img{ .footer_link > div > img{
margin-top: 10px; margin-top: 10px;
...@@ -458,9 +452,6 @@ footer .footer_link{ ...@@ -458,9 +452,6 @@ footer .footer_link{
display: none; display: none;
} }
.block-content > .minisearch {
display: none !important;
}
.footer_link > div > img { .footer_link > div > img {
margin-top: 10px; margin-top: 10px;
...@@ -1039,7 +1030,7 @@ footer{ ...@@ -1039,7 +1030,7 @@ footer{
} }
.switcher.currency .label.switcher-label{color: #999999;position: unset;width: unset;height: unset;} .switcher.currency .label.switcher-label{color: #999999;position: unset;width: unset;height: unset;}
.switcher.currency .actions.dropdown{width: 80px;} .switcher.currency .actions.dropdown{width: 80px;}
.switcher.currency .dropdown.switcher-dropdown{width: 140px;} .switcher.currency .dropdown.switcher-dropdown{width: 90px;}
} }
.header.content .secure-wrapper{ .header.content .secure-wrapper{
opacity: 0; opacity: 0;
...@@ -1333,7 +1324,7 @@ footer{ ...@@ -1333,7 +1324,7 @@ footer{
.navigation li{ .navigation li{
position: unset; position: unset;
} }
@media(min-width: 640px){ @media(min-width: 1024px){
//display: flex; //display: flex;
//align-items: center; //align-items: center;
//margin-left: 156px; //margin-left: 156px;
...@@ -1513,77 +1504,15 @@ footer{ ...@@ -1513,77 +1504,15 @@ footer{
border: 3px solid transparent; border: 3px solid transparent;
} }
//.minisearch .control .input-text,.minisearch .control .input-text:hover{
// border: none;
// border-bottom: 1px solid #000;
// border-radius: 0;
// background: none;
// font-weight: normal;
//}
//.minisearch .action.search{
// margin-left: -17rem;
//}
.nav-sections{ .nav-sections{
width: 77%; width: 77%;
margin: 0 auto; margin: 0 auto;
} }
}
//.navigation li.level0.nav-1 .ui-menu-icon{
// position: absolute; @media (max-width: 1024px) {
// text-transform: uppercase;
// font: inherit;
// font-size: 9px;
// padding: 3px;
// border-radius: 2px;
// line-height: 1.2;
// color: #ffffff;
// min-width: 35px;
// text-align: center;
// background-color: #0cc485;
// top: 0;
// right: 14px;
//}
//.navigation li a:hover{
// background: none !important;
//}
//
//.navigation li.opened a:hover{
// background: none !important;
//}
//.navigation .opened > a{
// background: none !important;
//}
//
//.navigation li.level0:hover{
// content: "";
// width: 0;
// height: 2px;
// color: #000000;
// position: absolute;
// bottom: 15px;
// left: 10px;
// border-bottom: 2px solid #000000;
// transition: all 0.3s ease;
//}
//.navigation .level0:hover:after{
// content: '';
// display: block;
// position: absolute;
// top: 0;
// left: 100%;
// width: 10px;
// height: calc(100% + 3px);
// z-index: 1;
//}
}
@media (max-width: 639.98px) {
.navigation .submenu{ .navigation .submenu{
opacity: unset !important; opacity: unset !important;
...@@ -1737,19 +1666,7 @@ footer{ ...@@ -1737,19 +1666,7 @@ footer{
width: 100%; width: 100%;
display: inline-block; display: inline-block;
} }
.cart.table-wrapper .product-item-details{max-width:78px;}
.cart.table-wrapper .product-item-details .product-item-name{display: unset;}
.cart.table-wrapper .product-item-details .product-item-name a{
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
width: 100%;
display: inline-block;
color: #222222;
font-family: Outfit-Regular;
font-size: 12px;
}
} }
//.product-items .product-item-photo:hover { //.product-items .product-item-photo:hover {
// transform: scale(1.02); // transform: scale(1.02);
...@@ -1781,89 +1698,8 @@ footer{ ...@@ -1781,89 +1698,8 @@ footer{
color: #333333; color: #333333;
font-size: 12px; font-size: 12px;
} }
.cart-container .checkout.checkout-methods-items li{width: 100%;}
//.cart-container .checkout.checkout-methods-items li .checkout-logo-medium,.cart-container .checkout.checkout-methods-items li .paypal-credit{
//
// background: #ffc439;
// align-items: center;
// font-weight: 700;
// justify-content: center;
//}
.block-minicart .block-content > .actions .action.checkout ~ div:not(:empty){
display: unset !important;
}
.checkout-logo-medium,.paypal-credit{
display: flex;
background:#ffc439;
margin-bottom: 10px;
font-size: 14px;
align-items: center;
font-weight: 700;
justify-content: center;
font-family: Outfit-Regular;
}
.block.block-minicart .checkout-logo-medium,.block.block-minicart .paypal-credit{
font-size: 12px;
color: #333333;
font-weight: 600;
}
.opc-block-summary .totals.discount .title{
font-weight: unset;
font-size: 16px;
color: unset;
}
.paypal-credit .checkout-txt{margin-left: 15px;}
.checkout-logo-medium input,.paypal-credit input{
background: #ffc439;
outline: none;
position: relative;
display: inline-flex;
justify-content: center;
align-items: center;
gap: 0.25rem;
height: 55px;
padding: 8px 0;
}
.block-minicart .block-content > .actions input{
height: 45px;
}
.cart-container .checkout.checkout-methods-items li .checkout-txt{font-weight: 700;}
#minicart-content-wrapper .product.options.list{display: flex;}
#minicart-content-wrapper .product-item-pricing{display: flex;font-size: 13px;}
#minicart-content-wrapper .product-item-pricing .details-qty.qty{margin-right: 4px;gap: 0.175rem !important;color: #333333;}
#minicart-content-wrapper .minicart-items .actions{bottom: 1.5rem !important;}
#minicart-content-wrapper .item-total-subtotal{display: flex;align-items: center;justify-content: space-between;}
.block-minicart .items-total{display: block !important;font-size: 15px;color: #666666;}
#minicart-content-wrapper .action.primary.checkout{display: none !important;}
#minicart-content-wrapper .actio.delete{color: #999999 !important;}
#minicart-content-wrapper .actions .secondary a.action.viewcart{
outline: none;
position: relative;
display: inline-flex;
justify-content: center;
align-items: center;
gap: 0.25rem;
font-weight: 400;
padding: 0.5rem 1.25rem;
color: #ffffff;
background-color: #ffa800;
text-decoration: none !important;
white-space: nowrap;
height: 45px;
text-transform: uppercase;
font-size: 13px;
border-radius: 2px;
width: 100%;
}
.minicart-items .action.delete::before{
background-color: #999999;
-webkit-mask: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /></svg>') no-repeat 50% 50%;
-webkit-mask-size: 1.25rem 1.25rem;
}
.product-items .product-item-photo{
overflow: hidden;
}
@media (min-width: 992px) { @media (min-width: 992px) {
.product-item:hover .product-item-info .image0, .product-item:hover .product-item-info .image0,
.product-list-item:hover .product-item-info .image0 { .product-list-item:hover .product-item-info .image0 {
...@@ -2022,72 +1858,7 @@ button.action.submit.primary { ...@@ -2022,72 +1858,7 @@ button.action.submit.primary {
white-space: nowrap; white-space: nowrap;
} }
//购物车按钮样式
.action.primary.tocart{
font-size: smaller;
background-color: #000;
max-width: 100%;
font-weight: 600;
height: 55px;
width: 300px;
}
.block-minicart .block-content>.actions a.action{
color: #333333;
text-transform: uppercase;
}
.block-minicart .subtotal{
justify-content: right;
}
.block-minicart .subtotal .label{
font-size: 15px;
color: #333333;
}
.block-minicart .subtotal .price-wrapper{
font-size: 18px;
margin-left: 2px;
}
.block-minicart .action.primary.checkout{
height: 45px;
text-transform: uppercase;
font-size: 13px;
border-radius: 5px;
}
.block-minicart .subtitle.empty{
color: #e63500;
font-size: 14px;
font-family: 'Outfit-Regular';
}
.block-minicart .product-item-details .product-item-name a{
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
width: 100%;
display: inline-block;
color: #222222;
font-family: Outfit-Regular;
font-size: 14px;
}
.block-minicart .product.options .toggle{font-size: 13px;}
.block-minicart dl{margin:0;}
.block-minicart dt,dd{ display:inline; margin:0; padding:0;}
.block-minicart dt { font-weight: bold; }
.block-minicart dt::after { content: ": "; }
.block-minicart dd::after{ content:"\0A"; white-space:pre; }
.block-minicart .product.options.list{font-size: 12px;}
.minicart-items-wrapper dl{margin:0;}
.minicart-items-wrapper dt,dd{ display:inline; margin:0; padding:0;}
.minicart-items-wrapper dt { font-weight: bold; }
.minicart-items-wrapper dt::after { content: ": "; }
.minicart-items-wrapper dd::after{ content:"\0A"; white-space:pre; }
@media (min-width: 780px) {
.action.primary.tocart{
width: 500px !important;
}
}
#product-intro__freeshipping-more-3{ #product-intro__freeshipping-more-3{
display: inline-block; display: inline-block;
...@@ -2361,44 +2132,8 @@ background-color: #000; ...@@ -2361,44 +2132,8 @@ background-color: #000;
.amreview-images.slick-slider .slick-slide{ .amreview-images.slick-slider .slick-slide{
width: 100px !important; width: 100px !important;
} }
@media(min-width: 640px) {
.cart-container {
width: 81%;
margin: 0 auto;
}
.scroll-active{
background: #ffffff;
z-index: 1000;
width: 100%;
position: fixed;
padding-right: 20px;
top: 0;
transition: transform .3s;
}
.checkout-cart-index .page.messages{
width: 81%;
margin: 0 auto;
}
}
.checkout.checkout-methods-items li{display: block;}
.checkout.checkout-methods-items li .paypal.checkout{margin-bottom: 15px;}
.cart.table-wrapper .cart.table td{vertical-align: middle;}
.checkout-cart-index .cart-empty{text-align: center;margin-top: 50px;}
.checkout-cart-index .cart-empty .empty-img{margin-bottom: 20px;}
.checkout-cart-index .cart-empty .empty-img img{width: 120px;}
.checkout-cart-index .cart-empty a{
background: #ffa800;
color: #ffffff;
padding: 8px 15px;
text-transform: uppercase;
font-size: 12px;
}
span.swatch-attribute-selected-option{
margin-left: 20px;
color: blue;
}
//product view right //product view right
@media(min-width: 1024px) { @media(min-width: 1024px) {
...@@ -2437,30 +2172,41 @@ text-transform: none; ...@@ -2437,30 +2172,41 @@ text-transform: none;
} }
@media (max-width: 1024px) and (min-width: 768px){ @media (max-width: 1024px) and (min-width: 768px){
.select-element.section-before-footer.clearfix p { .select-element.section-before-footer.clearfix p {
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
color: #909090; color: #909090;
text-transform: none; text-transform: none;
} }
.flash-sale-item{ .flash-sale-item{
width: 33.33%; width: 33.33%;
} }
.shopcatewpt{ .shopcatewpt{
width: 100%; width: 100%;
} }
.shop-by-cata { .shop-by-cata {
padding: 10px; padding: 10px;
width: 50%; width: 50%;
float: left; float: left;
} }
p.flashsale-title { p.flashsale-title {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
}
} }
@media (max-width: 1024px) {
.minisearch .control {
padding: 2px;
left: 0px;
width: 100%;
}
#search_mini_form_input{
display: none;
}
} }
......
vendor/composer/installed.php
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
'root' => array( 'root' => array(
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'reference' => '5457bd56d03dbc73b558044fb60d999e0b96b969',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'version' => 'dev-master',
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
...@@ -958,6 +963,7 @@ ...@@ -958,6 +963,7 @@
'magento/magento2ce' => array( 'magento/magento2ce' => array(
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'reference' => '5457bd56d03dbc73b558044fb60d999e0b96b969',
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment