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

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

@@ -16,6 +16,12 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
     .checkout-cart-index .cart-container .block.discount.active .content{
     .checkout-cart-index .cart-container .block.discount.active .content{
         padding:0px 1rem;
         padding:0px 1rem;
     }
     }
+    .checkout-cart-index #discount-coupon-form .actions-toolbar{
+        position:absolute;
+        top:0;
+        padding:0;
+        right:0;
+    }
     @media(max-width: 768px){
     @media(max-width: 768px){
         .checkout-cart-index .cart-container .block.discount.active .content{
         .checkout-cart-index .cart-container .block.discount.active .content{
             padding:0px!important;
             padding:0px!important;
@@ -46,10 +52,10 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
                                                "removeCouponSelector": "#remove-coupon",
                                                "removeCouponSelector": "#remove-coupon",
                                                "applyButton": "button.action.apply",
                                                "applyButton": "button.action.apply",
-                                               "cancelButton": "button.action.cancel"}}'>
+                                               "cancelButton": "button.action.cancel"}}' style="position:relative;">
             <div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>">
             <div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>">
                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
-                <div class="field" style="width: 70%;">
+                <div class="field">
                     <div class="control" style="float: left;margin-top: 0px;width: 100%;">
                     <div class="control" style="float: left;margin-top: 0px;width: 100%;">
                         <input type="text"
                         <input type="text"
                                class="input-text"
                                class="input-text"
@@ -63,7 +69,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
                         />
                         />
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="actions-toolbar" style="clear: none;margin-top: 1.25rem;margin-bottom: 0px;">
+                <div class="actions-toolbar" style="clear: none;margin:0 auto;">
                     <?php if (!$hasCouponCode) :?>
                     <?php if (!$hasCouponCode) :?>
                     <div class="primary">
                     <div class="primary">
                         <button class="action apply primary" style="padding: 0.5rem 1rem;width:100%;background-color: #999;" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">
                         <button class="action apply primary" style="padding: 0.5rem 1rem;width:100%;background-color: #999;" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml

@@ -369,16 +369,22 @@ $free_price = $_helper->currency(0, true, false);
         padding: 0.5rem 0px 1rem;
         padding: 0.5rem 0px 1rem;
         border-bottom: 1px solid #ddd;
         border-bottom: 1px solid #ddd;
     }
     }
-    .checkout-index-index .opc-block-summary .payment-option-content .payment-option-inner,.checkout-index-index .payment-option .form-discount .actions-toolbar
-    {
-        width:50%;
+
+    .checkout-index-index .opc-block-summary .payment-option .form-discount .payment-option-inner{
+        width:100%;
+    }
+    .checkout-index-index .opc-block-summary .payment-option .form-discount .actions-toolbar{
+        position:absolute;
+        right:0;
     }
     }
     .checkout-index-index .opc-block-summary .payment-option .form-discount .actions-toolbar .action{
     .checkout-index-index .opc-block-summary .payment-option .form-discount .actions-toolbar .action{
         width:100%;
         width:100%;
         height:40px;
         height:40px;
+        padding:5px;
     }
     }
     .checkout-index-index .opc-block-summary .payment-option .form-discount {
     .checkout-index-index .opc-block-summary .payment-option .form-discount {
         gap: 0rem;
         gap: 0rem;
+        position: relative;
     }
     }
     .checkout-index-index .block.items-in-cart{
     .checkout-index-index .block.items-in-cart{
         display: none;
         display: none;

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

@@ -947,9 +947,6 @@ div#cart-totals{
 .checkout-cart-index #discount-coupon-form .fieldset{
 .checkout-cart-index #discount-coupon-form .fieldset{
   margin-bottom:0px;
   margin-bottom:0px;
 }
 }
-.checkout-cart-index #block-discount .content{
-  padding:0px 1rem;
-}
 @media (max-width: 768px){
 @media (max-width: 768px){
   .checkout-cart-index .cart-container .cart-summary {
   .checkout-cart-index .cart-container .cart-summary {
     margin:0;
     margin:0;