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

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.
      *

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();
@@ -1671,10 +1671,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 +1692,11 @@ $isMobile = $mobileDetect->isMobile();
     @keyframes fadenum{
         100%{transform:rotate(360deg);}
     }
-
-    /********************************************address from end****************************************************/
+    #policy-description li a{
+        font-size: 12px;
+        color: #666666;
+    }
+    /***************************************dddddddddddd*****address from end****************************************************/
 
 
 
@@ -1718,6 +1718,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;

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;