Skip to content

J
joshine
Commit 7f70cfff by dhn
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents f515ac06 2b1eb8ee
Showing with 247 additions and 20 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/form.phtml
...@@ -40,6 +40,21 @@ ...@@ -40,6 +40,21 @@
</form> </form>
</div> </div>
<script>
require([
'jquery'
], function ($) {
$(document).on('click','.swatch-option,.text',function (){
if ($('.swatch-attribute-selected-option-size-content .swatch-attribute-selected-option').text().length>0){
$('.swatch-attribute-selected-option-size-content').show();
}else {
$('.swatch-attribute-selected-option-size-content').hide();
}
});
});
</script>
<script type="text/x-magento-init"> <script type="text/x-magento-init">
{ {
......
app/design/frontend/Joshine/breeze/Magento_Sales/templates/order/items.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
// phpcs:disable Magento2.Templates.ThisInTemplate
/** @var \Magento\Sales\Block\Order\Items $block */
?>
<div class="table-wrapper order-items">
<table class="data table table-order-items" id="my-orders-table" summary="<?= $block->escapeHtml(__('Items Ordered')) ?>">
<caption class="table-caption"><?= $block->escapeHtml(__('Items Ordered')) ?></caption>
<thead>
<?php if ($block->isPagerDisplayed()) : ?>
<tr>
<td colspan="5" data-block="order-items-pager-top" class="order-pager-wrapper order-pager-wrapper-top">
<?= $block->getPagerHtml() ?>
</td>
</tr>
<?php endif ?>
<tr>
<th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
<th class="col thumb"><?= $block->escapeHtml(__('Product Thumb')) ?></th>
<th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
<th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
<th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
<th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
</tr>
</thead>
<?php $items = $block->getItems(); ?>
<?php $giftMessage = ''?>
<?php foreach ($items as $item) :
if ($item->getParentItem()) :
continue;
endif;
?>
<tbody>
<?= $block->getItemHtml($item) ?>
<?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()) : ?>
<?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
<tr>
<td class="col options" colspan="5">
<a href="#"
id="order-item-gift-message-link-<?= (int) $item->getId() ?>"
class="action show"
aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
data-item-id="<?= (int) $item->getId() ?>">
<?= $block->escapeHtml(__('Gift Message')) ?>
</a>
<?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
<div class="order-gift-message" id="order-item-gift-message-<?= (int) $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
<a href="#"
title="<?= $block->escapeHtml(__('Close')) ?>"
aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
data-item-id="<?= (int) $item->getId() ?>"
class="action close">
<?= $block->escapeHtml(__('Close')) ?>
</a>
<dl class="item-options">
<dt class="item-sender"><strong class="label"><?= $block->escapeHtml(__('From')) ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
<dt class="item-recipient"><strong class="label"><?= $block->escapeHtml(__('To')) ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
<dd class="item-message"><?= /* @noEscape */ $this->helper(\Magento\GiftMessage\Helper\Message::class)->getEscapedGiftMessage($item) ?></dd>
</dl>
</div>
</td>
</tr>
<?php endif ?>
</tbody>
<?php endforeach; ?>
<tfoot>
<?php if ($block->isPagerDisplayed()) : ?>
<tr>
<td colspan="5" data-block="order-items-pager-bottom" class="order-pager-wrapper order-pager-wrapper-bottom">
<?= $block->getPagerHtml() ?>
</td>
</tr>
<?php endif ?>
<?= $block->getChildHtml('order_totals') ?>
</tfoot>
</table>
</div>
<?php if ($giftMessage) : ?>
<script type="text/x-magento-init">
{
"a.action.show, a.action.close": {
"giftMessage": {}
}
}
</script>
<?php endif; ?>
app/design/frontend/Joshine/breeze/Magento_Sales/templates/order/items/renderer/default.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$pr = $objectManager->create('Magento\Catalog\Model\ProductRepository');
$imageHelper = $objectManager->get( 'Magento\Catalog\Helper\Image' );
/** @var $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
$_item = $block->getItem();
$product = $pr->getById((int)$_item->getProductId());
$productImage = $imageHelper->init( $product, 'category_page_list' )->getUrl();
?>
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
<?php if ($_options = $block->getItemOptions()): ?>
<dl class="item-options">
<?php foreach ($_options as $_option): ?>
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?php if (!$block->getPrintStatus()): ?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="tooltip content">
<dl class="item options">
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
</dl>
</div>
<?php endif; ?>
</dd>
<?php else: ?>
<?php $optionValue = isset($_option['print_value']) ? $_option['print_value'] : $_option['value'] ?>
<dd><?= $block->escapeHtml($optionValue) ?></dd>
<?php endif; ?>
<?php endforeach; ?>
</dl>
<?php endif; ?>
<?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
<?php if ($addtInfoBlock): ?>
<?= $addtInfoBlock->setItem($_item)->toHtml() ?>
<?php endif; ?>
<?= $block->escapeHtml($_item->getDescription()) ?>
</td>
<td class="col thumb" data-th="<?= $block->escapeHtml(__('thumb'))?>">
<img style="width: 5em" src="<?php echo $productImage;?>" loading="lazy" /></img>
</td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
</td>
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
<?= $block->getItemPriceHtml() ?>
</td>
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
<ul class="items-qty">
<?php if ($block->getItem()->getQtyOrdered() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyOrdered() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyShipped() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyShipped() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyCanceled() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyCanceled() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyRefunded() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyRefunded() ?></span>
</li>
<?php endif; ?>
</ul>
</td>
<td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
<?= $block->getItemRowTotalHtml() ?>
</td>
</tr>
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
...@@ -429,12 +429,16 @@ define([ ...@@ -429,12 +429,16 @@ define([
tem_size = "<div id=\"product-intro__freeshipping-more-3\" >" + tem_size = "<div id=\"product-intro__freeshipping-more-3\" >" +
"<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> Size Guide</a></div>"; "<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> Size Guide</a></div>";
label += tem_size; label += tem_size;
label += '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
$('<i></i>').text(item.label).html() +
'</span>';
}else{
label +=
'<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
$('<i></i>').text(item.label).html() +
'</span>'+ '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>' ;
} }
label +=
'<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
$('<i></i>').text(item.label).html() +
'</span>' +
'<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
} }
if ($widget.inProductList) { if ($widget.inProductList) {
...@@ -444,23 +448,43 @@ define([ ...@@ -444,23 +448,43 @@ define([
} else { } else {
listLabel = 'aria-labelledby="' + controlLabelId + '"'; listLabel = 'aria-labelledby="' + controlLabelId + '"';
} }
if (item.label.toLowerCase() == "size") {
// Create new control // Create new control
container.append( var sizeContent = '<div class="swatch-attribute-selected-option-size-content" style="margin-top: 0.13333rem;padding: 0.26667rem;background-color: #f7f7f7;display: none;"><div style="font-size:.32rem;color:#999999;">Product Measurements</div>'+'<span style="color:#0a0a0a;" class="'+classes.attributeSelectedOptionLabelClass + '"></span></div>';
'<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
'data-attribute-code="' + item.code + '" ' + container.append(
'data-attribute-id="' + item.id + '">' + '<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
'data-attribute-code="' + item.code + '" ' +
'data-attribute-id="' + item.id + '">' +
label +
'<div aria-activedescendant="" ' +
'tabindex="0" ' +
'aria-invalid="false" ' +
'aria-required="true" ' +
'role="listbox" ' + listLabel +
'class="' + classes.attributeOptionsWrapper + ' clearfix">' +
options + select +
'</div>'+ sizeContent + input +
'</div>'
);
}else{
container.append(
'<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
'data-attribute-code="' + item.code + '" ' +
'data-attribute-id="' + item.id + '">' +
label + label +
'<div aria-activedescendant="" ' + '<div aria-activedescendant="" ' +
'tabindex="0" ' + 'tabindex="0" ' +
'aria-invalid="false" ' + 'aria-invalid="false" ' +
'aria-required="true" ' + 'aria-required="true" ' +
'role="listbox" ' + listLabel + 'role="listbox" ' + listLabel +
'class="' + classes.attributeOptionsWrapper + ' clearfix">' + 'class="' + classes.attributeOptionsWrapper + ' clearfix">' +
options + select + options + select +
'</div>' + input + '</div>' + input +
'</div>' '</div>'
); );
}
$widget.optionsMap[item.id] = {}; $widget.optionsMap[item.id] = {};
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -2173,7 +2173,15 @@ button.action.submit.primary { ...@@ -2173,7 +2173,15 @@ button.action.submit.primary {
white-space: nowrap; white-space: nowrap;
} }
@media (max-width: 768px){
.swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{
margin-left: 0!important;
line-height:.53333rem;
font-size: .32rem;
text-transform:capitalize;
color: #0a0a0a;
}
}
#product-intro__freeshipping-more-3{ #product-intro__freeshipping-more-3{
display: inline-block; display: inline-block;
......
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