Skip to content

J
joshine
Commit f25abd36 by 王东红
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents d2670596 67f81cb4
Showing with 325 additions and 1 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
...@@ -4,4 +4,270 @@ ...@@ -4,4 +4,270 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
?> ?>
<div class="product-intro__freeshipping product-intro__bg-none">
<div class="product-intro__freeshipping-abt action" data-trigger="trigger-shipping">
<div class="product-intro__freeshipping-icon shipping "><i class="svgicon svgicon-gd-shipping"></i> <p>Fast Delivery</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div>
<div class="free-wrapper">
<p> Estimated to be delivered on <span id="deliveredTime">11/25/2021 - 12/03/2021</span>.</p> </div></div>
<div data-bind="mageInit: {
'Magento_Ui/js/modal/modal':{
'type': 'popup',
'title': '',
'trigger': '[data-trigger=trigger-shipping]',
'responsive': true,
'buttons': []
}}">
<div class="content">
<div>
<p style="text-align: center;"><h1>SHIP METHODS</h1></p>
<h4 style="text-align: left;">Ship to US</h4>
<table>
<thead>
<tr>
<th>
<p><span>Country</span></p>
</th>
<th>
<p><span>Method</span></p>
</th>
<th>
<p><span>Costs</span></p>
</th>
<th>
<p><span>Shipping time</span></p>
</th>
</tr>
</thead>
<tbody>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;">
<p><span>US</span></p>
</td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Standard</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$6.99</span></div>
<div class="free"><span style="color: #4d9306;"><strong>Free on Orders $69</strong></span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>6 - 15</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;"><span>US</span></td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Express</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$12.99</span></div>
<div class="free"><span>Free on Orders $149</span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>3 - 8</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
</tbody>
</table>
<h4 style="text-align: center;"></h4>
<h4 style="text-align: left;">Ship to <span>international </span></h4>
<table>
<thead>
<tr>
<th>
<p><span>Country</span></p>
</th>
<th>
<p><span>Method</span></p>
</th>
<th>
<p>Costs</p>
</th>
<th>
<p><span>Shipping time</span></p>
</th>
</tr>
</thead>
<tbody>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;">
<p><span>Other countries</span></p>
</td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Standard</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$6.99</span></div>
<div class="free"><strong><span style="color: #4d9306;">Free on Orders $79</span></strong></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>8 - 20</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
<tr style="height: 44px;">
<td style="height: 44px; width: 80.5px;"><span>Other countries</span></td>
<td style="height: 44px; width: 85.1625px;">
<div class="zone-shipping-rates__rate-header"><span>Express</span></div>
</td>
<td class="font12" style="height: 44px; width: 204.875px;">
<div><span>US$19.99</span></div>
<div class="free"><span>Free on Orders $199</span></div>
</td>
<td style="height: 44px; width: 137.863px;">
<div><span>4 - 10</span></div>
<div><span>Business Days</span></div>
</td>
</tr>
</tbody>
</table>
<p style="padding-left: 30px;">  We use outside delivery companies (UPS, FedEx, DHL, and USPS), we cannot guarantee these delivery times. Please allow 1-3 business days for your order to dispatch. Please allow <strong>3-12</strong> business days for orders to arrive.</p>
</div>
<div class="page-conteng-h3" id="page-conteng-h37"></div>
</div>
</div>
<div class="product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action" data-trigger="trigger2">
<div class="product-intro__freeshipping-icon">
<i class="svgicon svgicon-gd-freereturn"></i><p>Free Return &amp; Exchange</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div> <div class="product-intro__freeshipping-desc">
Learn More
</div>
<div data-bind="mageInit: {
'Magento_Ui/js/modal/modal':{
'type': 'popup',
'title': '',
'trigger': '[data-trigger=trigger2]',
'responsive': true,
'buttons': []
}}">
<div class="content">
<h2><strong>Return &amp; Exchange Policy</strong></h2>
<p>Our 100% guarantee ensures that you can return unused items in their original condition and <strong>packaging within 15 days</strong> for an exchange or prompt refund.</p>
<p>We simply ask that when you receive an order, <strong>you try it on OVER panties or undergarments</strong>. We are unable to accept worn items for hygienic reasons.</p>
<p><strong>Outbound shipping fees from the original order are not refundable.</strong></p>
<p>Products must be returned <strong>unworn, unwashed, in their original condition and with all tags attached</strong>. Please include the original order packing slip in your return package.</p>
<p>We reserve the right to refuse returns that show signs of wear or do not meet the above criteria.</p>
<p><strong>We cannot accept off-line return</strong>. Please email to our customer care team first. Please do not go straight to the warehouse.</p>
<p>For instructions on how to ship the returned products, refer to the email received after placing the return request.</p>
<p>There is no service charge but you will be responsible for the shipping cost of your return.</p>
<p>Return shipping and any reverse duties are the responsibility of the customer.</p>
<p>To request a return, email to: <strong>support@joshine.com</strong></p>
</div>
</div>
</div>
</div>
<script>
require(['jquery'],function($){
$('.mod-sizechart .content .sizechart-table').append($('.common-sizeinfo').clone());
let start = new Date();
start.setDate(start.getDate()+3);
let smonth = (start.getMonth()+1) < 10 ? "0"+ (start.getMonth()+1) : (start.getMonth()+1);
let sdate = start.getDate() < 10 ? "0"+ start.getDate() : start.getDate();
let end = new Date();
end.setDate(end.getDate()+15);
let emonth = (end.getMonth()+1) < 10 ? "0"+ (end.getMonth()+1) : (end.getMonth()+1);
let edate = end.getDate() < 10 ? "0"+ end.getDate() : end.getDate();
let startTime = smonth + "/" + sdate +"/" +(start.getFullYear());
let endTime = emonth + "/" + edate + "/" + (end.getFullYear());
$('#deliveredTime').text(startTime+"-"+endTime);
$('.swatch-opt').on('swatch.initialized',function(){ $('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action')); })
if($('.swatch-attribute.size .swatch-attribute-selected-option').length > 0){
$('.swatch-attribute.size .swatch-attribute-selected-option').after($('.sizechart.action'));
}else{
$('.product-options-wrapper').after($('.sizechart.action'));
}
$( "body" ).on( "click", ".common-sizetable__title-s", function() {
$('.common-sizetable__title-s').removeClass('active');
$(this).addClass('active');
$('.sg-table-base').removeClass('active');
$('.'+$(this).attr('data-type')+'-'+$('.common-sizetable__button-item.common-sizetable__button-item_active').attr('data-type')+'-table').addClass('active');
});
$( "body" ).on( "click", ".common-sizetable__button-item", function() {
$('.common-sizetable__button-item').removeClass('common-sizetable__button-item_active');
$(this).addClass('common-sizetable__button-item_active');
$('.sg-table-base').removeClass('active');
$('.'+$('.common-sizetable__title-s.active').attr('data-type')+'-'+$(this).attr('data-type')+'-table').addClass('active');
});
});
</script>
<style>
.product-intro__freeshipping-icon .svgicon {
width: 15px;
height: 15px;
display: inline-block;
float: left;
line-height: 30px;
vertical-align: middle;
}.product-intro__freeshipping-icon i.svgicon.svgicon-gd-freereturn ,.product-intro__freeshipping-icon i.svgicon.svgicon-gd-shipping {
width: 25px;
height: 25px;
margin-top: -2px;
}
.free-wrapper {
border-bottom: 1px solid #e8e7e7;
margin-bottom: 10px;
}
.free-wrapper , .product-intro__freeshipping-desc{
clear: both;
}
.free-wrapper p {
padding-left: 40px;font-size:13px;
}.product-intro__freeshipping-desc {
padding-left: 40px;font-size:13px;
}
.product-intro__freeshipping-icon.shipping p ,.product-intro__freeshipping-icon p{
display: inline-block;
line-height: 15px;
padding: 0 10px;
float: left; padding-left: 15px;
}
.product-intro__freeshipping-icon.shipping p, .product-intro__freeshipping-icon p {
display: inline-block;
line-height: 15px;
padding: 0 10px;
float: left;
padding-left: 15px;
}
.svgicon-gd-more-grey {
width: 16px;
height: 16px;
display: inline-block;
float: left;
}
.svgicon-gd-shipping { background-image: url("/media/icon/service01.svg") ;background-repeat: no-repeat;background-size: 100%;}
.svgicon-gd-freereturn {background-image: url("/media/icon/service02.svg") ;background-repeat: no-repeat;background-size: 100%;}
.svgicon-gd-more-grey {background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='icon' viewBox='0 0 1024 1024'%3E%3Cdefs%3E%3Cstyle/%3E%3C/defs%3E%3Cpath fill='%23999' d='M512 0c281.6 0 512 230.4 512 512s-230.4 512-512 512S0 793.6 0 512 230.4 0 512 0zm0 716.8c-42.667 0-76.8 34.133-76.8 68.267s34.133 68.266 76.8 68.266 76.8-34.133 76.8-68.266S554.667 716.8 512 716.8zm17.067-529.067c-136.534 0-221.867 76.8-221.867 187.734h128c0-51.2 34.133-85.334 93.867-85.334 51.2 0 85.333 34.134 85.333 76.8-8.533 42.667-17.067 59.734-68.267 93.867l-17.066 8.533c-59.734 34.134-85.334 76.8-85.334 153.6v25.6H563.2v-25.6c0-42.666 17.067-68.266 76.8-102.4 68.267-34.133 93.867-85.333 93.867-153.6 17.066-110.933-68.267-179.2-204.8-179.2z'/%3E%3C/svg%3E");}
/* product info */
.box-tocart .fieldset .field.qty{
display: none;
}
.product-intro__freeshipping.product-intro__bg-none {
background: #f8f8f8;
padding: 10px;
cursor: pointer;
}
.modal-inner-wrap {
display: flex;
padding: 0 !important;
margin: 0 !important;
max-width: fit-content;
width: 900px;
max-height: var(--modal-max-height);
max-height: -webkit-fill-available;
background: rgba(var(--z-layer-bg), var(--z-layer-bg-alpha, 1));
box-shadow: 0 10px 25px rgb(0 0 0 / 10%), 0 5px 10px rgb(0 0 0 / 4%);
opacity: 0;
}
</style>
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var $block \Magento\Catalog\Block\Product\View */
?>
<?php $_product = $block->getProduct(); ?>
<?php $buttonTitle = __('+ ADD TO CART'); ?>
<?php if ($_product->isSaleable()) :?>
<div class="box-tocart">
<div class="fieldset">
<?php if ($block->shouldRenderQuantity()) :?>
<div class="field qty">
<label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
<div class="control">
<input type="number"
name="qty"
id="qty"
min="0"
value="<?= $block->getProductDefaultQty() * 1 ?>"
title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
class="input-text qty"
data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
/>
</div>
</div>
<?php endif; ?>
<div class="actions">
<button type="submit"
title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
class="action primary tocart"
id="product-addtocart-button" disabled>
<span><?= $block->escapeHtml($buttonTitle) ?></span>
</button>
<?= $block->getChildHtml('', true) ?>
</div>
</div>
</div>
<?php endif; ?>
<script type="text/x-magento-init">
{
"#product_addtocart_form": {
"Magento_Catalog/js/validate-product": {}
}
}
</script>
<style>
.action.primary.tocart{
font-size: smaller;
background-color: #000;
width: 900px;
font-weight: 600;
}
</style>
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -1336,5 +1336,6 @@ margin-top: 0px; ...@@ -1336,5 +1336,6 @@ margin-top: 0px;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
} }
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