Skip to content

J
joshine
Commit e407f864 by halweg
Options

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

parents c9f5cfb3 02b6203e
Showing with 73 additions and 86 deletions
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/item/default.phtml
......@@ -53,78 +53,68 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
<!----------------------------item option start--------------------------------->
<?php if ($_options = $block->getOptionList()) :?>
<div class="item-options-meta">
<?php
$countOpt = count($_options);
?>
<?php foreach ($_options as $key=>$_option) :?>
<span class="item-options-line">
<?php
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$resource = $objectManager->get('Magento\Framework\App\ResourceConnection');
$connection = $resource->getConnection();
?>
<?php if ($_option['label'] != 'Size'){ ?>
<?php
$tableName = $resource->getTableName('eav_attribute_option_value');
$sql = "Select * FROM " . $tableName ." where store_id=0 AND option_id=".$_option['option_value'];
$result = $connection->fetchRow($sql);
?>
<?= $block->escapeHtml($result['value']) ?>
<?php }else{
$tableName = $resource->getTableName('eav_attribute_option_swatch');
$sql = "Select * FROM " . $tableName ." where store_id=0 AND option_id=".$_option['option_value'];
$result = $connection->fetchRow($sql);
echo $result['value'];
} ?>
</span>
<span><?php if ($countOpt - 1 != $key) :?>/<?php endif; ?></span>
<?php foreach ($_options as $_option) :?>
<span class="item-options-line">
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<strong style="font-weight: 600;margin-right: 10px;"><?= $block->escapeHtml($_option['label']) ?>:</strong>
<?php if (isset($_formatedOptionValue['full_view'])) :?>
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
<?php else :?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
<?php endif; ?>
</span><br />
<?php endforeach; ?>
</div>
<?php endif;?>
<!----------------------------item option end----------------------------------->
<!----------------------------item price start---------------------------------->
<div class="item-price">
<?= $priceBlock->getProductPrice($product);?>
</div>
<!----------------------------item price end------------------------------------>
<!----------------------------item handle start--------------------------------->
<div class="item-handle">
<div class="item-quantity">
<?php if ($block->escapeHtmlAttr($block->getQty()) > 1) :?>
<strong class="lower-qty qty-change">-</strong>
<?php else :?>
<strong class="lower-qty qty-change no-enabled">-</strong>
<?php endif; ?>
<div class="field qty new-qty">
<div class="control qty">
<label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
<input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
type="number"
size="4"
step="any"
title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
class="input-text qty"
data-validate="{required:true,'validate-greater-than-zero':true}"
data-role="cart-item-qty" readonly="readonly"/>
</label>
<div style="max-width: 100%;width: 100%;height: 40px;">
<!----------------------------item handle start--------------------------------->
<div class="item-handle" style="width: 16%;float:left;position: inherit;font-size: 16px;">
<div class="item-quantity">
<?php if ($block->escapeHtmlAttr($block->getQty()) > 1) :?>
<strong class="lower-qty qty-change">-</strong>
<?php else :?>
<strong class="lower-qty qty-change no-enabled">-</strong>
<?php endif; ?>
<div class="field qty new-qty">
<div class="control qty">
<label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
<input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
type="number"
size="4"
step="any"
title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
class="input-text qty"
data-validate="{required:true,'validate-greater-than-zero':true}"
data-role="cart-item-qty" readonly="readonly"/>
</label>
</div>
</div>
</div>
<strong class="add-qty qty-change">+</strong>
</div>
<div class="item-actions">
<div class="actions-toolbar">
<strong class="add-qty qty-change">+</strong>
</div><br />
<div class="item-actions">
<div class="actions-toolbar" style="text-decoration: underline;">
<?= /* @noEscape */ $block->getActions($_item) ?>
</div>
</div>
</div>
<!----------------------------item handle end----------------------------------->
<!----------------------------item option end----------------------------------->
<div style="float: right;padding-right: 15%;width: 40%;font-size: 20px;">
<?php if ($canApplyMsrp) :?>
<span class="cart msrp subtotal">--</span>
<?php else :?>
<?= $block->getRowTotalHtml($_item) ?>
<?php endif; ?>
</div>
</div>
<!----------------------------item handle end----------------------------------->
</div>
</div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/item/default.html
......@@ -9,14 +9,14 @@
<!-- ko if: product_has_url -->
<a data-bind="attr: {href: product_url, title: product_name}" tabindex="-1" class="product-item-photo">
<!-- ko foreach: $parent.getRegion('itemImage') -->
<!-- ko template: {name: getTemplate(), data: item.product_image} --><!-- /ko -->
<!-- ko template: {name: getTemplate(), data: item.product_image} --><!-- /ko -->
<!-- /ko -->
</a>
<!-- /ko -->
<!-- ko ifnot: product_has_url -->
<span class="product-item-photo">
<!-- ko foreach: $parent.getRegion('itemImage') -->
<!-- ko template: {name: getTemplate(), data: item.product_image} --><!-- /ko -->
<!-- ko template: {name: getTemplate(), data: item.product_image} --><!-- /ko -->
<!-- /ko -->
</span>
<!-- /ko -->
......@@ -27,12 +27,12 @@
<a data-bind="attr: {href: product_url}, html: $parent.getProductNameUnsanitizedHtml(product_name)"></a>
<!-- /ko -->
<!-- ko ifnot: product_has_url -->
<span data-bind="html: $parent.getProductNameUnsanitizedHtml(product_name)"></span>
<span data-bind="html: $parent.getProductNameUnsanitizedHtml(product_name)"></span>
<!-- /ko -->
</strong>
<div class="product-item-pricing">
<div class="product-item-pricing" style="font-size: 18px;">
<div class="details-qty qty">
<span class="qty-wrapper" data-bind="html: qty"></span> *
<!-- ko if: canApplyMsrp -->
......@@ -45,7 +45,7 @@
<!-- ko ifnot: canApplyMsrp -->
<!-- ko foreach: $parent.getRegion('priceSidebar') -->
<!-- ko template: {name: getTemplate(), data: item.product_price, as: 'price'} --><!-- /ko -->
<!-- ko template: {name: getTemplate(), data: item.product_price, as: 'price'} --><!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/subtotal.html
......@@ -5,10 +5,13 @@
*/
-->
<div class="subtotal">
<span class="label">
<span class="label" style="
font-size: 18px;
color: gray;
">
<!-- ko i18n: 'Cart subtotal' --><!-- /ko -->
</span>
:
<!-- ko foreach: elems -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
......
app/design/frontend/Joshine/breeze/Magento_Search/templates/form.mini.phtml
......@@ -61,19 +61,3 @@ $quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUr
</form>
</div>
</div>
<script>
require([
'jquery'
], function ($) {
$("#search").on("focus",function () {
$(this).css("width","500px").css("font-size","20px");
});
$('#search').on('blur',function (){
if (!$(this).val()){
$(this).attr("style","");
}
});
});
</script>
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -903,6 +903,16 @@ p.shopbycate-title {
justify-content: space-between;
width: 100%;
padding: 2px 0px;
font-size: 20px;
}
.amount.price-container {
font-size: 20px;
margin-left: 10px;
}
div#cart-totals{
margin-bottom: 20px;
}
.discount-area{
color:#fa320f;
......
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