Skip to content

J
joshine
Commit a28db4a0 by lmf
Options

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

parents 1669b4b9 4d0161eb
Showing with 75 additions and 2 deletions
app/code/Joshine/Category/Setup/UpgradeData.php
...@@ -104,6 +104,20 @@ class UpgradeData implements UpgradeDataInterface ...@@ -104,6 +104,20 @@ class UpgradeData implements UpgradeDataInterface
'required' => false, 'required' => false,
'sort_order' => 70, 'sort_order' => 70,
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE, 'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
],
'is_show_size'=>
[
'type' => 'int',
'label' => 'badge',
'visible_on_front' => true,
'user_defined' => false,
'default' => 0,
'group' => '',
'input' => 'checkbox',
'backend' => '',
'required' => false,
'sort_order' => 100,
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
] ]
]; ];
......
app/code/Joshine/Category/etc/module.xml
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Joshine_Category" setup_version="1.1.2"/> <module name="Joshine_Category" setup_version="1.1.5"/>
</config> </config>
app/code/Joshine/Category/view/adminhtml/ui_component/category_form.xml
...@@ -84,5 +84,39 @@ ...@@ -84,5 +84,39 @@
</argument> </argument>
</field> </field>
</fieldset> </fieldset>
</form>
<fieldset name="general">
<field name="is_show_size" sortOrder="0" formElement="checkbox">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">category</item>
<item name="default" xsi:type="number">0</item>
</item>
</argument>
<settings>
<validation>
<rule name="required-entry" xsi:type="boolean">false</rule>
</validation>
<dataType>boolean</dataType>
<label translate="true">Is Show Size</label>
</settings>
<formElements>
<checkbox>
<settings>
<valueMap>
<map name="false" xsi:type="string">0</map>
<map name="true" xsi:type="string">1</map>
</valueMap>
<prefer>toggle</prefer>
</settings>
</checkbox>
</formElements>
</field>
</fieldset>
</form>
app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<update handle="checkout_cart_item_renderers"/> <update handle="checkout_cart_item_renderers"/>
<body> <body>
<referenceBlock name="page.main.title" remove="true"/> <referenceBlock name="page.main.title" remove="true"/>
<referenceBlock name="sparsh.free-shipping.bar.top" remove="true" />
<referenceBlock name="checkout.cart.addtocart" remove="true" /> <referenceBlock name="checkout.cart.addtocart" remove="true" />
<referenceContainer name="page.messages"> <referenceContainer name="page.messages">
<block class="Magento\Checkout\Block\Cart\ValidationMessages" name="checkout.cart.validationmessages"/> <block class="Magento\Checkout\Block\Cart\ValidationMessages" name="checkout.cart.validationmessages"/>
......
app/code/Magento/Checkout/view/frontend/web/js/model/update-item-service.js 0 → 100644
define([
'ko'
], function (ko) {
'use strict';
var hasUpdateResult = ko.observable(false);
return {
hasUpdateResult : hasUpdateResult
}
});
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
...@@ -55,7 +55,20 @@ ...@@ -55,7 +55,20 @@
max-width: 100%; max-width: 100%;
font-weight: 600; font-weight: 600;
} }
<?php
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$categoryId = $_product->getCategoryIds();
foreach ($categoryId as $value){
$category = $objectManager->create('Magento\Catalog\Model\Category')->load($value);
if ($category->getIsShowSize() == 1){
echo '#product-intro__freeshipping-more-3{display:none!important}';
break;
}
}
?>
</style> </style>
<script> <script>
require([ require([
'jquery' 'jquery'
......
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