Merge branch 'developer' into production

app/code/Joshine/GoogleFeed/Console/Command/GoogleFeed.php

@@ -108,9 +108,9 @@ class GoogleFeed extends Command
     ];
 
     private $pattern = [
-        'one piece',
-        'bikini',
-        'cover up'
+        'Only One Piece',
+        'Only Bikini',
+        'Only Cover Up'
     ];
     /**
      * @inheritDoc

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/coupon.phtml

@@ -21,11 +21,17 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
         padding:0px 1rem;
     }
 </style>
+<!--
 <div class="block discount"
      id="block-discount"
      data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
 >
-    <div class="title" data-role="title" aria-controls="block-summary" role="tab" aria-selected="false" aria-expanded="false" tabindex="0">
+-->
+<div class="block discount"
+     id="block-discount"
+     data-mage-init='{"collapsible":{"active":"true", "openedState": "active", "saveState": false}}'
+>
+    <div class="title" data-role="title" aria-controls="block-summary" role="tab" aria-selected="true" aria-expanded="true" tabindex="0">
         <strong id="block-shipping-coupon" role="heading" aria-level="2"><?= __("Coupon Code") ?> </strong>
     </div>
     <div class="content" data-role="content" aria-labelledby="block-discount-heading" style="display: block;">

app/design/frontend/Joshine/breeze/Magento_SalesRule/web/template/payment/discount.html

@@ -5,7 +5,7 @@
  */
 -->
 <div class="payment-option _collapsible opc-payment-additional discount-code"
-     data-bind="mageInit: {'collapsible':{'active':false, 'openedState': '_active'}}" data-collapsible="true">
+     data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true">
     <div class="payment-option-title field choice" data-role="title">
         <span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">
             <!-- ko i18n: 'Apply Discount Code'--><!-- /ko -->

app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js

@@ -1493,6 +1493,7 @@ define([
             var galleryObject = element.data('gallery');
 
             this.options.mediaGalleryInitial = galleryObject.returnCurrentImages();
+            /*
             if($('.swatch-attribute .swatch-option'))
             {
                 var swatchObj = $('.swatch-attribute');
@@ -1502,6 +1503,7 @@ define([
                     $(swatchObj[i]).find('.swatch-option:first').trigger('click');
                 }
             }
+            */
         },
 
         /**