Merge branch 'developer' into production

5ff331c3 · liumengfei · 53284d1c · 12cc178f · 5ff331c3 · 5ff331c3
Commit 5ff331c3 authored May 22, 2023 by liumengfei
10 changed files
--- a/app/code/Joshine/InstagramFeed/Model/Cache/Type.php
+++ b/app/code/Joshine/InstagramFeed/Model/Cache/Type.php
@@ -10,7 +10,7 @@ class Type extends TagScope
    const CACHE_TAG = 'INSTAGRAM_FEED';
-    const CACHE_LIFETIME = 60 * 60;
+    const CACHE_LIFETIME = 60 * 60 * 24;
    /**
     * @param FrontendPool $cacheFrontendPool

--- a/app/code/Joshine/Script/Console/Command/InstagramFeedPull.php
+++ b/app/code/Joshine/Script/Console/Command/InstagramFeedPull.php
--- a/app/code/Joshine/Script/etc/di.xml
+++ b/app/code/Joshine/Script/etc/di.xml
@@ -9,6 +9,9 @@
            <argument name="commands" xsi:type="array">
                <item name="reviews-import" xsi:type="object">Joshine\Script\Console\Command\ReviewsImporter</item>
            </argument>
+            <argument name="commands" xsi:type="array">
+                <item name="instagram-pull" xsi:type="object">Joshine\Script\Console\Command\InstagramFeedPull</item>
+            </argument>
        </arguments>
    </type>
 </config>
\ No newline at end of file
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -128,6 +128,15 @@ class Onepage extends \Magento\Framework\View\Element\Template
    {
        return $this->_scopeConfigInterface->getValue('carriers/freeshipping/free_shipping_subtotal');
    }
+    public function getCopyright()
+    {
+            $copyright = $this->_scopeConfig->getValue(
+                'design/footer/copyright',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+        return $copyright;
+    }
    /**
     * Get base url for block.
     *

--- a/app/code/Magento/Checkout/view/frontend/web/js/view/checkout-footer.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout-footer.js
@@ -6,13 +6,42 @@
 define([
    'jquery',
    'uiComponent',
-    'mage/mage'
+    'Magento_Ui/js/modal/alert',
-], function ($, Component) {
+    'mage/mage',
+], function ($, Component, modalAlert) {
    'use strict';
    return Component.extend({
        defaults: {
            template: 'Magento_Checkout/checkout-index-footer'
+        },
+        initialize: function () {
+            this.initStep();
+            this._super();
+            return this;
+        },
+        initStep: function () {
+            $(document).on('click','.cf-link',function(){
+                var dataKey = $(this).attr('data-key');
+                if(!dataKey)
+                {
+                    return false;
+                }
+                $.ajax({
+                    url: '/cms/index/getPage',
+                    type: 'POST',
+                    data: {'identifier':dataKey},
+                    dataType: 'json',
+                    success: function (result) {
+                        modalAlert({
+                            title: result.title,
+                            content: result.content,
+                            button:[]
+                        });
+                    }
+                });
+            });
        }
    });
 });
--- a/app/code/Magento/Checkout/view/frontend/web/template/checkout-index-footer.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/checkout-index-footer.html
@@ -5,16 +5,16 @@
        <footer id="policy-description" class="checkout_policy_description" trade-btn-event-name="trade:showPolicyModal" data-testid="checkout-dtv5i">
            <ul>
                <li>
-                    <a class="custom-link-color" href="/return-exchange-policy" target="_blank">Refund Policy</a>
+                    <a class="custom-link-color cf-link" href="javascript:;" data-key="return-exchange-policy">Refund Policy</a>
                </li>
                <li>
-                    <a class="custom-link-color" href="/shipping-policy" target="_blank">Shipping policy</a>
+                    <a class="custom-link-color cf-link" href="javascript:;" data-key="shipping-policy">Shipping policy</a>
                </li>
                <li>
-                    <a class="custom-link-color" href="/security-privacy-policy" target="_blank">Privacy Policy</a>
+                    <a class="custom-link-color cf-link" href="javascript:;" data-key="security-privacy-policy">Privacy Policy</a>
                </li>
                <li>
-                    <a class="custom-link-color" href="/terms-of-use" target="_blank">Terms of service</a>
+                    <a class="custom-link-color cf-link" href="javascript:;" data-key="terms-of-use">Terms of service</a>
                </li>
            </ul>
        </footer>

--- a/app/code/Magento/Cms/Controller/Index/GetPage.php
+++ b/app/code/Magento/Cms/Controller/Index/GetPage.php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Controller\Index;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\Result\JsonFactory;
+class GetPage extends \Magento\Framework\App\Action\Action
+{
+    protected $resultJsonFactory;
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        JsonFactory $resultJsonFactory
+    ) {
+        $this->resultJsonFactory    = $resultJsonFactory;
+        parent::__construct($context);
+    }
+    public function execute()
+    {
+        $identifier = $this->getRequest()->getParam('identifier');
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $CmsPage = $objectManager->get(\Magento\Cms\Model\Page::class);
+        $CmsPage->load($identifier, 'identifier');
+        $data = [];
+        $data['title'] = $CmsPage->getTitle();
+        $data['content'] = $CmsPage->getContent();
+        $resultPage = $this->resultJsonFactory->create();
+        $resultPage->setHttpResponseCode(200);
+        $resultPage->setData($data);
+        return $resultPage;
+    }
+}
--- a/app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
@@ -14,7 +14,7 @@ $full_free = $block->getFullFreeShip();
 $_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data');
 $full_free_ship = $_helper->currency($full_free, true, false);
 $free_price = $_helper->currency(0, true, false);
+$copyright = $block->getCopyright();
 $logoUrl = $block->getLogoUrl();
 $mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetect::class);
 $isMobile = $mobileDetect->isMobile();
@@ -81,7 +81,7 @@ $isMobile = $mobileDetect->isMobile();
    .header.content .secure-wrapper .icon-safepay:before {
        content: "\e644";
    }
-    .checkout-index-index footer.modal-footer{margin-top: unset;}
+    .checkout-index-index footer.modal-footer{margin-top: unset;padding:5px;}
    .header.content{height:60px;padding-top: 10px;padding-bottom: 10px;}
    @media(min-width: 640px){
        .header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
@@ -1088,9 +1088,31 @@ $isMobile = $mobileDetect->isMobile();
        .checkout-index-index .authentication-wrapper .action.action-auth-toggle{
            color:#0000ff!important;
        }
+        .modal-inner-wrap{
+            max-width: 100%;
+            width:766px;
+            border-radius: 8px;
+            max-height: 80%;
+            height: auto;
+        }
+    }
+    .checkout-index-index .modal-footer .action-primary.action-accept{
+        display: none;
+    }
+    .checkout-index-index .modal-header {
+        border-bottom: 1px solid #ddddd8;
+        padding:20px;
+    }
+    .checkout-index-index .modal-title{
+        margin:0 auto;
+    }
+    .checkout-index-index .modal-content{
+        padding-top:1rem;
+    }
+    .checkout-index-index .authentication-wrapper .modal-header{
+        border-bottom: none;
+        padding:0;
    }
    .checkout-index-index #shipping .field.street,.checkout-index-index .billing-address-form .field.street {
        min-height:7rem;
    }
@@ -1671,10 +1693,7 @@ $isMobile = $mobileDetect->isMobile();
        background: #f2f2f2;
        margin-top: 15px;
    }
-    #policy-description li a{
-        font-size: 12px;
-        color: #276EAF;
-    }
    .jkl{
        width:17px;
        height:17px;
@@ -1695,8 +1714,11 @@ $isMobile = $mobileDetect->isMobile();
    @keyframes fadenum{
        100%{transform:rotate(360deg);}
    }
+    #policy-description li a{
-    /********************************************address from end****************************************************/
+        font-size: 12px;
+        color: #666666;
+    }
+    /***************************************dddddddddddd*****address from end****************************************************/
@@ -1718,6 +1740,7 @@ $isMobile = $mobileDetect->isMobile();
        window.checkoutConfig.flatrate_price = '{$flatraPrice}';
        window.checkoutConfig.full_free_ship = '{$full_free_ship}';
        window.checkoutConfig.free_price = '{$free_price}';
