Merge branch 'checkout-address' into development

commercetools · Dec 17, 2019 · 9973869 · 9973869
2 parents 4407037 + 16d9ab5
commit 9973869
Show file tree

Hide file tree

Showing 44 changed files with 1,802 additions and 473 deletions.
diff --git a/src/assets/scss/_checkout-confirmation.scss b/src/assets/scss/_checkout-confirmation.scss
@@ -71,16 +71,8 @@
 }
 .complete-order-btn {
   width: 310px;
-  text-transform: uppercase;
-  font-size: 1em;
-  font-weight: 600;
-  background: $my-sin;
-  border: none;
-  margin: 1em;
+  margin: 1em 0;
   padding: 0.5em 0;
-  &:hover {
-    background: lighten($my-sin, 5%);
-  }
 }
 .agree-to {
   margin-right: 1em;
@@ -94,7 +86,7 @@
 @media screen and (min-width: 767px) {
   .checkout-first-col .checkout-summary,
   .checkout-second-col .checkout-summary {
-    padding: 1em 1em 4.6em;
+    padding: 1em;
   }
 }
 @media screen and (max-width: 767px) {

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
@@ -30,31 +30,33 @@
   div {
     display: inline;
   }
-}
-.step-number {
-  padding: 0.6em 1em;
-  color: $gray;
-  background: $white;
-  border-radius: 50%;
-  border: 1px solid $silver-chalice;
-  font-size: 1em;
-}
-.step-number-active {
-  background: $silver-chalice;
-  color: $white;
-}
-.step-title {
-  padding: 0 0.5em 0 0.2em;
+
+  .step-number {
+    padding: 0.6em 1em;
+    color: $gray;
+    background: $white;
+    border-radius: 50%;
+    border: 1px solid $silver-chalice;
+    font-size: 1em;
+  }
+
+  .step-title {
+    padding: 0 1em 0 0.5em;
+  }
+
+  .active .step-number {
+    background: $silver-chalice;
+    color: $white;
+  }
 }
 
 // Shipping information
-.checkout {
+.checkout-content {
   background: $white;
   border: 1px solid $alto;
-  margin-bottom: 2em;
 }
 .shipping-info {
-  margin: 1em;
+  margin: 1em 0;
   padding-bottom: 1em;
   border-bottom: 1px solid $alto;
 }
@@ -143,23 +145,10 @@
 .shipping-method .shipping-method-radio {
   margin-right: 1em;
 }
-.checkout-checkout-btn {
-  width: 100%;
-  background: url("../img/arrow-66.png") no-repeat 95% 13px $my-sin;
-  background-size: 15px;
-  border: none;
-  margin: 1em;
-  padding: 0.5em 0;
-  font-size: 1.2em;
-  &:hover {
-    background: url("../img/arrow-66.png") no-repeat 95% 13px lighten($my-sin, 5%);
-    background-size: 15px;
-  }
-}
 
 // Order summary
 .order-summary {
-  margin: 1em;
+  margin: 1em 0;
 }
 .order-summary-title {
   font-size: 1.1em;
@@ -174,16 +163,20 @@
   color: $ship-cove;
   padding-left: 0.5em;
 }
-.order {
+.checkout-order {
   background: lighten($alto, 10%);
   border: 1px solid $alto;
-  margin: 1em;
   /**padding-top: 2em;*/
-}
-.order-summary-img {
-  padding: 0.5em;
-  img {
-    border: 1px solid $alto;
+
+  &> div {
+    margin: 1em;
+  }
+
+  .product-img-col {
+    padding-bottom: 1em;
+    img {
+      border: 1px solid $alto;
+    }
   }
 }
 .summary-item-info {
@@ -208,10 +201,15 @@
   color: $gray;
   padding-right: 1em;
 }
-.order-item-price {
+.order-summary-item {
   margin: 1em;
-  padding-bottom: 1em;
   border-bottom: 1px solid $alto;
+  &:last-child {
+    border-bottom: 0;
+  }
+}
+.order-item-price {
+  padding-bottom: 1em;
 }
 .order-item-value {
   border-left: 1px solid $alto;
@@ -230,11 +228,12 @@
   color: $gray;
   padding-right: 1em;
 }
-.checkout-price-text,
-.checkout-price-digits {
-  margin-bottom: 1em;
-  font-size: 1.1em;
-  letter-spacing: 0.1em;
+.checkout-order {
+  .cart-like-price-detail {
+    margin-bottom: 1em;
+    font-size: 1.1em;
+    letter-spacing: 0.1em;
+  }
 }
 .checkout-total-price {
   border-bottom: 1px solid $alto;
@@ -254,7 +253,7 @@
   font-size: 0.9em;
   color: $gray;
   text-decoration: underline;
-  margin: 1em;
+  margin-top: 1em;
   letter-spacing: 0.05em;
 }
 .total-order-value {
@@ -307,11 +306,11 @@
   }
 }
 @media screen and (max-width: 470px) {
-	.step-title {
+  .step-title {
     padding-right: 0;
     margin-right: 2em;
   }
-  .step-title-active {
+  .active .step-title {
     border-bottom: 1px solid $ebony-clay;
   }
   .step-number {

diff --git a/src/assets/scss/_my-account-my-orders-order.scss b/src/assets/scss/_my-account-my-orders-order.scss
@@ -35,15 +35,17 @@
 }
 .my-orders-order-dark-box {
   background: $wild-sand;
-  padding: 15px;
-  color: $gray;
+  padding: 15px 10px;
   position: relative;
   margin-bottom: 15px;
   .my-orders-order-dark-box-title {
-    color: $mine-shaft;
+    font-weight: bold;
     font-size: 14px;
     padding-bottom: 10px;
     text-transform: uppercase;
+    .checkout-summary-edit-icon {
+      font-weight: normal;
+    }
   }
 }
 .my-orders-order-price-summary-wrapper {

diff --git a/src/assets/scss/_my-account-personal-details.scss b/src/assets/scss/_my-account-personal-details.scss
@@ -29,7 +29,7 @@
   > div {
     padding: 0;
   }
-  .checkout-form-step {
+  .my-account-tab {
     padding: 30px;
   }
 }

diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
@@ -93,7 +93,7 @@ export default {
     }
   }
 
-  .form-error-message {
+  .validation-wrapper {
     display: none;
   }
 

diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -128,7 +128,7 @@ export default {
     display: inline;
   }
 
-  .form-error-message {
+  .validation-wrapper {
     display: none;
   }
 }

diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
@@ -3,13 +3,6 @@
     <LoadingSpinner v-if="isLoading"/>
 
     <div v-else-if="cartNotEmpty">
-      <div class="row">
-        <div class="col-sm-8 col-xs-12">
-        </div>
-        <div class="col-sm-4">
-          <!--{{> checkout/start-checkout-link id="cart-checkoutnow-btn"}}-->
-        </div>
-      </div>
       <div class="row">
         <div class="col-sm-12">
           <div class="current-in-bag">