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

app/code/Magento/Checkout/view/frontend/web/js/view/part.js

@@ -29,9 +29,6 @@ define([
             },
             },
             initStep: function (obj) {
             initStep: function (obj) {
                 $(document).on('click','.continue-shipping',function(){
                 $(document).on('click','.continue-shipping',function(){
-
-
-                    console.log('addressOneVisible',addressOneVisible());
                     if(shippingTwoVisible() || paymentThreeVisible())
                     if(shippingTwoVisible() || paymentThreeVisible())
                     {
                     {
                         obj.backToInformation();
                         obj.backToInformation();

app/code/Sparsh/QuickView/view/frontend/layout/quickview_catalog_product_view.xml

@@ -13,5 +13,6 @@
         <referenceBlock name="reviews.tab" remove="true" />
         <referenceBlock name="reviews.tab" remove="true" />
         <referenceBlock name="form.subscribe" remove="true" />
         <referenceBlock name="form.subscribe" remove="true" />
         <referenceBlock name="checkout.cart.empty.recently" remove="true" />
         <referenceBlock name="checkout.cart.empty.recently" remove="true" />
+        <referenceBlock name="free-shipping.bar" remove="true" />
     </body>
     </body>
 </page>
 </page>
\ No newline at end of file

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -3569,6 +3569,12 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
   #sparsh-mfp-quickview .product-info-wrapper{
   #sparsh-mfp-quickview .product-info-wrapper{
     height: auto;
     height: auto;
   }
   }
+  .checkout-onepage-failure .page-title-wrapper{
+    margin-top:5rem;
+  }
+  .checkout-onepage-failure .column.main p a{
+    color:#276EAF;
+  }
 }
 }
 .fotorama__arr, .fotorama__thumb__arr{
 .fotorama__arr, .fotorama__thumb__arr{
   background-color: rgba(255,255,255,0.8);
   background-color: rgba(255,255,255,0.8);