+        window.checkoutConfig.copyright = '{$copyright}';
        window.checkoutConfig.addressVisible = true;
        window.checkoutConfig.shippingVisible = false;
        window.checkoutConfig.paymentVisible = false;
@@ -1740,6 +1763,7 @@ script;
    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
 <script>
    require(['jquery'], function ($) {
        var isMobile = window.matchMedia("(pointer:coarse)").matches;
        /*
@@ -1872,4 +1896,5 @@ script;
    });
 </script>
\ No newline at end of file
--- a/app/design/frontend/Joshine/breeze/web/css/_custom.less
+++ b/app/design/frontend/Joshine/breeze/web/css/_custom.less
@@ -502,7 +502,7 @@ ul {
    position: fixed;
    font-size: larger;
    bottom: 0;
-    z-index: 1;
+    z-index: 2;
    width: 100%;
    margin: 0 auto;
    left: 0;
@@ -2661,7 +2661,7 @@ button.action.submit.primary {
    display: block !important;
    position: fixed;
    bottom: 0;
-    z-index: 1;
+    z-index: 2;
  }
  .breeze-gallery .stage .main-image-wrapper > picture{
    display: none;

--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -271,4 +271,6 @@ ErrorDocument 403 /errors/404.php
    ## Prevent clickjacking
    Header set X-Frame-Options SAMEORIGIN
+    Header add Access-Control-Allow-Origin "facebook.com"
 </IfModule>